sdk-team 3 лет назад
Родитель
Сommit
946b319c79

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1542
+1.36.1543

+ 3 - 0
vod/include/alibabacloud/vod/model/GetMezzanineInfoResult.h

@@ -84,13 +84,16 @@ namespace AlibabaCloud
 					std::string videoId;
 					std::string cRC64;
 					long size;
+					std::string storageClass;
 					std::string fileName;
 					std::string fps;
 					std::vector<VideoStream> videoStreamList;
 					std::string duration;
 					std::vector<AudioStream> audioStreamList;
+					std::string restoreStatus;
 					std::string bitrate;
 					std::string preprocessStatus;
+					std::string restoreExpiration;
 					std::string fileURL;
 					std::string creationTime;
 					long height;

+ 13 - 10
vod/include/alibabacloud/vod/model/GetVideoInfoResult.h

@@ -38,30 +38,33 @@ namespace AlibabaCloud
 					{
 						std::string uRL;
 					};
-					std::string status;
 					std::string modifyTime;
-					std::string videoId;
 					std::string description;
 					long size;
+					std::string modificationTime;
+					long cateId;
+					std::string cateName;
+					std::string restoreStatus;
+					std::string preprocessStatus;
+					std::string storageLocation;
+					std::vector<std::string> snapshots;
+					std::string tags;
+					std::string templateGroupId;
+					std::string status;
+					std::string videoId;
+					std::string storageClass;
 					std::string createTime;
 					std::string downloadSwitch;
 					std::string title;
-					std::string modificationTime;
 					float duration;
-					long cateId;
-					std::string cateName;
 					std::vector<Thumbnail> thumbnailList;
-					std::string preprocessStatus;
+					std::string restoreExpiration;
 					std::string auditStatus;
 					std::string customMediaInfo;
 					std::string appId;
 					std::string creationTime;
 					std::string coverURL;
 					std::string regionId;
-					std::string storageLocation;
-					std::vector<std::string> snapshots;
-					std::string tags;
-					std::string templateGroupId;
 				};
 
 

+ 3 - 0
vod/include/alibabacloud/vod/model/GetVideoInfosResult.h

@@ -42,14 +42,17 @@ namespace AlibabaCloud
 					std::string videoId;
 					std::string description;
 					long size;
+					std::string storageClass;
 					std::string downloadSwitch;
 					std::string title;
 					std::string modificationTime;
 					float duration;
 					long cateId;
 					std::string cateName;
+					std::string restoreStatus;
 					std::vector<Video::Thumbnail> thumbnailList;
 					std::string preprocessStatus;
+					std::string restoreExpiration;
 					std::string customMediaInfo;
 					std::string appId;
 					std::string creationTime;

+ 3 - 0
vod/include/alibabacloud/vod/model/GetVideoListResult.h

@@ -39,12 +39,15 @@ namespace AlibabaCloud
 					std::string videoId;
 					std::string description;
 					long size;
+					std::string storageClass;
 					std::string createTime;
 					std::string title;
 					std::string modificationTime;
 					float duration;
 					long cateId;
 					std::string cateName;
+					std::string restoreStatus;
+					std::string restoreExpiration;
 					std::string appId;
 					std::string creationTime;
 					std::string coverURL;

+ 39 - 0
vod/include/alibabacloud/vod/model/SearchMediaResult.h

@@ -61,6 +61,7 @@ namespace AlibabaCloud
 						std::string modificationTime;
 						long cateId;
 						std::string cateName;
+						std::string restoreStatus;
 						std::string preprocessStatus;
 						std::string auditAIResult;
 						std::string mediaType;
@@ -71,10 +72,12 @@ namespace AlibabaCloud
 						std::string tags;
 						std::string status;
 						std::string videoId;
+						std::string storageClass;
 						std::string auditLabel;
 						std::string downloadSwitch;
 						std::string title;
 						float duration;
+						std::string restoreExpiration;
 						std::string auditStatus;
 						std::string mediaSource;
 						std::string appId;
