Releases/m62

.gitignore

@@ -8,16 +8,20 @@ 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
 *.opendb
 .vs/
 ipch/
 *.user
+ortc/idl/wrapper/generated/
+ortc/idl/wrapper/cx

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,

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;
     };
 
   };

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_NoIPv4Host | FilterPolicy_NoSrflx | FilterPolicy_NoPrflx),
+      FilterPolicy_RelayOnly           = (FilterPolicy_NoHost | FilterPolicy_NoPrivate | FilterPolicy_NoSrflx | FilterPolicy_NoPrflx),
       FilterPolicy_NoCandidates        = (0x7FFFFFFF)
     };
 

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;

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;
 

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());
 

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()