Skip to content

Commit

Permalink
v4.4.55968.0904
Browse files Browse the repository at this point in the history
  • Loading branch information
carsonzoom committed Sep 4, 2019
1 parent f02ac2c commit 30fb8c6
Show file tree
Hide file tree
Showing 83 changed files with 690 additions and 10 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2019-09-04

* No interface changes for C# wrapper, please refer to [https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md](https://github.com/zoom/zoom-sdk-windows/blob/master/CHANGELOG.md) for changes in Windows SDK.

## 2019-07-15

**Added**
Expand Down
Binary file modified bin/Aomhost/aomhost64.exe
Binary file not shown.
Binary file modified bin/Aomhost/libcml.dll
Binary file not shown.
Binary file modified bin/Aomhost/mkldnn.dll
Binary file not shown.
Binary file modified bin/Aomhost/zCrashReport64.dll
Binary file not shown.
Binary file modified bin/Aomhost/zCrashReport64.exe
Binary file not shown.
Binary file modified bin/CmmBrowserEngine.dll
Binary file not shown.
Binary file modified bin/Cmmlib.dll
Binary file not shown.
Binary file modified bin/CptControl.exe
Binary file not shown.
Binary file modified bin/CptHost.exe
Binary file not shown.
Binary file modified bin/CptInstall.exe
Binary file not shown.
Binary file modified bin/CptService.exe
Binary file not shown.
Binary file modified bin/CptShare.dll
Binary file not shown.
Binary file modified bin/DuiLib.dll
Binary file not shown.
Binary file modified bin/XmppDll.dll
Binary file not shown.
Binary file modified bin/airhost.exe
Binary file not shown.
Binary file modified bin/annoter.dll
Binary file not shown.
Binary file modified bin/aomagent.dll
Binary file not shown.
Binary file modified bin/asproxy.dll
Binary file not shown.
Binary file modified bin/avcodec-55.dll
Binary file not shown.
Binary file modified bin/avformat-55.dll
Binary file not shown.
Binary file modified bin/avutil-52.dll
Binary file not shown.
Binary file modified bin/libeay32.dll
Binary file not shown.
Binary file modified bin/libfaac.dll
Binary file not shown.
Binary file modified bin/mDNSResponder.dll
Binary file not shown.
Binary file modified bin/mcm.dll
Binary file not shown.
Binary file modified bin/mdnsclient.dll
Binary file not shown.
Binary file modified bin/msaalib.dll
Binary file not shown.
Binary file modified bin/nydus.dll
Binary file not shown.
Binary file modified bin/reslib.dll
Binary file not shown.
Binary file modified bin/sdk.dll
Binary file not shown.
Binary file modified bin/sdkExt.dll
Binary file not shown.
Binary file modified bin/ssb_sdk.dll
Binary file not shown.
Binary file modified bin/ssleay32.dll
Binary file not shown.
Binary file modified bin/swscale-2.dll
Binary file not shown.
Binary file modified bin/tp.dll
Binary file not shown.
Binary file modified bin/turbojpeg.dll
Binary file not shown.
Binary file modified bin/util.dll
Binary file not shown.
Binary file modified bin/viper.dll
Binary file not shown.
Binary file modified bin/zChatApp.dll
Binary file not shown.
Binary file modified bin/zCrashReport.dll
Binary file not shown.
Binary file modified bin/zCrashReport.exe
Binary file not shown.
Binary file modified bin/zData.dll
Binary file not shown.
Binary file modified bin/zSDK.dll
Binary file not shown.
Binary file modified bin/zTscoder.exe
Binary file not shown.
Binary file modified bin/zVideoApp.dll
Binary file not shown.
Binary file modified bin/zVideoUI.dll
Binary file not shown.
Binary file modified bin/zWebService.dll
Binary file not shown.
Binary file modified bin/zWinRes.dll
Binary file not shown.
Binary file modified bin/zlt.dll
Binary file not shown.
Binary file modified bin/zmb.dll
Binary file not shown.
Binary file modified bin/zoom_sdk_dotnet_wrap.dll
Binary file not shown.
Binary file modified bin/zzhost.dll
Binary file not shown.
Binary file modified bin/zzplugin.dll
Binary file not shown.
1 change: 1 addition & 0 deletions version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v4.4.55968.0904
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ class IAnnotationController
///Otherwise not. To get extended error information, see \link SDKError \endlink enum.
virtual SDKError SetEvent(IMeetingAnnotationSupportEvent* pEvent) = 0;

