Skip to content

Commit d872397

Browse files
committed
Generated 2016-11-01 for live.
1 parent 8241d99 commit d872397

15 files changed

+96
-45
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.36.2095
1+
1.36.2096

live/include/alibabacloud/live/model/AddLiveStreamMergeRequest.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ class ALIBABACLOUD_LIVE_EXPORT AddLiveStreamMergeRequest : public RpcServiceRequ
4040
void setProtocol(const std::string &protocol);
4141
std::string getAppName() const;
4242
void setAppName(const std::string &appName);
43+
std::string getLiveMerger() const;
44+
void setLiveMerger(const std::string &liveMerger);
4345
std::string getRegionId() const;
4446
void setRegionId(const std::string &regionId);
4547
std::string getInStreamName2() const;
@@ -54,20 +56,24 @@ class ALIBABACLOUD_LIVE_EXPORT AddLiveStreamMergeRequest : public RpcServiceRequ
5456
void setEndTime(const std::string &endTime);
5557
long getOwnerId() const;
5658
void setOwnerId(long ownerId);
59+
std::string getMergeParameters() const;
60+
void setMergeParameters(const std::string &mergeParameters);
5761

5862
private:
5963
std::string inAppName2_;
6064
std::string inAppName1_;
6165
std::string startTime_;
6266
std::string protocol_;
6367
std::string appName_;
68+
std::string liveMerger_;
6469
std::string regionId_;
6570
std::string inStreamName2_;
6671
std::string streamName_;
6772
std::string inStreamName1_;
6873
std::string domainName_;
6974
std::string endTime_;
7075
long ownerId_;
76+
std::string mergeParameters_;
7177
};
7278
} // namespace Model
7379
} // namespace Live

live/include/alibabacloud/live/model/AddLiveStreamMergeResult.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ namespace AlibabaCloud
3737
AddLiveStreamMergeResult();
3838
explicit AddLiveStreamMergeResult(const std::string &payload);
3939
~AddLiveStreamMergeResult();
40+
std::string getMessage()const;
4041

4142
protected:
4243
void parse(const std::string &payload);
4344
private:
45+
std::string message_;
4446

4547
};
4648
}

live/include/alibabacloud/live/model/DescribeLiveRecordNotifyRecordsResult.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ namespace AlibabaCloud
4040
std::string notifyTime;
4141
std::string domainName;
4242
std::string notifyContent;
43+
std::string notifyResponse;
4344
std::string notifyUrl;
4445
std::string notifyResult;
4546
std::string appName;

live/include/alibabacloud/live/model/DescribeLiveStreamMergeResult.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@ namespace AlibabaCloud
4040
std::string inStreamName2;
4141
std::string startTime;
4242
std::string appUsing;
43+
std::string liveMerger;
4344
std::string appName;
4445
std::string streamName;
46+
std::string mergeParameters;
4547
std::string extraInAppStreams;
4648
std::string streamUsing;
4749
std::string inAppName1;

live/include/alibabacloud/live/model/DescribeLiveStreamsNotifyRecordsResult.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ namespace AlibabaCloud
4040
std::string notifyTime;
4141
std::string domainName;
4242
std::string notifyContent;
43+
std::string notifyResponse;
4344
std::string notifyUrl;
4445
std::string notifyResult;
4546
std::string appName;

live/include/alibabacloud/live/model/DescribeRtcCloudRecordingFilesResult.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,29 +32,15 @@ namespace AlibabaCloud
3232
class ALIBABACLOUD_LIVE_EXPORT DescribeRtcCloudRecordingFilesResult : public ServiceResult
3333
{
3434
public:
35-
struct TaskInfo
36-
{
37-
struct RecordFileList
38-
{
39-
std::vector<std::string> hlsFileList;
40-
std::vector<std::string> mp3FileList;
41-
std::vector<std::string> mp4FileList;
42-
};
43-
std::string status;
44-
std::string taskId;
45-
RecordFileList recordFileList;
46-
};
4735

4836

4937
DescribeRtcCloudRecordingFilesResult();
5038
explicit DescribeRtcCloudRecordingFilesResult(const std::string &payload);
5139
~DescribeRtcCloudRecordingFilesResult();
52-
TaskInfo getTaskInfo()const;
5340

5441
protected:
5542
void parse(const std::string &payload);
5643
private:
57-
TaskInfo taskInfo_;
5844

5945
};
6046
}