@@ -112,6 +115,7 @@ namespace AlibabaCloud
 						std::string modificationTime;
 						long cateId;
 						std::string cateName;
+						std::string restoreStatus;
 						std::string preprocessStatus;
 						std::string auditAIResult;
 						std::vector<std::string> spriteSnapshots1;
@@ -121,10 +125,12 @@ namespace AlibabaCloud
 						std::string tags;
 						std::vector<PlayInfo4> playInfoList3;
 						std::string status;
+						std::string storageClass;
 						std::string downloadSwitch;
 						std::string title;
 						float duration;
 						std::vector<std::string> snapshots2;
+						std::string restoreExpiration;
 						std::string auditStatus;
 						std::string mediaSource;
 						std::string appId;
@@ -179,13 +185,46 @@ namespace AlibabaCloud
 						std::string storageLocation;
 						std::string tags;
 					};
+					struct AiData
+					{
+						struct AiLabelInfoItem
+						{
+							struct OccurrencesItem
+							{
+								double score;
+								double from;
+								double to;
+							};
+							std::string category;
+							std::vector<AiLabelInfoItem::OccurrencesItem> occurrences;
+							std::string labelName;
+							std::string labelId;
+						};
+						struct OcrInfoItem
+						{
+							std::string content;
+							double from;
+							double to;
+						};
+						std::vector<OcrInfoItem> ocrInfo;
+						std::vector<AiLabelInfoItem> aiLabelInfo;
+					};
+					struct AiRoughData
+					{
+						std::string status;
+						std::string aiCategory;
+						std::string saveType;
+						std::string aiJobId;
+					};
 					AttachedMedia attachedMedia;
+					AiData aiData;
 					std::string mediaId;
 					Video video;
 					std::string creationTime;
 					std::string mediaType;
 					Audio audio;
 					Image image;
+					AiRoughData aiRoughData;
 				};
 
 

+ 6 - 0
vod/src/model/GetMezzanineInfoResult.cc

@@ -68,6 +68,12 @@ void GetMezzanineInfoResult::parse(const std::string &payload)
 		mezzanine_.duration = mezzanineNode["Duration"].asString();
 	if(!mezzanineNode["Fps"].isNull())
 		mezzanine_.fps = mezzanineNode["Fps"].asString();