/// \brief Determine if the annotation tools are disabled or not during the current meeting.
/// \brief Determine if the annotation tools are disabled or not for the specified view during the current meeting.
/// \param viewtype Specify which view to be determined. For more details, see \link SDKViewType \endlink enum.
/// \return FALSE indicates enabled while TRUE indicates disabled.
/// \remarks Valid for both ZOOM style and user custom interface mode.
virtual bool IsAnnoataionDisable() = 0;
virtual bool IsAnnoataionDisable(SDKViewType viewtype = SDK_FIRST_VIEW) = 0;

/// \brief Display annotation toolbar.
/// \param viewtype Specify which view to display the toolbar. For more details, see \link SDKViewType \endlink enum.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@ enum AudioType
AUDIOTYPE_UNKNOW,///<Unknown mode.
};

/// \brief Process after the user receives the requirement from the host to turn on the audio.
class IRequestStartAudioHandler
{
public:
virtual ~IRequestStartAudioHandler(){};
/// \brief Get the user ID who asks to turn on the audio.
/// \return If the function succeeds, the return value is the user ID. FALSE 0.
virtual unsigned int GetReqFromUserId() = 0;
/// \brief Instance to ignore the requirement, return nothing and finally self-destroy.
virtual SDKError Ignore() = 0;
/// \brief Instance to accept the requirement, turn on the audio and finally self-destroy.
virtual SDKError Accept() = 0;
/// \brief Ignore the request to enable the video in the meeting and finally the instance self-destroys.
virtual SDKError Cancel() = 0;
};

class IUserAudioStatus
{
public:
Expand Down Expand Up @@ -64,6 +80,10 @@ class IMeetingAudioCtrlEvent
/// \brief The callback event that users whose audio is active changed.
/// \param plstActiveAudio List to store the ID of user whose audio is active.
virtual void onUserActiveAudioChange(IList<unsigned int >* plstActiveAudio) = 0;

/// \brief Callback event of the requirement to turn on the audio from the host.
/// \param handler_ A pointer to the IRequestStartAudioHandler. For more details, see \link IRequestStartAudioHandler \endlink.
virtual void onHostRequestStartAudio(IRequestStartAudioHandler* handler_) = 0;
};

/// \brief Meeting audio controller interface.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,11 @@ class IMeetingConfigurationEvent : public IMeetingConfigurationFreeMeetingEvent
typedef struct tagRedirectWarningMsgOption
{
bool bRedirectBadNetwork;
bool bRedirectWarnHighCPU;
tagRedirectWarningMsgOption()
{
bool bRedirectBadNetwork = false;
bRedirectBadNetwork = false;
bRedirectWarnHighCPU = false;
}

}RedirectWarningMsgOption;
Expand Down Expand Up @@ -438,6 +440,10 @@ class IMeetingUIElemConfiguration
// \brief Set the visibility of the local recording convert progress bar dialog. Default: TRUE.
/// \param bShow TRUE indicates to show the dialog box. FALSE not.
virtual void EnableLocalRecordingConvertProgressBarDialog(bool bShow) = 0;

// \brief Set the visibility of Switch Camera button on 2nd camera share window,Default: TRUE.
/// \param bHide TRUE indicates to hide the Switch Camera button. FALSE not.
virtual void HideSwitchCameraButton(bool bHide) = 0;
};

/// \brief Meeting connect configuration Interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,17 @@ class IMeetingShareController
virtual SDKError SetMultiShareSettingOptions(MultiShareOption shareOption) = 0;

