diff --git a/VERSION b/VERSION index e63130908..3c8d07582 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1835 \ No newline at end of file +1.36.1836 \ No newline at end of file diff --git a/live/include/alibabacloud/live/model/DescribeLiveStreamMetricDetailDataResult.h b/live/include/alibabacloud/live/model/DescribeLiveStreamMetricDetailDataResult.h index fab49aced..21a207e3a 100644 --- a/live/include/alibabacloud/live/model/DescribeLiveStreamMetricDetailDataResult.h +++ b/live/include/alibabacloud/live/model/DescribeLiveStreamMetricDetailDataResult.h @@ -35,6 +35,7 @@ namespace AlibabaCloud struct StreamData { long p2pTraffic; + std::string newConns; float bps; float rtmpBps; long hlsTraffic; diff --git a/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h b/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h index c6c4db232..44f465dbd 100644 --- a/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h +++ b/live/include/alibabacloud/live/model/StartLiveMPUTaskRequest.h @@ -75,6 +75,11 @@ public: MaxVideoUser maxVideoUser; }; Layout layout; + struct Background { + std::string uRL; + std::string renderMode; + }; + Background background; struct UserInfosItem { std::string streamType; std::string sourceType; diff --git a/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h b/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h index 20be81902..95000d668 100644 --- a/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h +++ b/live/include/alibabacloud/live/model/UpdateLiveMPUTaskRequest.h @@ -75,6 +75,11 @@ public: MaxVideoUser maxVideoUser; }; Layout layout; + struct Background { + std::string uRL; + std::string renderMode; + }; + Background background; struct UserInfosItem { std::string streamType; std::string sourceType; diff --git a/live/src/model/DescribeLiveStreamMetricDetailDataResult.cc b/live/src/model/DescribeLiveStreamMetricDetailDataResult.cc index 6c599d6a9..4fb4c5527 100644 --- a/live/src/model/DescribeLiveStreamMetricDetailDataResult.cc +++ b/live/src/model/DescribeLiveStreamMetricDetailDataResult.cc @@ -85,6 +85,8 @@ void DescribeLiveStreamMetricDetailDataResult::parse(const std::string &payload) streamDetailDataObject.flvTraffic = std::stol(valueStreamDetailDataStreamData["FlvTraffic"].asString()); if(!valueStreamDetailDataStreamData["TimeStamp"].isNull()) streamDetailDataObject.timeStamp = valueStreamDetailDataStreamData["TimeStamp"].asString(); + if(!valueStreamDetailDataStreamData["NewConns"].isNull()) + streamDetailDataObject.newConns = valueStreamDetailDataStreamData["NewConns"].asString(); streamDetailData_.push_back(streamDetailDataObject); } if(!value["EndTime"].isNull()) diff --git a/live/src/model/StartLiveMPUTaskRequest.cc b/live/src/model/StartLiveMPUTaskRequest.cc index 57173819d..217ca5872 100644 --- a/live/src/model/StartLiveMPUTaskRequest.cc +++ b/live/src/model/StartLiveMPUTaskRequest.cc @@ -72,6 +72,8 @@ void StartLiveMPUTaskRequest::setTranscodeParams(const StartLiveMPUTaskRequest:: setParameter(std::string("TranscodeParams") + ".Layout.MaxVideoUser.StreamType", transcodeParams.layout.maxVideoUser.streamType); setParameter(std::string("TranscodeParams") + ".Layout.MaxVideoUser.SourceType", transcodeParams.layout.maxVideoUser.sourceType); setParameter(std::string("TranscodeParams") + ".Layout.MaxVideoUser.UserId", transcodeParams.layout.maxVideoUser.userId); + setParameter(std::string("TranscodeParams") + ".Background.URL", transcodeParams.background.uRL); + setParameter(std::string("TranscodeParams") + ".Background.RenderMode", transcodeParams.background.renderMode); for(int dep1 = 0; dep1 != transcodeParams.userInfos.size(); dep1++) { setParameter(std::string("TranscodeParams") + ".UserInfos." + std::to_string(dep1 + 1) + ".StreamType", transcodeParams.userInfos[dep1].streamType); setParameter(std::string("TranscodeParams") + ".UserInfos." + std::to_string(dep1 + 1) + ".SourceType", transcodeParams.userInfos[dep1].sourceType); diff --git a/live/src/model/UpdateLiveMPUTaskRequest.cc b/live/src/model/UpdateLiveMPUTaskRequest.cc index e4aed464f..e7663f434 100644 --- a/live/src/model/UpdateLiveMPUTaskRequest.cc +++ b/live/src/model/UpdateLiveMPUTaskRequest.cc @@ -72,6 +72,8 @@ void UpdateLiveMPUTaskRequest::setTranscodeParams(const UpdateLiveMPUTaskRequest setParameter(std::string("TranscodeParams") + ".Layout.MaxVideoUser.StreamType", transcodeParams.layout.maxVideoUser.streamType); setParameter(std::string("TranscodeParams") + ".Layout.MaxVideoUser.SourceType", transcodeParams.layout.maxVideoUser.sourceType); setParameter(std::string("TranscodeParams") + ".Layout.MaxVideoUser.UserId", transcodeParams.layout.maxVideoUser.userId); + setParameter(std::string("TranscodeParams") + ".Background.URL", transcodeParams.background.uRL); + setParameter(std::string("TranscodeParams") + ".Background.RenderMode", transcodeParams.background.renderMode); for(int dep1 = 0; dep1 != transcodeParams.userInfos.size(); dep1++) { setParameter(std::string("TranscodeParams") + ".UserInfos." + std::to_string(dep1 + 1) + ".StreamType", transcodeParams.userInfos[dep1].streamType); setParameter(std::string("TranscodeParams") + ".UserInfos." + std::to_string(dep1 + 1) + ".SourceType", transcodeParams.userInfos[dep1].sourceType);