From d8723973a430f66fb9b753a3c4b9d13ffaba2918 Mon Sep 17 00:00:00 2001 From: sdk-team Date: Tue, 5 Aug 2025 09:18:50 +0000 Subject: [PATCH] Generated 2016-11-01 for live. --- VERSION | 2 +- .../live/model/AddLiveStreamMergeRequest.h | 6 +++++ .../live/model/AddLiveStreamMergeResult.h | 2 ++ .../DescribeLiveRecordNotifyRecordsResult.h | 1 + .../model/DescribeLiveStreamMergeResult.h | 2 ++ .../DescribeLiveStreamsNotifyRecordsResult.h | 1 + .../DescribeRtcCloudRecordingFilesResult.h | 14 ----------- .../model/StartRtcCloudRecordingRequest.h | 15 +++++++++++ live/src/model/AddLiveStreamMergeRequest.cc | 18 +++++++++++++ live/src/model/AddLiveStreamMergeResult.cc | 7 ++++++ .../DescribeLiveRecordNotifyRecordsResult.cc | 2 ++ .../model/DescribeLiveStreamMergeResult.cc | 4 +++ .../DescribeLiveStreamsNotifyRecordsResult.cc | 22 ++++++++-------- .../DescribeRtcCloudRecordingFilesResult.cc | 20 --------------- .../model/StartRtcCloudRecordingRequest.cc | 25 +++++++++++++++++++ 15 files changed, 96 insertions(+), 45 deletions(-) diff --git a/VERSION b/VERSION index 729e119ae..701aa4b57 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.2095 \ No newline at end of file +1.36.2096 \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/AddLiveStreamMergeRequest.h b/live/include/alibabacloud/live/model/AddLiveStreamMergeRequest.h index b9eefed71..51fdec9f3 100644 --- a/live/include/alibabacloud/live/model/AddLiveStreamMergeRequest.h +++ b/live/include/alibabacloud/live/model/AddLiveStreamMergeRequest.h @@ -40,6 +40,8 @@ public: void setProtocol(const std::string &protocol); std::string getAppName() const; void setAppName(const std::string &appName); + std::string getLiveMerger() const; + void setLiveMerger(const std::string &liveMerger); std::string getRegionId() const; void setRegionId(const std::string ®ionId); std::string getInStreamName2() const; @@ -54,6 +56,8 @@ public: void setEndTime(const std::string &endTime); long getOwnerId() const; void setOwnerId(long ownerId); + std::string getMergeParameters() const; + void setMergeParameters(const std::string &mergeParameters); private: std::string inAppName2_; @@ -61,6 +65,7 @@ private: std::string startTime_; std::string protocol_; std::string appName_; + std::string liveMerger_; std::string regionId_; std::string inStreamName2_; std::string streamName_; @@ -68,6 +73,7 @@ private: std::string domainName_; std::string endTime_; long ownerId_; + std::string mergeParameters_; }; } // namespace Model } // namespace Live diff --git a/live/include/alibabacloud/live/model/AddLiveStreamMergeResult.h b/live/include/alibabacloud/live/model/AddLiveStreamMergeResult.h index 8608af0c3..725c91dcd 100644 --- a/live/include/alibabacloud/live/model/AddLiveStreamMergeResult.h +++ b/live/include/alibabacloud/live/model/AddLiveStreamMergeResult.h @@ -37,10 +37,12 @@ namespace AlibabaCloud AddLiveStreamMergeResult(); explicit AddLiveStreamMergeResult(const std::string &payload); ~AddLiveStreamMergeResult(); + std::string getMessage()const; protected: void parse(const std::string &payload); private: + std::string message_; }; } diff --git a/live/include/alibabacloud/live/model/DescribeLiveRecordNotifyRecordsResult.h b/live/include/alibabacloud/live/model/DescribeLiveRecordNotifyRecordsResult.h index 7416857b0..411834cc3 100644 --- a/live/include/alibabacloud/live/model/DescribeLiveRecordNotifyRecordsResult.h +++ b/live/include/alibabacloud/live/model/DescribeLiveRecordNotifyRecordsResult.h @@ -40,6 +40,7 @@ namespace AlibabaCloud std::string notifyTime; std::string domainName; std::string notifyContent; + std::string notifyResponse; std::string notifyUrl; std::string notifyResult; std::string appName; diff --git a/live/include/alibabacloud/live/model/DescribeLiveStreamMergeResult.h b/live/include/alibabacloud/live/model/DescribeLiveStreamMergeResult.h index 5a582ae91..55674c65d 100644 --- a/live/include/alibabacloud/live/model/DescribeLiveStreamMergeResult.h +++ b/live/include/alibabacloud/live/model/DescribeLiveStreamMergeResult.h @@ -40,8 +40,10 @@ namespace AlibabaCloud std::string inStreamName2; std::string startTime; std::string appUsing; + std::string liveMerger; std::string appName; std::string streamName; + std::string mergeParameters; std::string extraInAppStreams; std::string streamUsing; std::string inAppName1; diff --git a/live/include/alibabacloud/live/model/DescribeLiveStreamsNotifyRecordsResult.h b/live/include/alibabacloud/live/model/DescribeLiveStreamsNotifyRecordsResult.h index 22d28d550..d66fd15c1 100644 --- a/live/include/alibabacloud/live/model/DescribeLiveStreamsNotifyRecordsResult.h +++ b/live/include/alibabacloud/live/model/DescribeLiveStreamsNotifyRecordsResult.h @@ -40,6 +40,7 @@ namespace AlibabaCloud std::string notifyTime; std::string domainName; std::string notifyContent; + std::string notifyResponse; std::string notifyUrl; std::string notifyResult; std::string appName; diff --git a/live/include/alibabacloud/live/model/DescribeRtcCloudRecordingFilesResult.h b/live/include/alibabacloud/live/model/DescribeRtcCloudRecordingFilesResult.h index 0197300cb..67d752c82 100644 --- a/live/include/alibabacloud/live/model/DescribeRtcCloudRecordingFilesResult.h +++ b/live/include/alibabacloud/live/model/DescribeRtcCloudRecordingFilesResult.h @@ -32,29 +32,15 @@ namespace AlibabaCloud class ALIBABACLOUD_LIVE_EXPORT DescribeRtcCloudRecordingFilesResult : public ServiceResult { public: - struct TaskInfo - { - struct RecordFileList - { - std::vector hlsFileList; - std::vector mp3FileList; - std::vector mp4FileList; - }; - std::string status; - std::string taskId; - RecordFileList recordFileList; - }; DescribeRtcCloudRecordingFilesResult(); explicit DescribeRtcCloudRecordingFilesResult(const std::string &payload); ~DescribeRtcCloudRecordingFilesResult(); - TaskInfo getTaskInfo()const; protected: void parse(const std::string &payload); private: - TaskInfo taskInfo_; }; } diff --git a/live/include/alibabacloud/live/model/StartRtcCloudRecordingRequest.h b/live/include/alibabacloud/live/model/StartRtcCloudRecordingRequest.h index b6719423a..f5e44558a 100644 --- a/live/include/alibabacloud/live/model/StartRtcCloudRecordingRequest.h +++ b/live/include/alibabacloud/live/model/StartRtcCloudRecordingRequest.h @@ -29,10 +29,19 @@ namespace Model { class ALIBABACLOUD_LIVE_EXPORT StartRtcCloudRecordingRequest : public RpcServiceRequest { public: struct StorageParams { + struct VodParams { + int autoCompose; + std::string composeVodTranscodeGroupId; + std::string vodTranscodeGroupId; + std::string storageLocation; + }; + VodParams vodParams; struct FileInfoItem { std::string fileNamePattern; std::string format; std::string sliceNamePattern; + std::string string; + std::vector filePathPrefix; }; FileInfoItem fileInfoItem; std::vector fileInfo; @@ -102,8 +111,12 @@ public: void setSubscribeParams(const SubscribeParams &subscribeParams); RecordParams getRecordParams() const; void setRecordParams(const RecordParams &recordParams); + long getMaxIdleTime() const; + void setMaxIdleTime(long maxIdleTime); MixTranscodeParams getMixTranscodeParams() const; void setMixTranscodeParams(const MixTranscodeParams &mixTranscodeParams); + std::string getNotifyAuthKey() const; + void setNotifyAuthKey(const std::string ¬ifyAuthKey); std::string getAppId() const; void setAppId(const std::string &appId); std::string getChannelId() const; @@ -116,7 +129,9 @@ private: std::string notifyUrl_; SubscribeParams subscribeParams_; RecordParams recordParams_; + long maxIdleTime_; MixTranscodeParams mixTranscodeParams_; + std::string notifyAuthKey_; std::string appId_; std::string channelId_; MixLayoutParams mixLayoutParams_; diff --git a/live/src/model/AddLiveStreamMergeRequest.cc b/live/src/model/AddLiveStreamMergeRequest.cc index 9b08caf5b..2834ee159 100644 --- a/live/src/model/AddLiveStreamMergeRequest.cc +++ b/live/src/model/AddLiveStreamMergeRequest.cc @@ -70,6 +70,15 @@ void AddLiveStreamMergeRequest::setAppName(const std::string &appName) { setParameter(std::string("AppName"), appName); } +std::string AddLiveStreamMergeRequest::getLiveMerger() const { + return liveMerger_; +} + +void AddLiveStreamMergeRequest::setLiveMerger(const std::string &liveMerger) { + liveMerger_ = liveMerger; + setParameter(std::string("LiveMerger"), liveMerger); +} + std::string AddLiveStreamMergeRequest::getRegionId() const { return regionId_; } @@ -133,3 +142,12 @@ void AddLiveStreamMergeRequest::setOwnerId(long ownerId) { setParameter(std::string("OwnerId"), std::to_string(ownerId)); } +std::string AddLiveStreamMergeRequest::getMergeParameters() const { + return mergeParameters_; +} + +void AddLiveStreamMergeRequest::setMergeParameters(const std::string &mergeParameters) { + mergeParameters_ = mergeParameters; + setParameter(std::string("MergeParameters"), mergeParameters); +} + diff --git a/live/src/model/AddLiveStreamMergeResult.cc b/live/src/model/AddLiveStreamMergeResult.cc index ccbaccc65..9aa1d97ad 100644 --- a/live/src/model/AddLiveStreamMergeResult.cc +++ b/live/src/model/AddLiveStreamMergeResult.cc @@ -39,6 +39,13 @@ void AddLiveStreamMergeResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); + if(!value["Message"].isNull()) + message_ = value["Message"].asString(); } +std::string AddLiveStreamMergeResult::getMessage()const +{ + return message_; +} + diff --git a/live/src/model/DescribeLiveRecordNotifyRecordsResult.cc b/live/src/model/DescribeLiveRecordNotifyRecordsResult.cc index cc0ea060d..541e3939f 100644 --- a/live/src/model/DescribeLiveRecordNotifyRecordsResult.cc +++ b/live/src/model/DescribeLiveRecordNotifyRecordsResult.cc @@ -59,6 +59,8 @@ void DescribeLiveRecordNotifyRecordsResult::parse(const std::string &payload) callbackListObject.notifyType = valueCallbackListCallback["NotifyType"].asString(); if(!valueCallbackListCallback["NotifyUrl"].isNull()) callbackListObject.notifyUrl = valueCallbackListCallback["NotifyUrl"].asString(); + if(!valueCallbackListCallback["NotifyResponse"].isNull()) + callbackListObject.notifyResponse = valueCallbackListCallback["NotifyResponse"].asString(); if(!valueCallbackListCallback["StreamName"].isNull()) callbackListObject.streamName = valueCallbackListCallback["StreamName"].asString(); callbackList_.push_back(callbackListObject); diff --git a/live/src/model/DescribeLiveStreamMergeResult.cc b/live/src/model/DescribeLiveStreamMergeResult.cc index 56efcc263..994d20c9c 100644 --- a/live/src/model/DescribeLiveStreamMergeResult.cc +++ b/live/src/model/DescribeLiveStreamMergeResult.cc @@ -69,6 +69,10 @@ void DescribeLiveStreamMergeResult::parse(const std::string &payload) liveStreamMergeListObject.streamName = valueLiveStreamMergeListLiveStreamMerge["StreamName"].asString(); if(!valueLiveStreamMergeListLiveStreamMerge["StreamUsing"].isNull()) liveStreamMergeListObject.streamUsing = valueLiveStreamMergeListLiveStreamMerge["StreamUsing"].asString(); + if(!valueLiveStreamMergeListLiveStreamMerge["LiveMerger"].isNull()) + liveStreamMergeListObject.liveMerger = valueLiveStreamMergeListLiveStreamMerge["LiveMerger"].asString(); + if(!valueLiveStreamMergeListLiveStreamMerge["MergeParameters"].isNull()) + liveStreamMergeListObject.mergeParameters = valueLiveStreamMergeListLiveStreamMerge["MergeParameters"].asString(); liveStreamMergeList_.push_back(liveStreamMergeListObject); } diff --git a/live/src/model/DescribeLiveStreamsNotifyRecordsResult.cc b/live/src/model/DescribeLiveStreamsNotifyRecordsResult.cc index 9efa7137d..be753976b 100644 --- a/live/src/model/DescribeLiveStreamsNotifyRecordsResult.cc +++ b/live/src/model/DescribeLiveStreamsNotifyRecordsResult.cc @@ -43,24 +43,26 @@ void DescribeLiveStreamsNotifyRecordsResult::parse(const std::string &payload) for (auto valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo : allNotifyRecordsInfoNode) { LiveStreamNotifyRecordsInfo notifyRecordsInfoObject; - if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["AppName"].isNull()) - notifyRecordsInfoObject.appName = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["AppName"].asString(); + if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyType"].isNull()) + notifyRecordsInfoObject.notifyType = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyType"].asString(); if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["Description"].isNull()) notifyRecordsInfoObject.description = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["Description"].asString(); + if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["StreamName"].isNull()) + notifyRecordsInfoObject.streamName = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["StreamName"].asString(); + if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyTime"].isNull()) + notifyRecordsInfoObject.notifyTime = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyTime"].asString(); if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["DomainName"].isNull()) notifyRecordsInfoObject.domainName = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["DomainName"].asString(); if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyContent"].isNull()) notifyRecordsInfoObject.notifyContent = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyContent"].asString(); - if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyResult"].isNull()) - notifyRecordsInfoObject.notifyResult = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyResult"].asString(); - if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyTime"].isNull()) - notifyRecordsInfoObject.notifyTime = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyTime"].asString(); - if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyType"].isNull()) - notifyRecordsInfoObject.notifyType = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyType"].asString(); + if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyResponse"].isNull()) + notifyRecordsInfoObject.notifyResponse = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyResponse"].asString(); if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyUrl"].isNull()) notifyRecordsInfoObject.notifyUrl = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyUrl"].asString(); - if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["StreamName"].isNull()) - notifyRecordsInfoObject.streamName = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["StreamName"].asString(); + if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyResult"].isNull()) + notifyRecordsInfoObject.notifyResult = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["NotifyResult"].asString(); + if(!valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["AppName"].isNull()) + notifyRecordsInfoObject.appName = valueNotifyRecordsInfoLiveStreamNotifyRecordsInfo["AppName"].asString(); notifyRecordsInfo_.push_back(notifyRecordsInfoObject); } if(!value["PageNum"].isNull()) diff --git a/live/src/model/DescribeRtcCloudRecordingFilesResult.cc b/live/src/model/DescribeRtcCloudRecordingFilesResult.cc index ac764edc7..50b82ecf1 100644 --- a/live/src/model/DescribeRtcCloudRecordingFilesResult.cc +++ b/live/src/model/DescribeRtcCloudRecordingFilesResult.cc @@ -39,26 +39,6 @@ void DescribeRtcCloudRecordingFilesResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); - auto taskInfoNode = value["TaskInfo"]; - if(!taskInfoNode["TaskId"].isNull()) - taskInfo_.taskId = taskInfoNode["TaskId"].asString(); - if(!taskInfoNode["Status"].isNull()) - taskInfo_.status = taskInfoNode["Status"].asString(); - auto recordFileListNode = taskInfoNode["RecordFileList"]; - auto allMp3FileList = recordFileListNode["Mp3FileList"]["FileName"]; - for (auto value : allMp3FileList) - taskInfo_.recordFileList.mp3FileList.push_back(value.asString()); - auto allMp4FileList = recordFileListNode["Mp4FileList"]["FileName"]; - for (auto value : allMp4FileList) - taskInfo_.recordFileList.mp4FileList.push_back(value.asString()); - auto allHlsFileList = recordFileListNode["HlsFileList"]["FileName"]; - for (auto value : allHlsFileList) - taskInfo_.recordFileList.hlsFileList.push_back(value.asString()); } -DescribeRtcCloudRecordingFilesResult::TaskInfo DescribeRtcCloudRecordingFilesResult::getTaskInfo()const -{ - return taskInfo_; -} - diff --git a/live/src/model/StartRtcCloudRecordingRequest.cc b/live/src/model/StartRtcCloudRecordingRequest.cc index 32c1a6ca7..6671c3f88 100644 --- a/live/src/model/StartRtcCloudRecordingRequest.cc +++ b/live/src/model/StartRtcCloudRecordingRequest.cc @@ -31,10 +31,17 @@ StartRtcCloudRecordingRequest::StorageParams StartRtcCloudRecordingRequest::getS void StartRtcCloudRecordingRequest::setStorageParams(const StartRtcCloudRecordingRequest::StorageParams &storageParams) { storageParams_ = storageParams; + setParameter(std::string("StorageParams") + ".VodParams.AutoCompose", std::to_string(storageParams.vodParams.autoCompose)); + setParameter(std::string("StorageParams") + ".VodParams.ComposeVodTranscodeGroupId", storageParams.vodParams.composeVodTranscodeGroupId); + setParameter(std::string("StorageParams") + ".VodParams.VodTranscodeGroupId", storageParams.vodParams.vodTranscodeGroupId); + setParameter(std::string("StorageParams") + ".VodParams.StorageLocation", storageParams.vodParams.storageLocation); for(int dep1 = 0; dep1 != storageParams.fileInfo.size(); dep1++) { setParameter(std::string("StorageParams") + ".FileInfo." + std::to_string(dep1 + 1) + ".FileNamePattern", storageParams.fileInfo[dep1].fileNamePattern); setParameter(std::string("StorageParams") + ".FileInfo." + std::to_string(dep1 + 1) + ".Format", storageParams.fileInfo[dep1].format); setParameter(std::string("StorageParams") + ".FileInfo." + std::to_string(dep1 + 1) + ".SliceNamePattern", storageParams.fileInfo[dep1].sliceNamePattern); + for(int dep2 = 0; dep2 != storageParams.fileInfo[dep1].filePathPrefix.size(); dep2++) { + setParameter(std::string("StorageParams") + ".FileInfo." + std::to_string(dep1 + 1) + ".FilePathPrefix." + std::to_string(dep2 + 1), storageParams.fileInfo[dep1].filePathPrefix[dep2]); + } } setParameter(std::string("StorageParams") + ".StorageType", std::to_string(storageParams.storageType)); setParameter(std::string("StorageParams") + ".OSSParams.OSSBucket", storageParams.oSSParams.oSSBucket); @@ -74,6 +81,15 @@ void StartRtcCloudRecordingRequest::setRecordParams(const StartRtcCloudRecording setParameter(std::string("RecordParams") + ".RecordMode", std::to_string(recordParams.recordMode)); } +long StartRtcCloudRecordingRequest::getMaxIdleTime() const { + return maxIdleTime_; +} + +void StartRtcCloudRecordingRequest::setMaxIdleTime(long maxIdleTime) { + maxIdleTime_ = maxIdleTime; + setParameter(std::string("MaxIdleTime"), std::to_string(maxIdleTime)); +} + StartRtcCloudRecordingRequest::MixTranscodeParams StartRtcCloudRecordingRequest::getMixTranscodeParams() const { return mixTranscodeParams_; } @@ -92,6 +108,15 @@ void StartRtcCloudRecordingRequest::setMixTranscodeParams(const StartRtcCloudRec setParameter(std::string("MixTranscodeParams") + ".VideoGop", std::to_string(mixTranscodeParams.videoGop)); } +std::string StartRtcCloudRecordingRequest::getNotifyAuthKey() const { + return notifyAuthKey_; +} + +void StartRtcCloudRecordingRequest::setNotifyAuthKey(const std::string ¬ifyAuthKey) { + notifyAuthKey_ = notifyAuthKey; + setParameter(std::string("NotifyAuthKey"), notifyAuthKey); +} + std::string StartRtcCloudRecordingRequest::getAppId() const { return appId_; }