virtual SDKError GetMultiShareSettingOptions(MultiShareOption& shareOption) = 0;

/// \brief Determine whether can switch to next camera, when share camera.
/// \param [Out] bCan, if bCan is true it means you can switch, else can not.
/// \return If the function succeeds, the return value is SDKErr_Success.
///Otherwise failed. To get extended error information, see \link SDKError \endlink enum.
virtual SDKError CanSwitchToShareNextCamera(bool& bCan) = 0;

/// \brief switch to next camera, when you are sharing the camera.
/// \return If the function succeeds, the return value is SDKErr_Success.
///Otherwise failed. To get extended error information, see \link SDKError \endlink enum.
virtual SDKError SwitchToShareNextCamera() = 0;
};
END_ZOOM_SDK_NAMESPACE
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ class IMeetingVideoCtrlEvent
/// \param handler_ A pointer to the IRequestStartVideoHandler. For more details, see \link IRequestStartVideoHandler \endlink.
virtual void onHostRequestStartVideo(IRequestStartVideoHandler* handler_) = 0;

/// \brief Callback event of the active speaker video user changes.
/// \param userid The ID of user who becomes the new active speaker.
virtual void onActiveSpeakerVideoUserChanged(unsigned int userid) = 0;

/// \brief Callback event of the active video user changes.
/// \param userid The ID of user who becomes the new active speaker.
virtual void onActiveVideoUserChanged(unsigned int userid) = 0;
};

Expand Down
1 change: 1 addition & 0 deletions zoom_sdk_c_sharp_wrap/h/meeting_service_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ enum StatisticsWarningType
{
Statistics_Warning_None,///<No warning.
Statistics_Warning_Network_Quality_Bad,///<The network connection quality is bad.
Statistics_Warning_Busy_System,
};

/// \brief Meeting service callback event.
Expand Down
15 changes: 15 additions & 0 deletions zoom_sdk_c_sharp_wrap/h/setting_service_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,11 @@ class IVideoSettingContextEvent
/// \brief Callback event if the SDK detects that the computer camera devices have been changed.
/// \param pNewCameraList The new list of all camera devices plugged into the computer.
virtual void onComputerCamDeviceChanged(IList<ICameraInfo*>* pNewCameraList) = 0;

/// \brief Notify the user that a camera device is selected.
/// \param deviceId Specify a device to be selected.
/// \param deviceName Specify the device name assigned by deviceId.
virtual void onDefaultCamDeviceChanged(const wchar_t* deviceId, const wchar_t* deviceName) = 0;
};
/// \brief Video setting interface.
///
Expand Down Expand Up @@ -566,6 +571,16 @@ class IAudioSettingContextEvent
/// \brief Callback event if the SDK detects that the computer speaker devices have been changed.
/// \param pNewSpeakerList The new list of all speaker devices plugged into the computer.
virtual void onComputerSpeakerDeviceChanged(IList<ISpeakerInfo*>* pNewSpeakerList) = 0;

/// \brief Notify the user that a microphone device is selected.
/// \param deviceId Specify a device to be selected.
/// \param deviceName Specify the device name assigned by deviceId.
virtual void onDefaultMicDeviceChanged(const wchar_t* deviceId, const wchar_t* deviceName) = 0;

/// \brief Notify the user that a speaker device is selected.
/// \param deviceId Specify a device to be selected.
/// \param deviceName Specify the device name assigned by deviceId.
virtual void onDefaultSpeakerDeviceChanged(const wchar_t* deviceId, const wchar_t* deviceName) = 0;
};

