From 776a55cf64a5f3d5a26a9c4044bb1f7ceb896f22 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 6 Aug 2024 09:44:30 +0000 Subject: [PATCH] Update to support new apis. --- VERSION | 2 +- .../live/model/ListRtcMPUTaskDetailResult.h | 5 ++ .../live/model/StartLiveMPUTaskRequest.h | 18 ++++--- .../live/model/UpdateLiveMPUTaskRequest.h | 6 +++ live/src/model/ListLiveMessageAppsResult.cc | 12 ++--- live/src/model/ListRtcMPUTaskDetailResult.cc | 8 ++++ live/src/model/StartLiveMPUTaskRequest.cc | 47 ++++++++++++------- live/src/model/UpdateLiveMPUTaskRequest.cc | 11 +++++ 8 files changed, 78 insertions(+), 31 deletions(-) diff --git a/VERSION b/VERSION index 76ae00cae..03cb7a10b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1966 \ No newline at end of file +1.36.1967 \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/ListRtcMPUTaskDetailResult.h b/live/include/alibabacloud/live/model/ListRtcMPUTaskDetailResult.h index 3d8089d94..12506a2b9 100644 --- a/live/include/alibabacloud/live/model/ListRtcMPUTaskDetailResult.h +++ b/live/include/alibabacloud/live/model/ListRtcMPUTaskDetailResult.h @@ -118,6 +118,10 @@ namespace AlibabaCloud PassThrough passThrough; std::string payloadType; }; + struct MultiStreamURLItem + { + std::string uRL; + }; std::string taskId; std::string mixMode; std::string appId; @@ -126,6 +130,7 @@ namespace AlibabaCloud SingleSubParams singleSubParams; TranscodeParams transcodeParams; std::string channelId; + std::vector multiStreamURL; std::string streamURL; }; diff --git a/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h b/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h index e1b1be2cf..01bfc1585 100644 --- a/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h +++ b/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h @@ -33,6 +33,9 @@ public: std::string sourceType; std::string userId; }; + struct MultiStreamURL { + std::string uRL; + }; struct SeiParams { std::string payloadType; struct LayoutVolume { @@ -106,6 +109,12 @@ public: ~StartLiveMPUTaskRequest(); SingleSubParams getSingleSubParams() const; void setSingleSubParams(const SingleSubParams &singleSubParams); + std::string getTaskId() const; + void setTaskId(const std::string &taskId); + std::string getStreamURL() const; + void setStreamURL(const std::string &streamURL); + std::vector getMultiStreamURL() const; + void setMultiStreamURL(const std::vector &multiStreamURL); SeiParams getSeiParams() const; void setSeiParams(const SeiParams &seiParams); TranscodeParams getTranscodeParams() const; @@ -118,21 +127,18 @@ public: void setMixMode(const std::string &mixMode); std::string getChannelId() const; void setChannelId(const std::string &channelId); - std::string getTaskId() const; - void setTaskId(const std::string &taskId); - std::string getStreamURL() const; - void setStreamURL(const std::string &streamURL); private: SingleSubParams singleSubParams_; + std::string taskId_; + std::string streamURL_; + std::vector multiStreamURL_; SeiParams seiParams_; TranscodeParams transcodeParams_; std::string appId_; std::string region_; std::string mixMode_; std::string channelId_; - std::string taskId_; - std::string streamURL_; }; } // namespace Model } // namespace Live diff --git a/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h b/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h index 32c4324ec..5a806a574 100644 --- a/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h +++ b/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h @@ -28,6 +28,9 @@ namespace Live { namespace Model { class ALIBABACLOUD_LIVE_EXPORT UpdateLiveMPUTaskRequest : public RpcServiceRequest { public: + struct MultiStreamURL { + std::string uRL; + }; struct SingleSubParams { std::string streamType; std::string sourceType; @@ -103,6 +106,8 @@ public: }; UpdateLiveMPUTaskRequest(); ~UpdateLiveMPUTaskRequest(); + std::vector getMultiStreamURL() const; + void setMultiStreamURL(const std::vector &multiStreamURL); SingleSubParams getSingleSubParams() const; void setSingleSubParams(const SingleSubParams &singleSubParams); SeiParams getSeiParams() const; @@ -121,6 +126,7 @@ public: void setStreamURL(const std::string &streamURL); private: + std::vector multiStreamURL_; SingleSubParams singleSubParams_; SeiParams seiParams_; TranscodeParams transcodeParams_; diff --git a/live/src/model/ListLiveMessageAppsResult.cc b/live/src/model/ListLiveMessageAppsResult.cc index 8c13c3805..067a9b615 100644 --- a/live/src/model/ListLiveMessageAppsResult.cc +++ b/live/src/model/ListLiveMessageAppsResult.cc @@ -47,20 +47,20 @@ void ListLiveMessageAppsResult::parse(const std::string &payload) appListObject.appId = valueAppListApps["AppId"].asString(); if(!valueAppListApps["AppKey"].isNull()) appListObject.appKey = valueAppListApps["AppKey"].asString(); - if(!valueAppListApps["AppName"].isNull()) - appListObject.appName = valueAppListApps["AppName"].asString(); if(!valueAppListApps["AppSign"].isNull()) appListObject.appSign = valueAppListApps["AppSign"].asString(); - if(!valueAppListApps["CreateTime"].isNull()) - appListObject.createTime = std::stol(valueAppListApps["CreateTime"].asString()); - if(!valueAppListApps["DataCenter"].isNull()) - appListObject.dataCenter = valueAppListApps["DataCenter"].asString(); if(!valueAppListApps["Disable"].isNull()) appListObject.disable = valueAppListApps["Disable"].asString(); + if(!valueAppListApps["AppName"].isNull()) + appListObject.appName = valueAppListApps["AppName"].asString(); + if(!valueAppListApps["CreateTime"].isNull()) + appListObject.createTime = std::stol(valueAppListApps["CreateTime"].asString()); if(!valueAppListApps["ModifyTime"].isNull()) appListObject.modifyTime = std::stol(valueAppListApps["ModifyTime"].asString()); if(!valueAppListApps["MsgLifeCycle"].isNull()) appListObject.msgLifeCycle = std::stoi(valueAppListApps["MsgLifeCycle"].asString()); + if(!valueAppListApps["DataCenter"].isNull()) + appListObject.dataCenter = valueAppListApps["DataCenter"].asString(); appList_.push_back(appListObject); } if(!value["HasMore"].isNull()) diff --git a/live/src/model/ListRtcMPUTaskDetailResult.cc b/live/src/model/ListRtcMPUTaskDetailResult.cc index d934d69d1..fa53726b3 100644 --- a/live/src/model/ListRtcMPUTaskDetailResult.cc +++ b/live/src/model/ListRtcMPUTaskDetailResult.cc @@ -55,6 +55,14 @@ void ListRtcMPUTaskDetailResult::parse(const std::string &payload) mPUTasksObject.streamURL = valueMPUTasksmpuTask["StreamURL"].asString(); if(!valueMPUTasksmpuTask["Region"].isNull()) mPUTasksObject.region = valueMPUTasksmpuTask["Region"].asString(); + auto allMultiStreamURLNode = valueMPUTasksmpuTask["MultiStreamURL"]["MultiStreamURLItem"]; + for (auto valueMPUTasksmpuTaskMultiStreamURLMultiStreamURLItem : allMultiStreamURLNode) + { + MpuTask::MultiStreamURLItem multiStreamURLObject; + if(!valueMPUTasksmpuTaskMultiStreamURLMultiStreamURLItem["URL"].isNull()) + multiStreamURLObject.uRL = valueMPUTasksmpuTaskMultiStreamURLMultiStreamURLItem["URL"].asString(); + mPUTasksObject.multiStreamURL.push_back(multiStreamURLObject); + } auto singleSubParamsNode = value["SingleSubParams"]; if(!singleSubParamsNode["SourceType"].isNull()) mPUTasksObject.singleSubParams.sourceType = singleSubParamsNode["SourceType"].asString(); diff --git a/live/src/model/StartLiveMPUTaskRequest.cc b/live/src/model/StartLiveMPUTaskRequest.cc index cd71e52d3..8a2ff3f26 100644 --- a/live/src/model/StartLiveMPUTaskRequest.cc +++ b/live/src/model/StartLiveMPUTaskRequest.cc @@ -36,6 +36,35 @@ void StartLiveMPUTaskRequest::setSingleSubParams(const StartLiveMPUTaskRequest:: setParameter(std::string("SingleSubParams") + ".UserId", singleSubParams.userId); } +std::string StartLiveMPUTaskRequest::getTaskId() const { + return taskId_; +} + +void StartLiveMPUTaskRequest::setTaskId(const std::string &taskId) { + taskId_ = taskId; + setParameter(std::string("TaskId"), taskId); +} + +std::string StartLiveMPUTaskRequest::getStreamURL() const { + return streamURL_; +} + +void StartLiveMPUTaskRequest::setStreamURL(const std::string &streamURL) { + streamURL_ = streamURL; + setParameter(std::string("StreamURL"), streamURL); +} + +std::vector StartLiveMPUTaskRequest::getMultiStreamURL() const { + return multiStreamURL_; +} + +void StartLiveMPUTaskRequest::setMultiStreamURL(const std::vector &multiStreamURL) { + multiStreamURL_ = multiStreamURL; + for(int dep1 = 0; dep1 != multiStreamURL.size(); dep1++) { + setParameter(std::string("MultiStreamURL") + "." + std::to_string(dep1 + 1) + ".URL", multiStreamURL[dep1].uRL); + } +} + StartLiveMPUTaskRequest::SeiParams StartLiveMPUTaskRequest::getSeiParams() const { return seiParams_; } @@ -128,21 +157,3 @@ void StartLiveMPUTaskRequest::setChannelId(const std::string &channelId) { setParameter(std::string("ChannelId"), channelId); } -std::string StartLiveMPUTaskRequest::getTaskId() const { - return taskId_; -} - -void StartLiveMPUTaskRequest::setTaskId(const std::string &taskId) { - taskId_ = taskId; - setParameter(std::string("TaskId"), taskId); -} - -std::string StartLiveMPUTaskRequest::getStreamURL() const { - return streamURL_; -} - -void StartLiveMPUTaskRequest::setStreamURL(const std::string &streamURL) { - streamURL_ = streamURL; - setParameter(std::string("StreamURL"), streamURL); -} - diff --git a/live/src/model/UpdateLiveMPUTaskRequest.cc b/live/src/model/UpdateLiveMPUTaskRequest.cc index 1e9a7fa60..aed80c27e 100644 --- a/live/src/model/UpdateLiveMPUTaskRequest.cc +++ b/live/src/model/UpdateLiveMPUTaskRequest.cc @@ -25,6 +25,17 @@ UpdateLiveMPUTaskRequest::UpdateLiveMPUTaskRequest() UpdateLiveMPUTaskRequest::~UpdateLiveMPUTaskRequest() {} +std::vector UpdateLiveMPUTaskRequest::getMultiStreamURL() const { + return multiStreamURL_; +} + +void UpdateLiveMPUTaskRequest::setMultiStreamURL(const std::vector &multiStreamURL) { + multiStreamURL_ = multiStreamURL; + for(int dep1 = 0; dep1 != multiStreamURL.size(); dep1++) { + setParameter(std::string("MultiStreamURL") + "." + std::to_string(dep1 + 1) + ".URL", multiStreamURL[dep1].uRL); + } +} + UpdateLiveMPUTaskRequest::SingleSubParams UpdateLiveMPUTaskRequest::getSingleSubParams() const { return singleSubParams_; }