live/include/alibabacloud/live/model/StartRtcCloudRecordingRequest.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,19 @@ namespace Model {
2929
class ALIBABACLOUD_LIVE_EXPORT StartRtcCloudRecordingRequest : public RpcServiceRequest {
3030
public:
3131
struct StorageParams {
32+
struct VodParams {
33+
int autoCompose;
34+
std::string composeVodTranscodeGroupId;
35+
std::string vodTranscodeGroupId;
36+
std::string storageLocation;
37+
};
38+
VodParams vodParams;
3239
struct FileInfoItem {
3340
std::string fileNamePattern;
3441
std::string format;
3542
std::string sliceNamePattern;
43+
std::string string;
44+
std::vector<std::string> filePathPrefix;
3645
};
3746
FileInfoItem fileInfoItem;
3847
std::vector<FileInfoItem> fileInfo;
@@ -102,8 +111,12 @@ class ALIBABACLOUD_LIVE_EXPORT StartRtcCloudRecordingRequest : public RpcService
102111
void setSubscribeParams(const SubscribeParams &subscribeParams);
103112
RecordParams getRecordParams() const;
104113
void setRecordParams(const RecordParams &recordParams);
114+
long getMaxIdleTime() const;
115+
void setMaxIdleTime(long maxIdleTime);
105116
MixTranscodeParams getMixTranscodeParams() const;
106117
void setMixTranscodeParams(const MixTranscodeParams &mixTranscodeParams);
118+
std::string getNotifyAuthKey() const;
119+
void setNotifyAuthKey(const std::string &notifyAuthKey);
107120
std::string getAppId() const;
108121
void setAppId(const std::string &appId);
109122
std::string getChannelId() const;
@@ -116,7 +129,9 @@ class ALIBABACLOUD_LIVE_EXPORT StartRtcCloudRecordingRequest : public RpcService
116129
std::string notifyUrl_;
117130
SubscribeParams subscribeParams_;
118131
RecordParams recordParams_;
132+
long maxIdleTime_;
119133
MixTranscodeParams mixTranscodeParams_;
134+
std::string notifyAuthKey_;
120135
std::string appId_;
121136
std::string channelId_;
122137
MixLayoutParams mixLayoutParams_;

live/src/model/AddLiveStreamMergeRequest.cc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,15 @@ void AddLiveStreamMergeRequest::setAppName(const std::string &appName) {
7070
setParameter(std::string("AppName"), appName);
7171
}
7272

73+
std::string AddLiveStreamMergeRequest::getLiveMerger() const {
74+
return liveMerger_;
75+
}
76+
77+
void AddLiveStreamMergeRequest::setLiveMerger(const std::string &liveMerger) {
78+
liveMerger_ = liveMerger;
79+
setParameter(std::string("LiveMerger"), liveMerger);
80+
}
81+
7382
std::string AddLiveStreamMergeRequest::getRegionId() const {
7483
return regionId_;
7584
}
@@ -133,3 +142,12 @@ void AddLiveStreamMergeRequest::setOwnerId(long ownerId) {
133142
setParameter(std::string("OwnerId"), std::to_string(ownerId));
134143
}
135144

145+
std::string AddLiveStreamMergeRequest::getMergeParameters() const {
146+
return mergeParameters_;
147+
}
148+
149+
void AddLiveStreamMergeRequest::setMergeParameters(const std::string &mergeParameters) {
150+
mergeParameters_ = mergeParameters;
151+
setParameter(std::string("MergeParameters"), mergeParameters);
152+
}
153+

live/src/model/AddLiveStreamMergeResult.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ void AddLiveStreamMergeResult::parse(const std::string &payload)
3939
Json::Value value;
4040
reader.parse(payload, value);
4141
setRequestId(value["RequestId"].asString());
42+
if(!value["Message"].isNull())
43+
message_ = value["Message"].asString();
4244

4345
}
4446

47+
std::string AddLiveStreamMergeResult::getMessage()const
48+
{
49+
return message_;
50+
}
51+

0 commit comments

Comments
 (0)