/// \brief Audio setting interface.
Expand Down
43 changes: 43 additions & 0 deletions zoom_sdk_c_sharp_wrap/h/zoom_sdk_platform.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#ifndef _ZOOM_SDK_PLATFORM_H_
#define _ZOOM_SDK_PLATFORM_H_
#if defined ( _WIN32 ) || defined ( __WIN32__ ) || defined ( WIN32 )
#ifdef ZOOMSDK_EXPORT
#define ZOOMSDK_MODULE_API __declspec(dllexport)
#else
#define ZOOMSDK_MODULE_API
#endif
#elif defined ( macintosh ) || defined ( __APPLE__ ) || defined ( __APPLE_CC__ ) || defined (ANDROID)
#ifdef ZOOMSDK_EXPORT
#define ZOOMSDK_MODULE_API __attribute__((visibility("default")))
#else
#define ZOOMSDK_MODULE_API
#endif
#else
#define ZOOMSDK_MODULE_API
#endif

#define ZOOM_RAWDATA_NAMESPACE ZOOMSDKRAWDATA
#define BEGIN_ZOOM_RAWDATA_NAMESPACE namespace ZOOM_RAWDATA_NAMESPACE {
#define END_ZOOM_RAWDATA_NAMESPACE };
#define USING_ZOOM_RAWDATA_NAMESPACE using namespace ZOOM_RAWDATA_NAMESPACE;

#define ZOOM_STATISTIC_NAMESPACE ZOOMSDKSTATISTIC
#define BEGIN_ZOOM_STATISTIC_NAMESPACE namespace ZOOM_STATISTIC_NAMESPACE {
#define END_ZOOM_STATISTIC_NAMESPACE };
#define USING_ZOOM_STATISTIC_NAMESPACE using namespace ZOOM_STATISTIC_NAMESPACE;

#if defined ( _WIN32 ) || defined ( __WIN32__ ) || defined ( WIN32 )
#include <tchar.h>
#else
#define TCHAR char
#endif

template<class T>
class IVector
{
public:
virtual ~IVector(){};
virtual int GetCount() = 0;
virtual T GetItem(int index) = 0;
};
#endif
171 changes: 171 additions & 0 deletions zoom_sdk_c_sharp_wrap/h/zoom_sdk_raw_data_helper_interface.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
#ifndef _ZOOM_SDK_RAW_DATA_HELPER_INTERFACE_H_
#define _ZOOM_SDK_RAW_DATA_HELPER_INTERFACE_H_
#include "zoom_sdk_platform.h"
BEGIN_ZOOM_RAWDATA_NAMESPACE
class IAudioRawDataChannel;
class IVideoRawDataChannel;
class IShareRawDataChannel;
enum SDKRawDataError
{
SDKRawDataError_SUCCESS,
SDKRawDataError_UNINITIALIZED,
SDKRawDataError_MALLOC_FAILED,
SDKRawDataError_WRONGUSAGE,
SDKRawDataError_INVALID_PARAM,
SDKRawDataError_NOT_IN_MEETING,
SDKRawDataError_NO_LICENSE,

SDKRawDataError_VIDEO_MODULE_NOT_READY,
SDKRawDataError_VIDEO_MODULE_ERROR,
SDKRawDataError_VIDEO_DEVICE_ERROR,
SDKRawDataError_NO_VIDEO_DATA,

SDKRawDataError_SHARE_MODULE_NOT_READY,
SDKRawDataError_SHARE_MODULE_ERROR,
SDKRawDataError_NO_SHARE_DATA,

SDKRawDataError_AUDIO_MODULE_NOT_READY,
SDKRawDataError_AUDIO_MODULE_ERROR,
SDKRawDataError_NO_AUDIO_DATA,
};
#ifdef __cplusplus
extern "C"
{
#endif //__cplusplus

ZOOMSDK_MODULE_API SDKRawDataError HasRawDataLicense();
ZOOMSDK_MODULE_API SDKRawDataError RetrieveAudioRawDataChannel(IAudioRawDataChannel** pp_channel);
ZOOMSDK_MODULE_API SDKRawDataError RetrieveVideoRawDataChannel(IVideoRawDataChannel** pp_channel);
ZOOMSDK_MODULE_API SDKRawDataError RetrieveShareRawDataChannel(IShareRawDataChannel** pp_channel);

#ifdef __cplusplus
};
#endif //__cplusplus

