Przeglądaj źródła

Generated 2018-01-11 for rtc.

sdk-team 5 lat temu
rodzic
commit
c68f639be4

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-11-27 Version: patch
+- Generated 2018-01-11 for `rtc`.
+
 2020-11-27 Version: patch
 - Add Certificate Manager Api.
 

+ 8 - 0
rtc/CMakeLists.txt

@@ -89,6 +89,10 @@ set(rtc_public_header_model
 	include/alibabacloud/rtc/model/DescribeRtcPeakUserCntDataResult.h
 	include/alibabacloud/rtc/model/DescribeRtcQualityMetricRequest.h
 	include/alibabacloud/rtc/model/DescribeRtcQualityMetricResult.h
+	include/alibabacloud/rtc/model/DescribeRtcScaleRequest.h
+	include/alibabacloud/rtc/model/DescribeRtcScaleResult.h
+	include/alibabacloud/rtc/model/DescribeRtcScaleDetailRequest.h
+	include/alibabacloud/rtc/model/DescribeRtcScaleDetailResult.h
 	include/alibabacloud/rtc/model/DescribeRtcUserCntDataRequest.h
 	include/alibabacloud/rtc/model/DescribeRtcUserCntDataResult.h
 	include/alibabacloud/rtc/model/DescribeRtcUserEventsRequest.h
@@ -214,6 +218,10 @@ set(rtc_src
 	src/model/DescribeRtcPeakUserCntDataResult.cc
 	src/model/DescribeRtcQualityMetricRequest.cc
 	src/model/DescribeRtcQualityMetricResult.cc
+	src/model/DescribeRtcScaleRequest.cc
+	src/model/DescribeRtcScaleResult.cc
+	src/model/DescribeRtcScaleDetailRequest.cc
+	src/model/DescribeRtcScaleDetailResult.cc
 	src/model/DescribeRtcUserCntDataRequest.cc
 	src/model/DescribeRtcUserCntDataResult.cc
 	src/model/DescribeRtcUserEventsRequest.cc

+ 16 - 0
rtc/include/alibabacloud/rtc/RtcClient.h

@@ -90,6 +90,10 @@
 #include "model/DescribeRtcPeakUserCntDataResult.h"
 #include "model/DescribeRtcQualityMetricRequest.h"
 #include "model/DescribeRtcQualityMetricResult.h"
+#include "model/DescribeRtcScaleRequest.h"
+#include "model/DescribeRtcScaleResult.h"
+#include "model/DescribeRtcScaleDetailRequest.h"
+#include "model/DescribeRtcScaleDetailResult.h"
 #include "model/DescribeRtcUserCntDataRequest.h"
 #include "model/DescribeRtcUserCntDataResult.h"
 #include "model/DescribeRtcUserEventsRequest.h"
@@ -255,6 +259,12 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::DescribeRtcQualityMetricResult> DescribeRtcQualityMetricOutcome;
 			typedef std::future<DescribeRtcQualityMetricOutcome> DescribeRtcQualityMetricOutcomeCallable;
 			typedef std::function<void(const RtcClient*, const Model::DescribeRtcQualityMetricRequest&, const DescribeRtcQualityMetricOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRtcQualityMetricAsyncHandler;
+			typedef Outcome<Error, Model::DescribeRtcScaleResult> DescribeRtcScaleOutcome;
+			typedef std::future<DescribeRtcScaleOutcome> DescribeRtcScaleOutcomeCallable;
+			typedef std::function<void(const RtcClient*, const Model::DescribeRtcScaleRequest&, const DescribeRtcScaleOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRtcScaleAsyncHandler;
+			typedef Outcome<Error, Model::DescribeRtcScaleDetailResult> DescribeRtcScaleDetailOutcome;
+			typedef std::future<DescribeRtcScaleDetailOutcome> DescribeRtcScaleDetailOutcomeCallable;
+			typedef std::function<void(const RtcClient*, const Model::DescribeRtcScaleDetailRequest&, const DescribeRtcScaleDetailOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRtcScaleDetailAsyncHandler;
 			typedef Outcome<Error, Model::DescribeRtcUserCntDataResult> DescribeRtcUserCntDataOutcome;
 			typedef std::future<DescribeRtcUserCntDataOutcome> DescribeRtcUserCntDataOutcomeCallable;
 			typedef std::function<void(const RtcClient*, const Model::DescribeRtcUserCntDataRequest&, const DescribeRtcUserCntDataOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> DescribeRtcUserCntDataAsyncHandler;
@@ -443,6 +453,12 @@ namespace AlibabaCloud
 			DescribeRtcQualityMetricOutcome describeRtcQualityMetric(const Model::DescribeRtcQualityMetricRequest &request)const;
 			void describeRtcQualityMetricAsync(const Model::DescribeRtcQualityMetricRequest& request, const DescribeRtcQualityMetricAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRtcQualityMetricOutcomeCallable describeRtcQualityMetricCallable(const Model::DescribeRtcQualityMetricRequest& request) const;
+			DescribeRtcScaleOutcome describeRtcScale(const Model::DescribeRtcScaleRequest &request)const;
+			void describeRtcScaleAsync(const Model::DescribeRtcScaleRequest& request, const DescribeRtcScaleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeRtcScaleOutcomeCallable describeRtcScaleCallable(const Model::DescribeRtcScaleRequest& request) const;
+			DescribeRtcScaleDetailOutcome describeRtcScaleDetail(const Model::DescribeRtcScaleDetailRequest &request)const;
+			void describeRtcScaleDetailAsync(const Model::DescribeRtcScaleDetailRequest& request, const DescribeRtcScaleDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			DescribeRtcScaleDetailOutcomeCallable describeRtcScaleDetailCallable(const Model::DescribeRtcScaleDetailRequest& request) const;
 			DescribeRtcUserCntDataOutcome describeRtcUserCntData(const Model::DescribeRtcUserCntDataRequest &request)const;
 			void describeRtcUserCntDataAsync(const Model::DescribeRtcUserCntDataRequest& request, const DescribeRtcUserCntDataAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			DescribeRtcUserCntDataOutcomeCallable describeRtcUserCntDataCallable(const Model::DescribeRtcUserCntDataRequest& request) const;

+ 60 - 0
rtc/include/alibabacloud/rtc/model/DescribeRtcScaleDetailRequest.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEDETAILREQUEST_H_
+#define ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEDETAILREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/rtc/RtcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Rtc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_RTC_EXPORT DescribeRtcScaleDetailRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeRtcScaleDetailRequest();
+				~DescribeRtcScaleDetailRequest();
+
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getShowLog()const;
+				void setShowLog(const std::string& showLog);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getAppId()const;
+				void setAppId(const std::string& appId);
+
+            private:
+				std::string startTime_;
+				std::string showLog_;
+				std::string endTime_;
+				long ownerId_;
+				std::string appId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEDETAILREQUEST_H_

+ 57 - 0
rtc/include/alibabacloud/rtc/model/DescribeRtcScaleDetailResult.h

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEDETAILRESULT_H_
+#define ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEDETAILRESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/rtc/RtcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Rtc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_RTC_EXPORT DescribeRtcScaleDetailResult : public ServiceResult
+			{
+			public:
+				struct ScaleItem
+				{
+					long cC;
+					long uC;
+					std::string tS;
+				};
+
+
+				DescribeRtcScaleDetailResult();
+				explicit DescribeRtcScaleDetailResult(const std::string &payload);
+				~DescribeRtcScaleDetailResult();
+				std::vector<ScaleItem> getScale()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<ScaleItem> scale_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEDETAILRESULT_H_

+ 60 - 0
rtc/include/alibabacloud/rtc/model/DescribeRtcScaleRequest.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEREQUEST_H_
+#define ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEREQUEST_H_
+
+#include <string>
+#include <vector>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <alibabacloud/rtc/RtcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Rtc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_RTC_EXPORT DescribeRtcScaleRequest : public RpcServiceRequest
+			{
+
+			public:
+				DescribeRtcScaleRequest();
+				~DescribeRtcScaleRequest();
+
+				std::string getStartTime()const;
+				void setStartTime(const std::string& startTime);
+				std::string getShowLog()const;
+				void setShowLog(const std::string& showLog);
+				std::string getEndTime()const;
+				void setEndTime(const std::string& endTime);
+				long getOwnerId()const;
+				void setOwnerId(long ownerId);
+				std::string getAppId()const;
+				void setAppId(const std::string& appId);
+
+            private:
+				std::string startTime_;
+				std::string showLog_;
+				std::string endTime_;
+				long ownerId_;
+				std::string appId_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALEREQUEST_H_

+ 60 - 0
rtc/include/alibabacloud/rtc/model/DescribeRtcScaleResult.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALERESULT_H_
+#define ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/rtc/RtcExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Rtc
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_RTC_EXPORT DescribeRtcScaleResult : public ServiceResult
+			{
+			public:
+				struct ScaleItem
+				{
+					long channelCount;
+					long videoDuration;
+					long userCount;
+					std::string time;
+					long sessionCount;
+					long audioDuration;
+				};
+
+
+				DescribeRtcScaleResult();
+				explicit DescribeRtcScaleResult(const std::string &payload);
+				~DescribeRtcScaleResult();
+				std::vector<ScaleItem> getScale()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::vector<ScaleItem> scale_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_RTC_MODEL_DESCRIBERTCSCALERESULT_H_

+ 39 - 18
rtc/include/alibabacloud/rtc/model/StartMPUTaskRequest.h

@@ -59,6 +59,15 @@ namespace AlibabaCloud
 					};
 					std::vector<Texts> texts;
 				};
+				struct ClockWidgets
+				{
+					float x;
+					float y;
+					int fontType;
+					int fontSize;
+					int fontColor;
+					int zOrder;
+				};
 				struct Watermarks
 				{
 					std::string url;
@@ -89,30 +98,38 @@ namespace AlibabaCloud
 				void setPayloadType(int payloadType);
 				std::vector<UserPanes> getUserPanes()const;
 				void setUserPanes(const std::vector<UserPanes>& userPanes);
-				int getRtpExtInfo()const;
-				void setRtpExtInfo(int rtpExtInfo);
 				int getBackgroundColor()const;
 				void setBackgroundColor(int backgroundColor);
-				int getCropMode()const;
-				void setCropMode(int cropMode);
 				int getReportVad()const;
 				void setReportVad(int reportVad);
-				std::string getTaskProfile()const;
-				void setTaskProfile(const std::string& taskProfile);
-				std::vector<long> getLayoutIds()const;
-				void setLayoutIds(const std::vector<long>& layoutIds);
+				std::string getSourceType()const;
+				void setSourceType(const std::string& sourceType);
 				std::string getTaskId()const;
 				void setTaskId(const std::string& taskId);
+				std::vector<ClockWidgets> getClockWidgets()const;
+				void setClockWidgets(const std::vector<ClockWidgets>& clockWidgets);
 				std::string getShowLog()const;
 				void setShowLog(const std::string& showLog);
-				std::string getStreamURL()const;
-				void setStreamURL(const std::string& streamURL);
 				long getVadInterval()const;
 				void setVadInterval(long vadInterval);
 				std::vector<Watermarks> getWatermarks()const;
 				void setWatermarks(const std::vector<Watermarks>& watermarks);
 				long getOwnerId()const;
 				void setOwnerId(long ownerId);
+				int getMediaEncode()const;
+				void setMediaEncode(int mediaEncode);
+				int getRtpExtInfo()const;
+				void setRtpExtInfo(int rtpExtInfo);
+				int getCropMode()const;
+				void setCropMode(int cropMode);
+				std::string getTaskProfile()const;
+				void setTaskProfile(const std::string& taskProfile);
+				std::vector<long> getLayoutIds()const;
+				void setLayoutIds(const std::vector<long>& layoutIds);
+				std::string getStreamURL()const;
+				void setStreamURL(const std::string& streamURL);
+				int getStreamType()const;
+				void setStreamType(int streamType);
 				std::vector<std::string> getSubSpecUsers()const;
 				void setSubSpecUsers(const std::vector<std::string>& subSpecUsers);
 				std::string getAppId()const;
@@ -121,31 +138,35 @@ namespace AlibabaCloud
 				void setBackgrounds(const std::vector<Backgrounds>& backgrounds);
 				long getTimeStampRef()const;
 				void setTimeStampRef(long timeStampRef);
-				int getMediaEncode()const;
-				void setMediaEncode(int mediaEncode);
+				int getMixMode()const;
+				void setMixMode(int mixMode);
 				std::string getChannelId()const;
 				void setChannelId(const std::string& channelId);
 
             private:
 				int payloadType_;
 				std::vector<UserPanes> userPanes_;
-				int rtpExtInfo_;
 				int backgroundColor_;
-				int cropMode_;
 				int reportVad_;
-				std::string taskProfile_;
-				std::vector<long> layoutIds_;
+				std::string sourceType_;
 				std::string taskId_;
+				std::vector<ClockWidgets> clockWidgets_;
 				std::string showLog_;
-				std::string streamURL_;
 				long vadInterval_;
 				std::vector<Watermarks> watermarks_;
 				long ownerId_;
+				int mediaEncode_;
+				int rtpExtInfo_;
+				int cropMode_;
+				std::string taskProfile_;
+				std::vector<long> layoutIds_;
+				std::string streamURL_;
+				int streamType_;
 				std::vector<std::string> subSpecUsers_;
 				std::string appId_;
 				std::vector<Backgrounds> backgrounds_;
 				long timeStampRef_;
-				int mediaEncode_;
+				int mixMode_;
 				std::string channelId_;
 
 			};

+ 12 - 0
rtc/include/alibabacloud/rtc/model/UpdateMPULayoutRequest.h

@@ -59,6 +59,15 @@ namespace AlibabaCloud
 					};
 					std::vector<Texts> texts;
 				};
+				struct ClockWidgets
+				{
+					float x;
+					float y;
+					int fontType;
+					int fontSize;
+					int fontColor;
+					int zOrder;
+				};
 				struct Watermarks
 				{
 					std::string url;
@@ -95,6 +104,8 @@ namespace AlibabaCloud
 				void setLayoutIds(const std::vector<long>& layoutIds);
 				std::string getTaskId()const;
 				void setTaskId(const std::string& taskId);
+				std::vector<ClockWidgets> getClockWidgets()const;
+				void setClockWidgets(const std::vector<ClockWidgets>& clockWidgets);
 				std::string getShowLog()const;
 				void setShowLog(const std::string& showLog);
 				std::vector<Watermarks> getWatermarks()const;
@@ -112,6 +123,7 @@ namespace AlibabaCloud
 				int cropMode_;
 				std::vector<long> layoutIds_;
 				std::string taskId_;
+				std::vector<ClockWidgets> clockWidgets_;
 				std::string showLog_;
 				std::vector<Watermarks> watermarks_;
 				long ownerId_;

+ 72 - 0
rtc/src/RtcClient.cc

@@ -1275,6 +1275,78 @@ RtcClient::DescribeRtcQualityMetricOutcomeCallable RtcClient::describeRtcQuality
 	return task->get_future();
 }
 
+RtcClient::DescribeRtcScaleOutcome RtcClient::describeRtcScale(const DescribeRtcScaleRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeRtcScaleOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeRtcScaleOutcome(DescribeRtcScaleResult(outcome.result()));
+	else
+		return DescribeRtcScaleOutcome(outcome.error());
+}
+
+void RtcClient::describeRtcScaleAsync(const DescribeRtcScaleRequest& request, const DescribeRtcScaleAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeRtcScale(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RtcClient::DescribeRtcScaleOutcomeCallable RtcClient::describeRtcScaleCallable(const DescribeRtcScaleRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeRtcScaleOutcome()>>(
+			[this, request]()
+			{
+			return this->describeRtcScale(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
+RtcClient::DescribeRtcScaleDetailOutcome RtcClient::describeRtcScaleDetail(const DescribeRtcScaleDetailRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return DescribeRtcScaleDetailOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return DescribeRtcScaleDetailOutcome(DescribeRtcScaleDetailResult(outcome.result()));
+	else
+		return DescribeRtcScaleDetailOutcome(outcome.error());
+}
+
+void RtcClient::describeRtcScaleDetailAsync(const DescribeRtcScaleDetailRequest& request, const DescribeRtcScaleDetailAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, describeRtcScaleDetail(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+RtcClient::DescribeRtcScaleDetailOutcomeCallable RtcClient::describeRtcScaleDetailCallable(const DescribeRtcScaleDetailRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<DescribeRtcScaleDetailOutcome()>>(
+			[this, request]()
+			{
+			return this->describeRtcScaleDetail(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 RtcClient::DescribeRtcUserCntDataOutcome RtcClient::describeRtcUserCntData(const DescribeRtcUserCntDataRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

+ 84 - 0
rtc/src/model/DescribeRtcScaleDetailRequest.cc

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/rtc/model/DescribeRtcScaleDetailRequest.h>
+
+using AlibabaCloud::Rtc::Model::DescribeRtcScaleDetailRequest;
+
+DescribeRtcScaleDetailRequest::DescribeRtcScaleDetailRequest() :
+	RpcServiceRequest("rtc", "2018-01-11", "DescribeRtcScaleDetail")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeRtcScaleDetailRequest::~DescribeRtcScaleDetailRequest()
+{}
+
+std::string DescribeRtcScaleDetailRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeRtcScaleDetailRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
+std::string DescribeRtcScaleDetailRequest::getShowLog()const
+{
+	return showLog_;
+}
+
+void DescribeRtcScaleDetailRequest::setShowLog(const std::string& showLog)
+{
+	showLog_ = showLog;
+	setParameter("ShowLog", showLog);
+}
+
+std::string DescribeRtcScaleDetailRequest::getEndTime()const
+{
+	return endTime_;
+}
+
+void DescribeRtcScaleDetailRequest::setEndTime(const std::string& endTime)
+{
+	endTime_ = endTime;
+	setParameter("EndTime", endTime);
+}
+
+long DescribeRtcScaleDetailRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeRtcScaleDetailRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DescribeRtcScaleDetailRequest::getAppId()const
+{
+	return appId_;
+}
+
+void DescribeRtcScaleDetailRequest::setAppId(const std::string& appId)
+{
+	appId_ = appId;
+	setParameter("AppId", appId);
+}
+

+ 61 - 0
rtc/src/model/DescribeRtcScaleDetailResult.cc

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/rtc/model/DescribeRtcScaleDetailResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Rtc;
+using namespace AlibabaCloud::Rtc::Model;
+
+DescribeRtcScaleDetailResult::DescribeRtcScaleDetailResult() :
+	ServiceResult()
+{}
+
+DescribeRtcScaleDetailResult::DescribeRtcScaleDetailResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeRtcScaleDetailResult::~DescribeRtcScaleDetailResult()
+{}
+
+void DescribeRtcScaleDetailResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allScaleNode = value["Scale"]["ScaleItem"];
+	for (auto valueScaleScaleItem : allScaleNode)
+	{
+		ScaleItem scaleObject;
+		if(!valueScaleScaleItem["TS"].isNull())
+			scaleObject.tS = valueScaleScaleItem["TS"].asString();
+		if(!valueScaleScaleItem["CC"].isNull())
+			scaleObject.cC = std::stol(valueScaleScaleItem["CC"].asString());
+		if(!valueScaleScaleItem["UC"].isNull())
+			scaleObject.uC = std::stol(valueScaleScaleItem["UC"].asString());
+		scale_.push_back(scaleObject);
+	}
+
+}
+
+std::vector<DescribeRtcScaleDetailResult::ScaleItem> DescribeRtcScaleDetailResult::getScale()const
+{
+	return scale_;
+}
+

+ 84 - 0
rtc/src/model/DescribeRtcScaleRequest.cc

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/rtc/model/DescribeRtcScaleRequest.h>
+
+using AlibabaCloud::Rtc::Model::DescribeRtcScaleRequest;
+
+DescribeRtcScaleRequest::DescribeRtcScaleRequest() :
+	RpcServiceRequest("rtc", "2018-01-11", "DescribeRtcScale")
+{
+	setMethod(HttpRequest::Method::Post);
+}
+
+DescribeRtcScaleRequest::~DescribeRtcScaleRequest()
+{}
+
+std::string DescribeRtcScaleRequest::getStartTime()const
+{
+	return startTime_;
+}
+
+void DescribeRtcScaleRequest::setStartTime(const std::string& startTime)
+{
+	startTime_ = startTime;
+	setParameter("StartTime", startTime);
+}
+
+std::string DescribeRtcScaleRequest::getShowLog()const
+{
+	return showLog_;
+}
+
+void DescribeRtcScaleRequest::setShowLog(const std::string& showLog)
+{
+	showLog_ = showLog;
+	setParameter("ShowLog", showLog);
+}
+
+std::string DescribeRtcScaleRequest::getEndTime()const
+{
+	return endTime_;
+}
+
+void DescribeRtcScaleRequest::setEndTime(const std::string& endTime)
+{
+	endTime_ = endTime;
+	setParameter("EndTime", endTime);
+}
+
+long DescribeRtcScaleRequest::getOwnerId()const
+{
+	return ownerId_;
+}
+
+void DescribeRtcScaleRequest::setOwnerId(long ownerId)
+{
+	ownerId_ = ownerId;
+	setParameter("OwnerId", std::to_string(ownerId));
+}
+
+std::string DescribeRtcScaleRequest::getAppId()const
+{
+	return appId_;
+}
+
+void DescribeRtcScaleRequest::setAppId(const std::string& appId)
+{
+	appId_ = appId;
+	setParameter("AppId", appId);
+}
+

+ 67 - 0
rtc/src/model/DescribeRtcScaleResult.cc

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/rtc/model/DescribeRtcScaleResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Rtc;
+using namespace AlibabaCloud::Rtc::Model;
+
+DescribeRtcScaleResult::DescribeRtcScaleResult() :
+	ServiceResult()
+{}
+
+DescribeRtcScaleResult::DescribeRtcScaleResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+DescribeRtcScaleResult::~DescribeRtcScaleResult()
+{}
+
+void DescribeRtcScaleResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	auto allScaleNode = value["Scale"]["ScaleItem"];
+	for (auto valueScaleScaleItem : allScaleNode)
+	{
+		ScaleItem scaleObject;
+		if(!valueScaleScaleItem["Time"].isNull())
+			scaleObject.time = valueScaleScaleItem["Time"].asString();
+		if(!valueScaleScaleItem["ChannelCount"].isNull())
+			scaleObject.channelCount = std::stol(valueScaleScaleItem["ChannelCount"].asString());
+		if(!valueScaleScaleItem["UserCount"].isNull())
+			scaleObject.userCount = std::stol(valueScaleScaleItem["UserCount"].asString());
+		if(!valueScaleScaleItem["SessionCount"].isNull())
+			scaleObject.sessionCount = std::stol(valueScaleScaleItem["SessionCount"].asString());
+		if(!valueScaleScaleItem["AudioDuration"].isNull())
+			scaleObject.audioDuration = std::stol(valueScaleScaleItem["AudioDuration"].asString());
+		if(!valueScaleScaleItem["VideoDuration"].isNull())
+			scaleObject.videoDuration = std::stol(valueScaleScaleItem["VideoDuration"].asString());
+		scale_.push_back(scaleObject);
+	}
+
+}
+
+std::vector<DescribeRtcScaleResult::ScaleItem> DescribeRtcScaleResult::getScale()const
+{
+	return scale_;
+}
+

+ 108 - 55
rtc/src/model/StartMPUTaskRequest.cc

@@ -77,17 +77,6 @@ void StartMPUTaskRequest::setUserPanes(const std::vector<UserPanes>& userPanes)
 	}
 }
 
-int StartMPUTaskRequest::getRtpExtInfo()const
-{
-	return rtpExtInfo_;
-}
-
-void StartMPUTaskRequest::setRtpExtInfo(int rtpExtInfo)
-{
-	rtpExtInfo_ = rtpExtInfo;
-	setParameter("RtpExtInfo", std::to_string(rtpExtInfo));
-}
-
 int StartMPUTaskRequest::getBackgroundColor()const
 {
 	return backgroundColor_;
@@ -99,17 +88,6 @@ void StartMPUTaskRequest::setBackgroundColor(int backgroundColor)
 	setParameter("BackgroundColor", std::to_string(backgroundColor));
 }
 
-int StartMPUTaskRequest::getCropMode()const
-{
-	return cropMode_;
-}
-
-void StartMPUTaskRequest::setCropMode(int cropMode)
-{
-	cropMode_ = cropMode;
-	setParameter("CropMode", std::to_string(cropMode));
-}
-
 int StartMPUTaskRequest::getReportVad()const
 {
 	return reportVad_;
@@ -121,28 +99,15 @@ void StartMPUTaskRequest::setReportVad(int reportVad)
 	setParameter("ReportVad", std::to_string(reportVad));
 }
 
-std::string StartMPUTaskRequest::getTaskProfile()const
-{
-	return taskProfile_;
-}
-
-void StartMPUTaskRequest::setTaskProfile(const std::string& taskProfile)
-{
-	taskProfile_ = taskProfile;
-	setParameter("TaskProfile", taskProfile);
-}
-
-std::vector<long> StartMPUTaskRequest::getLayoutIds()const
+std::string StartMPUTaskRequest::getSourceType()const
 {
-	return layoutIds_;
+	return sourceType_;
 }
 
-void StartMPUTaskRequest::setLayoutIds(const std::vector<long>& layoutIds)
+void StartMPUTaskRequest::setSourceType(const std::string& sourceType)
 {
-	layoutIds_ = layoutIds;
-	for(int dep1 = 0; dep1!= layoutIds.size(); dep1++) {
-		setParameter("LayoutIds."+ std::to_string(dep1), std::to_string(layoutIds.at(dep1)));
-	}
+	sourceType_ = sourceType;
+	setParameter("SourceType", sourceType);
 }
 
 std::string StartMPUTaskRequest::getTaskId()const
@@ -156,26 +121,35 @@ void StartMPUTaskRequest::setTaskId(const std::string& taskId)
 	setParameter("TaskId", taskId);
 }
 
-std::string StartMPUTaskRequest::getShowLog()const
+std::vector<StartMPUTaskRequest::ClockWidgets> StartMPUTaskRequest::getClockWidgets()const
 {
-	return showLog_;
+	return clockWidgets_;
 }
 
-void StartMPUTaskRequest::setShowLog(const std::string& showLog)
+void StartMPUTaskRequest::setClockWidgets(const std::vector<ClockWidgets>& clockWidgets)
 {
-	showLog_ = showLog;
-	setParameter("ShowLog", showLog);
+	clockWidgets_ = clockWidgets;
+	for(int dep1 = 0; dep1!= clockWidgets.size(); dep1++) {
+		auto clockWidgetsObj = clockWidgets.at(dep1);
+		std::string clockWidgetsObjStr = "ClockWidgets." + std::to_string(dep1 + 1);
+		setParameter(clockWidgetsObjStr + ".X", std::to_string(clockWidgetsObj.x));
+		setParameter(clockWidgetsObjStr + ".Y", std::to_string(clockWidgetsObj.y));
+		setParameter(clockWidgetsObjStr + ".FontType", std::to_string(clockWidgetsObj.fontType));
+		setParameter(clockWidgetsObjStr + ".FontSize", std::to_string(clockWidgetsObj.fontSize));
+		setParameter(clockWidgetsObjStr + ".FontColor", std::to_string(clockWidgetsObj.fontColor));
+		setParameter(clockWidgetsObjStr + ".ZOrder", std::to_string(clockWidgetsObj.zOrder));
+	}
 }
 
-std::string StartMPUTaskRequest::getStreamURL()const
+std::string StartMPUTaskRequest::getShowLog()const
 {
-	return streamURL_;
+	return showLog_;
 }
 
-void StartMPUTaskRequest::setStreamURL(const std::string& streamURL)
+void StartMPUTaskRequest::setShowLog(const std::string& showLog)
 {
-	streamURL_ = streamURL;
-	setParameter("StreamURL", streamURL);
+	showLog_ = showLog;
+	setParameter("ShowLog", showLog);
 }
 
 long StartMPUTaskRequest::getVadInterval()const
@@ -222,6 +196,85 @@ void StartMPUTaskRequest::setOwnerId(long ownerId)
 	setParameter("OwnerId", std::to_string(ownerId));
 }
 
+int StartMPUTaskRequest::getMediaEncode()const
+{
+	return mediaEncode_;
+}
+
+void StartMPUTaskRequest::setMediaEncode(int mediaEncode)
+{
+	mediaEncode_ = mediaEncode;
+	setParameter("MediaEncode", std::to_string(mediaEncode));
+}
+
+int StartMPUTaskRequest::getRtpExtInfo()const
+{
+	return rtpExtInfo_;
+}
+
+void StartMPUTaskRequest::setRtpExtInfo(int rtpExtInfo)
+{
+	rtpExtInfo_ = rtpExtInfo;
+	setParameter("RtpExtInfo", std::to_string(rtpExtInfo));
+}
+
+int StartMPUTaskRequest::getCropMode()const
+{
+	return cropMode_;
+}
+
+void StartMPUTaskRequest::setCropMode(int cropMode)
+{
+	cropMode_ = cropMode;
+	setParameter("CropMode", std::to_string(cropMode));
+}
+
+std::string StartMPUTaskRequest::getTaskProfile()const
+{
+	return taskProfile_;
+}
+
+void StartMPUTaskRequest::setTaskProfile(const std::string& taskProfile)
+{
+	taskProfile_ = taskProfile;
+	setParameter("TaskProfile", taskProfile);
+}
+
+std::vector<long> StartMPUTaskRequest::getLayoutIds()const
+{
+	return layoutIds_;
+}
+
+void StartMPUTaskRequest::setLayoutIds(const std::vector<long>& layoutIds)
+{
+	layoutIds_ = layoutIds;
+	for(int dep1 = 0; dep1!= layoutIds.size(); dep1++) {
+		setParameter("LayoutIds."+ std::to_string(dep1), std::to_string(layoutIds.at(dep1)));
+	}
+}
+
+std::string StartMPUTaskRequest::getStreamURL()const
+{
+	return streamURL_;
+}
+
+void StartMPUTaskRequest::setStreamURL(const std::string& streamURL)
+{
+	streamURL_ = streamURL;
+	setParameter("StreamURL", streamURL);
+}
+
+int StartMPUTaskRequest::getStreamType()const
+{
+	return streamType_;
+}
+
+void StartMPUTaskRequest::setStreamType(int streamType)
+{
+	streamType_ = streamType;
+	setParameter("StreamType", std::to_string(streamType));
+}
+
 std::vector<std::string> StartMPUTaskRequest::getSubSpecUsers()const
 {
 	return subSpecUsers_;
@@ -278,15 +331,15 @@ void StartMPUTaskRequest::setTimeStampRef(long timeStampRef)
 	setParameter("TimeStampRef", std::to_string(timeStampRef));
 }
 
-int StartMPUTaskRequest::getMediaEncode()const
+int StartMPUTaskRequest::getMixMode()const
 {
-	return mediaEncode_;
+	return mixMode_;
 }
 
-void StartMPUTaskRequest::setMediaEncode(int mediaEncode)
+void StartMPUTaskRequest::setMixMode(int mixMode)
 {
-	mediaEncode_ = mediaEncode;
-	setParameter("MediaEncode", std::to_string(mediaEncode));
+	mixMode_ = mixMode;
+	setParameter("MixMode", std::to_string(mixMode));
 }
 
 std::string StartMPUTaskRequest::getChannelId()const

+ 20 - 0
rtc/src/model/UpdateMPULayoutRequest.cc

@@ -112,6 +112,26 @@ void UpdateMPULayoutRequest::setTaskId(const std::string& taskId)
 	setParameter("TaskId", taskId);
 }
 
+std::vector<UpdateMPULayoutRequest::ClockWidgets> UpdateMPULayoutRequest::getClockWidgets()const
+{
+	return clockWidgets_;
+}
+
+void UpdateMPULayoutRequest::setClockWidgets(const std::vector<ClockWidgets>& clockWidgets)
+{
+	clockWidgets_ = clockWidgets;
+	for(int dep1 = 0; dep1!= clockWidgets.size(); dep1++) {
+		auto clockWidgetsObj = clockWidgets.at(dep1);
+		std::string clockWidgetsObjStr = "ClockWidgets." + std::to_string(dep1 + 1);
+		setParameter(clockWidgetsObjStr + ".X", std::to_string(clockWidgetsObj.x));
+		setParameter(clockWidgetsObjStr + ".Y", std::to_string(clockWidgetsObj.y));
+		setParameter(clockWidgetsObjStr + ".FontType", std::to_string(clockWidgetsObj.fontType));
+		setParameter(clockWidgetsObjStr + ".FontSize", std::to_string(clockWidgetsObj.fontSize));
+		setParameter(clockWidgetsObjStr + ".FontColor", std::to_string(clockWidgetsObj.fontColor));
+		setParameter(clockWidgetsObjStr + ".ZOrder", std::to_string(clockWidgetsObj.zOrder));
+	}
+}
+
 std::string UpdateMPULayoutRequest::getShowLog()const
 {
 	return showLog_;