diff --git a/CHANGELOG b/CHANGELOG index cc057a904..528ab3dbd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-10-13 Version: patch +- Generated 2018-01-11 for `rtc`. + 2020-10-13 Version: patch - Release DetectSkinDisease RunMedQA. diff --git a/rtc/include/alibabacloud/rtc/model/StartMPUTaskRequest.h b/rtc/include/alibabacloud/rtc/model/StartMPUTaskRequest.h index 3d55ee8ca..764d7b256 100644 --- a/rtc/include/alibabacloud/rtc/model/StartMPUTaskRequest.h +++ b/rtc/include/alibabacloud/rtc/model/StartMPUTaskRequest.h @@ -36,6 +36,49 @@ namespace AlibabaCloud int paneId; std::string userId; std::string sourceType; + struct Images + { + std::string url; + int display; + float x; + float y; + float width; + float height; + int zOrder; + }; + std::vector images; + struct Texts + { + std::string text; + float x; + float y; + int fontType; + int fontSize; + int fontColor; + int zOrder; + }; + std::vector texts; + }; + struct Watermarks + { + std::string url; + float alpha; + int display; + float x; + float y; + float width; + float height; + int zOrder; + }; + struct Backgrounds + { + std::string url; + int display; + float x; + float y; + float width; + float height; + int zOrder; }; public: @@ -66,12 +109,16 @@ namespace AlibabaCloud void setStreamURL(const std::string& streamURL); long getVadInterval()const; void setVadInterval(long vadInterval); + std::vector getWatermarks()const; + void setWatermarks(const std::vector& watermarks); long getOwnerId()const; void setOwnerId(long ownerId); std::vector getSubSpecUsers()const; void setSubSpecUsers(const std::vector& subSpecUsers); std::string getAppId()const; void setAppId(const std::string& appId); + std::vector getBackgrounds()const; + void setBackgrounds(const std::vector& backgrounds); long getTimeStampRef()const; void setTimeStampRef(long timeStampRef); int getMediaEncode()const; @@ -92,9 +139,11 @@ namespace AlibabaCloud std::string showLog_; std::string streamURL_; long vadInterval_; + std::vector watermarks_; long ownerId_; std::vector subSpecUsers_; std::string appId_; + std::vector backgrounds_; long timeStampRef_; int mediaEncode_; std::string channelId_; diff --git a/rtc/include/alibabacloud/rtc/model/UpdateMPULayoutRequest.h b/rtc/include/alibabacloud/rtc/model/UpdateMPULayoutRequest.h index 858dc2f62..a90fe1963 100644 --- a/rtc/include/alibabacloud/rtc/model/UpdateMPULayoutRequest.h +++ b/rtc/include/alibabacloud/rtc/model/UpdateMPULayoutRequest.h @@ -36,6 +36,49 @@ namespace AlibabaCloud int paneId; std::string userId; std::string sourceType; + struct Images + { + std::string url; + int display; + float x; + float y; + float width; + float height; + int zOrder; + }; + std::vector images; + struct Texts + { + std::string text; + float x; + float y; + int fontType; + int fontSize; + int fontColor; + int zOrder; + }; + std::vector texts; + }; + struct Watermarks + { + std::string url; + float alpha; + int display; + float x; + float y; + float width; + float height; + int zOrder; + }; + struct Backgrounds + { + std::string url; + int display; + float x; + float y; + float width; + float height; + int zOrder; }; public: @@ -54,10 +97,14 @@ namespace AlibabaCloud void setTaskId(const std::string& taskId); std::string getShowLog()const; void setShowLog(const std::string& showLog); + std::vector getWatermarks()const; + void setWatermarks(const std::vector& watermarks); long getOwnerId()const; void setOwnerId(long ownerId); std::string getAppId()const; void setAppId(const std::string& appId); + std::vector getBackgrounds()const; + void setBackgrounds(const std::vector& backgrounds); private: std::vector userPanes_; @@ -66,8 +113,10 @@ namespace AlibabaCloud std::vector layoutIds_; std::string taskId_; std::string showLog_; + std::vector watermarks_; long ownerId_; std::string appId_; + std::vector backgrounds_; }; } diff --git a/rtc/src/model/StartMPUTaskRequest.cc b/rtc/src/model/StartMPUTaskRequest.cc index 0d3d9c108..dc1d5f5b3 100644 --- a/rtc/src/model/StartMPUTaskRequest.cc +++ b/rtc/src/model/StartMPUTaskRequest.cc @@ -52,6 +52,28 @@ void StartMPUTaskRequest::setUserPanes(const std::vector& userPanes) setParameter(userPanesObjStr + ".PaneId", std::to_string(userPanesObj.paneId)); setParameter(userPanesObjStr + ".UserId", userPanesObj.userId); setParameter(userPanesObjStr + ".SourceType", userPanesObj.sourceType); + for(int dep2 = 0; dep2!= userPanesObj.images.size(); dep2++) { + auto imagesObj = userPanesObj.images.at(dep2); + std::string imagesObjStr = userPanesObjStr + "Images." + std::to_string(dep2 + 1); + setParameter(imagesObjStr + ".Url", imagesObj.url); + setParameter(imagesObjStr + ".Display", std::to_string(imagesObj.display)); + setParameter(imagesObjStr + ".X", std::to_string(imagesObj.x)); + setParameter(imagesObjStr + ".Y", std::to_string(imagesObj.y)); + setParameter(imagesObjStr + ".Width", std::to_string(imagesObj.width)); + setParameter(imagesObjStr + ".Height", std::to_string(imagesObj.height)); + setParameter(imagesObjStr + ".ZOrder", std::to_string(imagesObj.zOrder)); + } + for(int dep2 = 0; dep2!= userPanesObj.texts.size(); dep2++) { + auto textsObj = userPanesObj.texts.at(dep2); + std::string textsObjStr = userPanesObjStr + "Texts." + std::to_string(dep2 + 1); + setParameter(textsObjStr + ".Text", textsObj.text); + setParameter(textsObjStr + ".X", std::to_string(textsObj.x)); + setParameter(textsObjStr + ".Y", std::to_string(textsObj.y)); + setParameter(textsObjStr + ".FontType", std::to_string(textsObj.fontType)); + setParameter(textsObjStr + ".FontSize", std::to_string(textsObj.fontSize)); + setParameter(textsObjStr + ".FontColor", std::to_string(textsObj.fontColor)); + setParameter(textsObjStr + ".ZOrder", std::to_string(textsObj.zOrder)); + } } } @@ -167,6 +189,28 @@ void StartMPUTaskRequest::setVadInterval(long vadInterval) setParameter("VadInterval", std::to_string(vadInterval)); } +std::vector StartMPUTaskRequest::getWatermarks()const +{ + return watermarks_; +} + +void StartMPUTaskRequest::setWatermarks(const std::vector& watermarks) +{ + watermarks_ = watermarks; + for(int dep1 = 0; dep1!= watermarks.size(); dep1++) { + auto watermarksObj = watermarks.at(dep1); + std::string watermarksObjStr = "Watermarks." + std::to_string(dep1 + 1); + setParameter(watermarksObjStr + ".Url", watermarksObj.url); + setParameter(watermarksObjStr + ".Alpha", std::to_string(watermarksObj.alpha)); + setParameter(watermarksObjStr + ".Display", std::to_string(watermarksObj.display)); + setParameter(watermarksObjStr + ".X", std::to_string(watermarksObj.x)); + setParameter(watermarksObjStr + ".Y", std::to_string(watermarksObj.y)); + setParameter(watermarksObjStr + ".Width", std::to_string(watermarksObj.width)); + setParameter(watermarksObjStr + ".Height", std::to_string(watermarksObj.height)); + setParameter(watermarksObjStr + ".ZOrder", std::to_string(watermarksObj.zOrder)); + } +} + long StartMPUTaskRequest::getOwnerId()const { return ownerId_; @@ -202,6 +246,27 @@ void StartMPUTaskRequest::setAppId(const std::string& appId) setParameter("AppId", appId); } +std::vector StartMPUTaskRequest::getBackgrounds()const +{ + return backgrounds_; +} + +void StartMPUTaskRequest::setBackgrounds(const std::vector& backgrounds) +{ + backgrounds_ = backgrounds; + for(int dep1 = 0; dep1!= backgrounds.size(); dep1++) { + auto backgroundsObj = backgrounds.at(dep1); + std::string backgroundsObjStr = "Backgrounds." + std::to_string(dep1 + 1); + setParameter(backgroundsObjStr + ".Url", backgroundsObj.url); + setParameter(backgroundsObjStr + ".Display", std::to_string(backgroundsObj.display)); + setParameter(backgroundsObjStr + ".X", std::to_string(backgroundsObj.x)); + setParameter(backgroundsObjStr + ".Y", std::to_string(backgroundsObj.y)); + setParameter(backgroundsObjStr + ".Width", std::to_string(backgroundsObj.width)); + setParameter(backgroundsObjStr + ".Height", std::to_string(backgroundsObj.height)); + setParameter(backgroundsObjStr + ".ZOrder", std::to_string(backgroundsObj.zOrder)); + } +} + long StartMPUTaskRequest::getTimeStampRef()const { return timeStampRef_; diff --git a/rtc/src/model/UpdateMPULayoutRequest.cc b/rtc/src/model/UpdateMPULayoutRequest.cc index 63097ebe3..40021aa75 100644 --- a/rtc/src/model/UpdateMPULayoutRequest.cc +++ b/rtc/src/model/UpdateMPULayoutRequest.cc @@ -41,6 +41,28 @@ void UpdateMPULayoutRequest::setUserPanes(const std::vector& userPane setParameter(userPanesObjStr + ".PaneId", std::to_string(userPanesObj.paneId)); setParameter(userPanesObjStr + ".UserId", userPanesObj.userId); setParameter(userPanesObjStr + ".SourceType", userPanesObj.sourceType); + for(int dep2 = 0; dep2!= userPanesObj.images.size(); dep2++) { + auto imagesObj = userPanesObj.images.at(dep2); + std::string imagesObjStr = userPanesObjStr + "Images." + std::to_string(dep2 + 1); + setParameter(imagesObjStr + ".Url", imagesObj.url); + setParameter(imagesObjStr + ".Display", std::to_string(imagesObj.display)); + setParameter(imagesObjStr + ".X", std::to_string(imagesObj.x)); + setParameter(imagesObjStr + ".Y", std::to_string(imagesObj.y)); + setParameter(imagesObjStr + ".Width", std::to_string(imagesObj.width)); + setParameter(imagesObjStr + ".Height", std::to_string(imagesObj.height)); + setParameter(imagesObjStr + ".ZOrder", std::to_string(imagesObj.zOrder)); + } + for(int dep2 = 0; dep2!= userPanesObj.texts.size(); dep2++) { + auto textsObj = userPanesObj.texts.at(dep2); + std::string textsObjStr = userPanesObjStr + "Texts." + std::to_string(dep2 + 1); + setParameter(textsObjStr + ".Text", textsObj.text); + setParameter(textsObjStr + ".X", std::to_string(textsObj.x)); + setParameter(textsObjStr + ".Y", std::to_string(textsObj.y)); + setParameter(textsObjStr + ".FontType", std::to_string(textsObj.fontType)); + setParameter(textsObjStr + ".FontSize", std::to_string(textsObj.fontSize)); + setParameter(textsObjStr + ".FontColor", std::to_string(textsObj.fontColor)); + setParameter(textsObjStr + ".ZOrder", std::to_string(textsObj.zOrder)); + } } } @@ -101,6 +123,28 @@ void UpdateMPULayoutRequest::setShowLog(const std::string& showLog) setParameter("ShowLog", showLog); } +std::vector UpdateMPULayoutRequest::getWatermarks()const +{ + return watermarks_; +} + +void UpdateMPULayoutRequest::setWatermarks(const std::vector& watermarks) +{ + watermarks_ = watermarks; + for(int dep1 = 0; dep1!= watermarks.size(); dep1++) { + auto watermarksObj = watermarks.at(dep1); + std::string watermarksObjStr = "Watermarks." + std::to_string(dep1 + 1); + setParameter(watermarksObjStr + ".Url", watermarksObj.url); + setParameter(watermarksObjStr + ".Alpha", std::to_string(watermarksObj.alpha)); + setParameter(watermarksObjStr + ".Display", std::to_string(watermarksObj.display)); + setParameter(watermarksObjStr + ".X", std::to_string(watermarksObj.x)); + setParameter(watermarksObjStr + ".Y", std::to_string(watermarksObj.y)); + setParameter(watermarksObjStr + ".Width", std::to_string(watermarksObj.width)); + setParameter(watermarksObjStr + ".Height", std::to_string(watermarksObj.height)); + setParameter(watermarksObjStr + ".ZOrder", std::to_string(watermarksObj.zOrder)); + } +} + long UpdateMPULayoutRequest::getOwnerId()const { return ownerId_; @@ -123,3 +167,24 @@ void UpdateMPULayoutRequest::setAppId(const std::string& appId) setParameter("AppId", appId); } +std::vector UpdateMPULayoutRequest::getBackgrounds()const +{ + return backgrounds_; +} + +void UpdateMPULayoutRequest::setBackgrounds(const std::vector& backgrounds) +{ + backgrounds_ = backgrounds; + for(int dep1 = 0; dep1!= backgrounds.size(); dep1++) { + auto backgroundsObj = backgrounds.at(dep1); + std::string backgroundsObjStr = "Backgrounds." + std::to_string(dep1 + 1); + setParameter(backgroundsObjStr + ".Url", backgroundsObj.url); + setParameter(backgroundsObjStr + ".Display", std::to_string(backgroundsObj.display)); + setParameter(backgroundsObjStr + ".X", std::to_string(backgroundsObj.x)); + setParameter(backgroundsObjStr + ".Y", std::to_string(backgroundsObj.y)); + setParameter(backgroundsObjStr + ".Width", std::to_string(backgroundsObj.width)); + setParameter(backgroundsObjStr + ".Height", std::to_string(backgroundsObj.height)); + setParameter(backgroundsObjStr + ".ZOrder", std::to_string(backgroundsObj.zOrder)); + } +} +