enum RawDataMemoryMode
{
RawDataMemoryMode_Stack,
RawDataMemoryMode_Heap,
};
enum RawDataResolution
{
RawDataResolution_90,
RawDataResolution_180,
RawDataResolution_360,
RawDataResolution_720,
#if (defined _WIN32) || (defined __MACOS__)
RawDataResolution_1080,
#endif
};
class YUVRawDataI420
{
public:
virtual bool CanAddRef() = 0;
virtual bool AddRef() = 0;
virtual int Release() = 0;
virtual char* GetYBuffer() = 0;
virtual char* GetUBuffer() = 0;
virtual char* GetVBuffer() = 0;
virtual char* GetBuffer() = 0;
virtual unsigned int GetBufferLen() = 0;
virtual bool IsLimitedI420() = 0;
virtual unsigned int GetStreamWidth() =0;
virtual unsigned int GetStreamHeight() = 0;
virtual unsigned int GetRotation() = 0;
virtual unsigned int GetSourceID() = 0;
virtual ~YUVRawDataI420(){}
};

class AudioRawData
{
public:
virtual bool CanAddRef() = 0;
virtual bool AddRef() = 0;
virtual int Release() = 0;
virtual char* GetBuffer() = 0;
virtual unsigned int GetBufferLen() = 0;
virtual unsigned int GetSampleRate() = 0;
virtual unsigned int GetChannelNum() = 0;
virtual ~AudioRawData(){}
};

class IAudioRawDataReceiver
{
public:
virtual ~IAudioRawDataReceiver(){}
virtual void onMixedAudioRawDataReceived(AudioRawData* data_) = 0;
virtual void onOneWayAudioRawDataReceived(AudioRawData* data_, unsigned int node_id) = 0;
};

class IAudioRawDataChannel
{
public:
virtual SDKRawDataError Start(RawDataMemoryMode mode, IAudioRawDataReceiver* data_receiver) = 0;
virtual SDKRawDataError Stop() = 0;
};

class IShareRawDataReceiver
{
public:
virtual ~IShareRawDataReceiver(){}
virtual void onShareRawDataReceived(YUVRawDataI420* data_, IVector<unsigned long long >* recv_handle_list) = 0;
virtual void onSubscribedShareUserDataOn(IVector<unsigned long long >* recv_handle_list) = 0;
virtual void onSubscribedShareUserDataOff(IVector<unsigned long long >* recv_handle_list) = 0;
virtual void onSubscribedShareUserLeft(IVector<unsigned long long >* recv_handle_list) = 0;
};

class IShareRawDataChannel
{
public:
virtual SDKRawDataError Start(RawDataMemoryMode mode, IShareRawDataReceiver* data_receiver) = 0;
virtual SDKRawDataError Subscribe(unsigned int node_id, RawDataResolution size_, unsigned long long recver_handle) = 0;
virtual SDKRawDataError UnSubscribe(unsigned int node_id, unsigned long long recver_handle) = 0;
virtual SDKRawDataError Stop() = 0;
};

enum LocalVideoDeviceRotation
{
LOCAL_DEVICE_ROTATION_ACTION_UNKnown,
LOCAL_DEVICE_ROTATION_ACTION_0,
LOCAL_DEVICE_ROTATION_ACTION_CLOCK90,
LOCAL_DEVICE_ROTATION_ACTION_CLOCK180,
LOCAL_DEVICE_ROTATION_ACTION_ANTI_CLOCK90
};

struct LocalVideoDeviceStatus
{
bool working;
LocalVideoDeviceRotation rotation;
LocalVideoDeviceStatus()
{
rotation = LOCAL_DEVICE_ROTATION_ACTION_0;
working = false;
}
};