+	if(!mezzanineNode["StorageClass"].isNull())
+		mezzanine_.storageClass = mezzanineNode["StorageClass"].asString();
+	if(!mezzanineNode["RestoreStatus"].isNull())
+		mezzanine_.restoreStatus = mezzanineNode["RestoreStatus"].asString();
+	if(!mezzanineNode["RestoreExpiration"].isNull())
+		mezzanine_.restoreExpiration = mezzanineNode["RestoreExpiration"].asString();
 	auto allAudioStreamListNode = mezzanineNode["AudioStreamList"]["AudioStream"];
 	for (auto mezzanineNodeAudioStreamListAudioStream : allAudioStreamListNode)
 	{

+ 6 - 0
vod/src/model/GetVideoInfoResult.cc

@@ -84,6 +84,12 @@ void GetVideoInfoResult::parse(const std::string &payload)
 		video_.auditStatus = videoNode["AuditStatus"].asString();
 	if(!videoNode["ModifyTime"].isNull())
 		video_.modifyTime = videoNode["ModifyTime"].asString();
+	if(!videoNode["StorageClass"].isNull())
+		video_.storageClass = videoNode["StorageClass"].asString();
+	if(!videoNode["RestoreStatus"].isNull())
+		video_.restoreStatus = videoNode["RestoreStatus"].asString();
+	if(!videoNode["RestoreExpiration"].isNull())
+		video_.restoreExpiration = videoNode["RestoreExpiration"].asString();
 	auto allThumbnailListNode = videoNode["ThumbnailList"]["Thumbnail"];
 	for (auto videoNodeThumbnailListThumbnail : allThumbnailListNode)
 	{

+ 6 - 0
vod/src/model/GetVideoInfosResult.cc

@@ -81,6 +81,12 @@ void GetVideoInfosResult::parse(const std::string &payload)
 			videoListObject.duration = std::stof(valueVideoListVideo["Duration"].asString());
 		if(!valueVideoListVideo["Title"].isNull())
 			videoListObject.title = valueVideoListVideo["Title"].asString();
+		if(!valueVideoListVideo["StorageClass"].isNull())
+			videoListObject.storageClass = valueVideoListVideo["StorageClass"].asString();
+		if(!valueVideoListVideo["RestoreStatus"].isNull())
+			videoListObject.restoreStatus = valueVideoListVideo["RestoreStatus"].asString();
+		if(!valueVideoListVideo["RestoreExpiration"].isNull())
+			videoListObject.restoreExpiration = valueVideoListVideo["RestoreExpiration"].asString();
 		auto allThumbnailListNode = valueVideoListVideo["ThumbnailList"]["Thumbnail"];
 		for (auto valueVideoListVideoThumbnailListThumbnail : allThumbnailListNode)
 		{

+ 6 - 0
vod/src/model/GetVideoListResult.cc

@@ -75,6 +75,12 @@ void GetVideoListResult::parse(const std::string &payload)
 			videoListObject.title = valueVideoListVideo["Title"].asString();
 		if(!valueVideoListVideo["ModifyTime"].isNull())
 			videoListObject.modifyTime = valueVideoListVideo["ModifyTime"].asString();
+		if(!valueVideoListVideo["StorageClass"].isNull())
+			videoListObject.storageClass = valueVideoListVideo["StorageClass"].asString();
+		if(!valueVideoListVideo["RestoreStatus"].isNull())
+			videoListObject.restoreStatus = valueVideoListVideo["RestoreStatus"].asString();
+		if(!valueVideoListVideo["RestoreExpiration"].isNull())
+			videoListObject.restoreExpiration = valueVideoListVideo["RestoreExpiration"].asString();
 		auto allSnapshots = value["Snapshots"]["Snapshot"];
 		for (auto value : allSnapshots)
 			videoListObject.snapshots.push_back(value.asString());

+ 58 - 0
vod/src/model/SearchMediaResult.cc

@@ -100,6 +100,12 @@ void SearchMediaResult::parse(const std::string &payload)
 			mediaListObject.video.auditAIResult = videoNode["AuditAIResult"].asString();
 		if(!videoNode["PreprocessStatus"].isNull())
 			mediaListObject.video.preprocessStatus = videoNode["PreprocessStatus"].asString();
+		if(!videoNode["RestoreExpiration"].isNull())
+			mediaListObject.video.restoreExpiration = videoNode["RestoreExpiration"].asString();
+		if(!videoNode["RestoreStatus"].isNull())
+			mediaListObject.video.restoreStatus = videoNode["RestoreStatus"].asString();
+		if(!videoNode["StorageClass"].isNull())
+			mediaListObject.video.storageClass = videoNode["StorageClass"].asString();
 		if(!videoNode["Size"].isNull())
 			mediaListObject.video.size = std::stol(videoNode["Size"].asString());
 		if(!videoNode["Duration"].isNull())
@@ -193,6 +199,12 @@ void SearchMediaResult::parse(const std::string &payload)
 			mediaListObject.audio.auditAIResult = audioNode["AuditAIResult"].asString();
 		if(!audioNode["PreprocessStatus"].isNull())
 			mediaListObject.audio.preprocessStatus = audioNode["PreprocessStatus"].asString();
+		if(!audioNode["RestoreExpiration"].isNull())
+			mediaListObject.audio.restoreExpiration = audioNode["RestoreExpiration"].asString();
+		if(!audioNode["RestoreStatus"].isNull())
+			mediaListObject.audio.restoreStatus = audioNode["RestoreStatus"].asString();
+		if(!audioNode["StorageClass"].isNull())
+			mediaListObject.audio.storageClass = audioNode["StorageClass"].asString();
 		if(!audioNode["Size"].isNull())
 			mediaListObject.audio.size = std::stol(audioNode["Size"].asString());
 		if(!audioNode["Duration"].isNull())
@@ -317,6 +329,52 @@ void SearchMediaResult::parse(const std::string &payload)
 				categoryObject.level = std::stol(attachedMediaNodeCategoriesCategory["Level"].asString());
 			mediaListObject.attachedMedia.categories.push_back(categoryObject);
 		}
+		auto aiDataNode = value["AiData"];
+		auto allAiLabelInfoNode = aiDataNode["AiLabelInfo"]["AiLabelInfoItem"];
+		for (auto aiDataNodeAiLabelInfoAiLabelInfoItem : allAiLabelInfoNode)
+		{
+			Media::AiData::AiLabelInfoItem aiLabelInfoItemObject;
+			if(!aiDataNodeAiLabelInfoAiLabelInfoItem["Category"].isNull())
+				aiLabelInfoItemObject.category = aiDataNodeAiLabelInfoAiLabelInfoItem["Category"].asString();
+			if(!aiDataNodeAiLabelInfoAiLabelInfoItem["LabelName"].isNull())
+				aiLabelInfoItemObject.labelName = aiDataNodeAiLabelInfoAiLabelInfoItem["LabelName"].asString();
+			if(!aiDataNodeAiLabelInfoAiLabelInfoItem["LabelId"].isNull())
+				aiLabelInfoItemObject.labelId = aiDataNodeAiLabelInfoAiLabelInfoItem["LabelId"].asString();
+			auto allOccurrencesNode = aiDataNodeAiLabelInfoAiLabelInfoItem["Occurrences"]["OccurrencesItem"];
+			for (auto aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem : allOccurrencesNode)
+			{
+				Media::AiData::AiLabelInfoItem::OccurrencesItem occurrencesObject;
+				if(!aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem["Score"].isNull())
+					occurrencesObject.score = aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem["Score"].asString();
+				if(!aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem["From"].isNull())
+					occurrencesObject.from = aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem["From"].asString();
+				if(!aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem["To"].isNull())
+					occurrencesObject.to = aiDataNodeAiLabelInfoAiLabelInfoItemOccurrencesOccurrencesItem["To"].asString();
+				aiLabelInfoItemObject.occurrences.push_back(occurrencesObject);
+			}
+			mediaListObject.aiData.aiLabelInfo.push_back(aiLabelInfoItemObject);
+		}
+		auto allOcrInfoNode = aiDataNode["OcrInfo"]["OcrInfoItem"];
+		for (auto aiDataNodeOcrInfoOcrInfoItem : allOcrInfoNode)
+		{
+			Media::AiData::OcrInfoItem ocrInfoItemObject;
+			if(!aiDataNodeOcrInfoOcrInfoItem["From"].isNull())
+				ocrInfoItemObject.from = aiDataNodeOcrInfoOcrInfoItem["From"].asString();
+			if(!aiDataNodeOcrInfoOcrInfoItem["To"].isNull())
+				ocrInfoItemObject.to = aiDataNodeOcrInfoOcrInfoItem["To"].asString();
+			if(!aiDataNodeOcrInfoOcrInfoItem["Content"].isNull())
+				ocrInfoItemObject.content = aiDataNodeOcrInfoOcrInfoItem["Content"].asString();
+			mediaListObject.aiData.ocrInfo.push_back(ocrInfoItemObject);
+		}
+		auto aiRoughDataNode = value["AiRoughData"];
+		if(!aiRoughDataNode["SaveType"].isNull())
+			mediaListObject.aiRoughData.saveType = aiRoughDataNode["SaveType"].asString();
+		if(!aiRoughDataNode["Status"].isNull())
+			mediaListObject.aiRoughData.status = aiRoughDataNode["Status"].asString();
+		if(!aiRoughDataNode["AiJobId"].isNull())
+			mediaListObject.aiRoughData.aiJobId = aiRoughDataNode["AiJobId"].asString();
+		if(!aiRoughDataNode["AiCategory"].isNull())
+			mediaListObject.aiRoughData.aiCategory = aiRoughDataNode["AiCategory"].asString();
 		mediaList_.push_back(mediaListObject);
 	}
 	if(!value["Total"].isNull())