class IVideoRawDataReceiver
{
public:
virtual ~IVideoRawDataReceiver(){}
virtual void onDeviceRunning(void* device) = 0;
virtual void onDeviceStop(void* device) = 0;
virtual void onSubscribedVideoUserDataOn(IVector<unsigned long long >* recv_handle_list) = 0;
virtual void onSubscribedVideoUserDataOff(IVector<unsigned long long >* recv_handle_list) = 0;
virtual void onSubscribedVideoUserLeft(IVector<unsigned long long >* recv_handle_list) = 0;
virtual void onVideoRawDataReceived(YUVRawDataI420* data_, IVector<unsigned long long >* recv_handle_list) = 0;
};

class IVideoRawDataChannel
{
public:
virtual SDKRawDataError Start(RawDataMemoryMode mode, IVideoRawDataReceiver* data_receiver) = 0;

virtual SDKRawDataError Subscribe(unsigned int node_id, RawDataResolution size_, unsigned long long recver_handle) = 0;
virtual SDKRawDataError UnSubscribe(unsigned int node_id, unsigned long long recver_handle) = 0;
virtual SDKRawDataError GetLocalDeviceStatus(void* device, LocalVideoDeviceStatus& status) = 0;
virtual SDKRawDataError RotateLocalDevice(void* device, LocalVideoDeviceRotation& rotation_flag) = 0;
virtual SDKRawDataError Stop() = 0;
};

END_ZOOM_RAWDATA_NAMESPACE
#endif
4 changes: 4 additions & 0 deletions zoom_sdk_c_sharp_wrap/wrap/audio_setting_context_wrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ DEFINE_FUNC_0(IsEchoCancellationEnabled, bool)
CallBack_FUNC_1(onComputerMicDeviceChanged, IList<IMicInfo*>*, pNewMicList)
//virtual void onComputerSpeakerDeviceChanged(IList<ISpeakerInfo*>* pNewSpeakerList) = 0;
CallBack_FUNC_1(onComputerSpeakerDeviceChanged, IList<ISpeakerInfo*>*, pNewSpeakerList)
//virtual void onDefaultMicDeviceChanged(const wchar_t* deviceId, const wchar_t* deviceName) = 0;
CallBack_FUNC_2(onDefaultMicDeviceChanged, const wchar_t*, deviceId, const wchar_t*, deviceName)
//virtual void onDefaultSpeakerDeviceChanged(const wchar_t* deviceId, const wchar_t* deviceName) = 0;
CallBack_FUNC_2(onDefaultSpeakerDeviceChanged, const wchar_t*, deviceId, const wchar_t*, deviceName)

END_CLASS_DEFINE(IAudioSettingContext)
END_ZOOM_SDK_NAMESPACE
7 changes: 7 additions & 0 deletions zoom_sdk_c_sharp_wrap/wrap/auth_service_wrap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ void UninitIAuthServiceFunc(ZOOM_SDK_NAMESPACE::IAuthService* obj)
IMPL_FUNC_0(IAuthService, LogOut, SDKError, SDKERR_UNINITIALIZE)
IMPL_FUNC_0(IAuthService, GetAccountInfo, IAccountInfo*, NULL)
IMPL_FUNC_0(IAuthService, GetLoginStatus, LOGINSTATUS, LOGIN_IDLE)
#if (defined UserInterfaceClass)
//virtual IOutlookPluginIntegrationHelper* GetOutlookPluginHeler() = 0;
IMPL_FUNC_0(IAuthService, GetOutlookPluginHeler, IOutlookPluginIntegrationHelper*, NULL)
//virtual IDirectShareServiceHelper* GetDirectShareServiceHeler() = 0;
IMPL_FUNC_0(IAuthService, GetDirectShareServiceHeler, IDirectShareServiceHelper*, NULL)
#endif
IMPL_FUNC_AND_MEMBER(IAuthService, T_GetOutlookPluginHeler, IOutlookPluginIntegrationHelperWrap)
IMPL_FUNC_AND_MEMBER(IAuthService, T_GetDirectShareServiceHeler, IDirectShareServiceHelperWrap)

END_ZOOM_SDK_NAMESPACE
Loading

0 comments on commit 30fb8c6

Please sign in to comment.