浏览代码

Support drm.

sdk-team 5 年之前
父节点
当前提交
9d980b6731

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2020-11-12 Version: patch
+- Support drm.
+
 2020-11-12 Version: patch
 - Generated 2019-06-01 for `smc`.
 

+ 12 - 0
imm/include/alibabacloud/imm/model/GetMediaMetaResult.h

@@ -45,6 +45,17 @@ namespace AlibabaCloud
 							std::string district;
 							std::string province;
 						};
+						struct Tag
+						{
+							std::string artist;
+							std::string composer;
+							std::string performer;
+							std::string language;
+							std::string creationTime;
+							std::string album;
+							std::string title;
+							std::string albumArtist;
+						};
 						Address address;
 						int numberStreams;
 						std::string size;
@@ -53,6 +64,7 @@ namespace AlibabaCloud
 						std::string creationTime;
 						std::string formatName;
 						std::string duration;
+						Tag tag;
 						std::string bitrate;
 						int numberPrograms;
 						std::string location;

+ 4 - 4
imm/src/model/DetectQRCodesResult.cc

@@ -45,12 +45,12 @@ void DetectQRCodesResult::parse(const std::string &payload)
 		SuccessDetailsItem successDetailsObject;
 		if(!valueSuccessDetailsSuccessDetailsItem["SrcUri"].isNull())
 			successDetailsObject.srcUri = valueSuccessDetailsSuccessDetailsItem["SrcUri"].asString();
-		auto allQRCodesNode = allSuccessDetailsNode["QRCodes"]["QRCodesItem"];
-		for (auto allSuccessDetailsNodeQRCodesQRCodesItem : allQRCodesNode)
+		auto allQRCodesNode = valueSuccessDetailsSuccessDetailsItem["QRCodes"]["QRCodesItem"];
+		for (auto valueSuccessDetailsSuccessDetailsItemQRCodesQRCodesItem : allQRCodesNode)
 		{
 			SuccessDetailsItem::QRCodesItem qRCodesObject;
-			if(!allSuccessDetailsNodeQRCodesQRCodesItem["Content"].isNull())
-				qRCodesObject.content = allSuccessDetailsNodeQRCodesQRCodesItem["Content"].asString();
+			if(!valueSuccessDetailsSuccessDetailsItemQRCodesQRCodesItem["Content"].isNull())
+				qRCodesObject.content = valueSuccessDetailsSuccessDetailsItemQRCodesQRCodesItem["Content"].asString();
 			auto qRCodesRectangleNode = value["QRCodesRectangle"];
 			if(!qRCodesRectangleNode["Left"].isNull())
 				qRCodesObject.qRCodesRectangle.left = qRCodesRectangleNode["Left"].asString();

+ 54 - 54
imm/src/model/FindImagesResult.cc

@@ -127,14 +127,14 @@ void FindImagesResult::parse(const std::string &payload)
 			imagesObject.croppingSuggestionFailReason = valueImagesImagesItem["CroppingSuggestionFailReason"].asString();
 		if(!valueImagesImagesItem["CroppingSuggestionModifyTime"].isNull())
 			imagesObject.croppingSuggestionModifyTime = valueImagesImagesItem["CroppingSuggestionModifyTime"].asString();
-		auto allCroppingSuggestionNode = allImagesNode["CroppingSuggestion"]["CroppingSuggestionItem"];
-		for (auto allImagesNodeCroppingSuggestionCroppingSuggestionItem : allCroppingSuggestionNode)
+		auto allCroppingSuggestionNode = valueImagesImagesItem["CroppingSuggestion"]["CroppingSuggestionItem"];
+		for (auto valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem : allCroppingSuggestionNode)
 		{
 			ImagesItem::CroppingSuggestionItem croppingSuggestionObject;
-			if(!allImagesNodeCroppingSuggestionCroppingSuggestionItem["AspectRatio"].isNull())
-				croppingSuggestionObject.aspectRatio = allImagesNodeCroppingSuggestionCroppingSuggestionItem["AspectRatio"].asString();
-			if(!allImagesNodeCroppingSuggestionCroppingSuggestionItem["Score"].isNull())
-				croppingSuggestionObject.score = std::stof(allImagesNodeCroppingSuggestionCroppingSuggestionItem["Score"].asString());
+			if(!valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["AspectRatio"].isNull())
+				croppingSuggestionObject.aspectRatio = valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["AspectRatio"].asString();
+			if(!valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["Score"].isNull())
+				croppingSuggestionObject.score = std::stof(valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["Score"].asString());
 			auto croppingBoundaryNode = value["CroppingBoundary"];
 			if(!croppingBoundaryNode["Width"].isNull())
 				croppingSuggestionObject.croppingBoundary.width = std::stoi(croppingBoundaryNode["Width"].asString());
@@ -146,30 +146,30 @@ void FindImagesResult::parse(const std::string &payload)
 				croppingSuggestionObject.croppingBoundary.top = std::stoi(croppingBoundaryNode["Top"].asString());
 			imagesObject.croppingSuggestion.push_back(croppingSuggestionObject);
 		}
-		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
-		for (auto allImagesNodeFacesFacesItem : allFacesNode)
+		auto allFacesNode = valueImagesImagesItem["Faces"]["FacesItem"];
+		for (auto valueImagesImagesItemFacesFacesItem : allFacesNode)
 		{
 			ImagesItem::FacesItem facesObject;
-			if(!allImagesNodeFacesFacesItem["Age"].isNull())
-				facesObject.age = std::stoi(allImagesNodeFacesFacesItem["Age"].asString());
-			if(!allImagesNodeFacesFacesItem["GenderConfidence"].isNull())
-				facesObject.genderConfidence = std::stof(allImagesNodeFacesFacesItem["GenderConfidence"].asString());
-			if(!allImagesNodeFacesFacesItem["Attractive"].isNull())
-				facesObject.attractive = std::stof(allImagesNodeFacesFacesItem["Attractive"].asString());
-			if(!allImagesNodeFacesFacesItem["Gender"].isNull())
-				facesObject.gender = allImagesNodeFacesFacesItem["Gender"].asString();
-			if(!allImagesNodeFacesFacesItem["FaceConfidence"].isNull())
-				facesObject.faceConfidence = std::stof(allImagesNodeFacesFacesItem["FaceConfidence"].asString());
-			if(!allImagesNodeFacesFacesItem["Emotion"].isNull())
-				facesObject.emotion = allImagesNodeFacesFacesItem["Emotion"].asString();
-			if(!allImagesNodeFacesFacesItem["FaceId"].isNull())
-				facesObject.faceId = allImagesNodeFacesFacesItem["FaceId"].asString();
-			if(!allImagesNodeFacesFacesItem["EmotionConfidence"].isNull())
-				facesObject.emotionConfidence = std::stof(allImagesNodeFacesFacesItem["EmotionConfidence"].asString());
-			if(!allImagesNodeFacesFacesItem["GroupId"].isNull())
-				facesObject.groupId = allImagesNodeFacesFacesItem["GroupId"].asString();
-			if(!allImagesNodeFacesFacesItem["FaceQuality"].isNull())
-				facesObject.faceQuality = std::stof(allImagesNodeFacesFacesItem["FaceQuality"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Age"].isNull())
+				facesObject.age = std::stoi(valueImagesImagesItemFacesFacesItem["Age"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["GenderConfidence"].isNull())
+				facesObject.genderConfidence = std::stof(valueImagesImagesItemFacesFacesItem["GenderConfidence"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Attractive"].isNull())
+				facesObject.attractive = std::stof(valueImagesImagesItemFacesFacesItem["Attractive"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Gender"].isNull())
+				facesObject.gender = valueImagesImagesItemFacesFacesItem["Gender"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["FaceConfidence"].isNull())
+				facesObject.faceConfidence = std::stof(valueImagesImagesItemFacesFacesItem["FaceConfidence"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Emotion"].isNull())
+				facesObject.emotion = valueImagesImagesItemFacesFacesItem["Emotion"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["FaceId"].isNull())
+				facesObject.faceId = valueImagesImagesItemFacesFacesItem["FaceId"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["EmotionConfidence"].isNull())
+				facesObject.emotionConfidence = std::stof(valueImagesImagesItemFacesFacesItem["EmotionConfidence"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["GroupId"].isNull())
+				facesObject.groupId = valueImagesImagesItemFacesFacesItem["GroupId"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["FaceQuality"].isNull())
+				facesObject.faceQuality = std::stof(valueImagesImagesItemFacesFacesItem["FaceQuality"].asString());
 			auto emotionDetailsNode = value["EmotionDetails"];
 			if(!emotionDetailsNode["SAD"].isNull())
 				facesObject.emotionDetails.sAD = std::stof(emotionDetailsNode["SAD"].asString());
@@ -220,28 +220,28 @@ void FindImagesResult::parse(const std::string &payload)
 				facesObject.faceAttributes.headPose.yaw = std::stof(headPoseNode["Yaw"].asString());
 			imagesObject.faces.push_back(facesObject);
 		}
-		auto allTagsNode = allImagesNode["Tags"]["TagsItem"];
-		for (auto allImagesNodeTagsTagsItem : allTagsNode)
+		auto allTagsNode = valueImagesImagesItem["Tags"]["TagsItem"];
+		for (auto valueImagesImagesItemTagsTagsItem : allTagsNode)
 		{
 			ImagesItem::TagsItem tagsObject;
-			if(!allImagesNodeTagsTagsItem["TagConfidence"].isNull())
-				tagsObject.tagConfidence = std::stof(allImagesNodeTagsTagsItem["TagConfidence"].asString());
-			if(!allImagesNodeTagsTagsItem["TagLevel"].isNull())
-				tagsObject.tagLevel = std::stoi(allImagesNodeTagsTagsItem["TagLevel"].asString());
-			if(!allImagesNodeTagsTagsItem["TagName"].isNull())
-				tagsObject.tagName = allImagesNodeTagsTagsItem["TagName"].asString();
-			if(!allImagesNodeTagsTagsItem["ParentTagName"].isNull())
-				tagsObject.parentTagName = allImagesNodeTagsTagsItem["ParentTagName"].asString();
+			if(!valueImagesImagesItemTagsTagsItem["TagConfidence"].isNull())
+				tagsObject.tagConfidence = std::stof(valueImagesImagesItemTagsTagsItem["TagConfidence"].asString());
+			if(!valueImagesImagesItemTagsTagsItem["TagLevel"].isNull())
+				tagsObject.tagLevel = std::stoi(valueImagesImagesItemTagsTagsItem["TagLevel"].asString());
+			if(!valueImagesImagesItemTagsTagsItem["TagName"].isNull())
+				tagsObject.tagName = valueImagesImagesItemTagsTagsItem["TagName"].asString();
+			if(!valueImagesImagesItemTagsTagsItem["ParentTagName"].isNull())
+				tagsObject.parentTagName = valueImagesImagesItemTagsTagsItem["ParentTagName"].asString();
 			imagesObject.tags.push_back(tagsObject);
 		}
-		auto allOCRNode = allImagesNode["OCR"]["OCRItem"];
-		for (auto allImagesNodeOCROCRItem : allOCRNode)
+		auto allOCRNode = valueImagesImagesItem["OCR"]["OCRItem"];
+		for (auto valueImagesImagesItemOCROCRItem : allOCRNode)
 		{
 			ImagesItem::OCRItem oCRObject;
-			if(!allImagesNodeOCROCRItem["OCRContents"].isNull())
-				oCRObject.oCRContents = allImagesNodeOCROCRItem["OCRContents"].asString();
-			if(!allImagesNodeOCROCRItem["OCRConfidence"].isNull())
-				oCRObject.oCRConfidence = std::stof(allImagesNodeOCROCRItem["OCRConfidence"].asString());
+			if(!valueImagesImagesItemOCROCRItem["OCRContents"].isNull())
+				oCRObject.oCRContents = valueImagesImagesItemOCROCRItem["OCRContents"].asString();
+			if(!valueImagesImagesItemOCROCRItem["OCRConfidence"].isNull())
+				oCRObject.oCRConfidence = std::stof(valueImagesImagesItemOCROCRItem["OCRConfidence"].asString());
 			auto oCRBoundaryNode = value["OCRBoundary"];
 			if(!oCRBoundaryNode["Left"].isNull())
 				oCRObject.oCRBoundary.left = std::stoi(oCRBoundaryNode["Left"].asString());
@@ -253,18 +253,18 @@ void FindImagesResult::parse(const std::string &payload)
 				oCRObject.oCRBoundary.height = std::stoi(oCRBoundaryNode["Height"].asString());
 			imagesObject.oCR.push_back(oCRObject);
 		}
-		auto allCelebrityNode = allImagesNode["Celebrity"]["CelebrityItem"];
-		for (auto allImagesNodeCelebrityCelebrityItem : allCelebrityNode)
+		auto allCelebrityNode = valueImagesImagesItem["Celebrity"]["CelebrityItem"];
+		for (auto valueImagesImagesItemCelebrityCelebrityItem : allCelebrityNode)
 		{
 			ImagesItem::CelebrityItem celebrityObject;
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = allImagesNodeCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityGender"].isNull())
-				celebrityObject.celebrityGender = allImagesNodeCelebrityCelebrityItem["CelebrityGender"].asString();
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-				celebrityObject.celebrityConfidence = std::stof(allImagesNodeCelebrityCelebrityItem["CelebrityConfidence"].asString());
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = allImagesNodeCelebrityCelebrityItem["CelebrityLibraryName"].asString();
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].isNull())
+				celebrityObject.celebrityName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].asString();
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].isNull())
+				celebrityObject.celebrityGender = valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].asString();
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].isNull())
+				celebrityObject.celebrityConfidence = std::stof(valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].asString());
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
+				celebrityObject.celebrityLibraryName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
 			auto celebrityBoundaryNode = value["CelebrityBoundary"];
 			if(!celebrityBoundaryNode["Left"].isNull())
 				celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());

+ 10 - 10
imm/src/model/FindSimilarFacesResult.cc

@@ -51,18 +51,18 @@ void FindSimilarFacesResult::parse(const std::string &payload)
 			facesObject.similarity = std::stof(valueFacesFacesItem["Similarity"].asString());
 		if(!valueFacesFacesItem["ExternalId"].isNull())
 			facesObject.externalId = valueFacesFacesItem["ExternalId"].asString();
-		auto allSimilarFacesNode = allFacesNode["SimilarFaces"]["SimilarFacesItem"];
-		for (auto allFacesNodeSimilarFacesSimilarFacesItem : allSimilarFacesNode)
+		auto allSimilarFacesNode = valueFacesFacesItem["SimilarFaces"]["SimilarFacesItem"];
+		for (auto valueFacesFacesItemSimilarFacesSimilarFacesItem : allSimilarFacesNode)
 		{
 			FacesItem::SimilarFacesItem similarFacesObject;
-			if(!allFacesNodeSimilarFacesSimilarFacesItem["FaceId"].isNull())
-				similarFacesObject.faceId = allFacesNodeSimilarFacesSimilarFacesItem["FaceId"].asString();
-			if(!allFacesNodeSimilarFacesSimilarFacesItem["ImageUri"].isNull())
-				similarFacesObject.imageUri = allFacesNodeSimilarFacesSimilarFacesItem["ImageUri"].asString();
-			if(!allFacesNodeSimilarFacesSimilarFacesItem["Similarity"].isNull())
-				similarFacesObject.similarity = std::stof(allFacesNodeSimilarFacesSimilarFacesItem["Similarity"].asString());
-			if(!allFacesNodeSimilarFacesSimilarFacesItem["ExternalId"].isNull())
-				similarFacesObject.externalId = allFacesNodeSimilarFacesSimilarFacesItem["ExternalId"].asString();
+			if(!valueFacesFacesItemSimilarFacesSimilarFacesItem["FaceId"].isNull())
+				similarFacesObject.faceId = valueFacesFacesItemSimilarFacesSimilarFacesItem["FaceId"].asString();
+			if(!valueFacesFacesItemSimilarFacesSimilarFacesItem["ImageUri"].isNull())
+				similarFacesObject.imageUri = valueFacesFacesItemSimilarFacesSimilarFacesItem["ImageUri"].asString();
+			if(!valueFacesFacesItemSimilarFacesSimilarFacesItem["Similarity"].isNull())
+				similarFacesObject.similarity = std::stof(valueFacesFacesItemSimilarFacesSimilarFacesItem["Similarity"].asString());
+			if(!valueFacesFacesItemSimilarFacesSimilarFacesItem["ExternalId"].isNull())
+				similarFacesObject.externalId = valueFacesFacesItemSimilarFacesSimilarFacesItem["ExternalId"].asString();
 			auto faceAttributes1Node = value["FaceAttributes"];
 			auto faceBoundaryNode = faceAttributes1Node["FaceBoundary"];
 			if(!faceBoundaryNode["Left"].isNull())

+ 17 - 0
imm/src/model/GetMediaMetaResult.cc

@@ -74,6 +74,23 @@ void GetMediaMetaResult::parse(const std::string &payload)
 		mediaMeta_.mediaFormat.address.district = addressNode["District"].asString();
 	if(!addressNode["Township"].isNull())
 		mediaMeta_.mediaFormat.address.township = addressNode["Township"].asString();
+	auto tagNode = mediaFormatNode["Tag"];
+	if(!tagNode["Language"].isNull())
+		mediaMeta_.mediaFormat.tag.language = tagNode["Language"].asString();
+	if(!tagNode["CreationTime"].isNull())
+		mediaMeta_.mediaFormat.tag.creationTime = tagNode["CreationTime"].asString();
+	if(!tagNode["Album"].isNull())
+		mediaMeta_.mediaFormat.tag.album = tagNode["Album"].asString();
+	if(!tagNode["AlbumArtist"].isNull())
+		mediaMeta_.mediaFormat.tag.albumArtist = tagNode["AlbumArtist"].asString();
+	if(!tagNode["Artist"].isNull())
+		mediaMeta_.mediaFormat.tag.artist = tagNode["Artist"].asString();
+	if(!tagNode["Composer"].isNull())
+		mediaMeta_.mediaFormat.tag.composer = tagNode["Composer"].asString();
+	if(!tagNode["Title"].isNull())
+		mediaMeta_.mediaFormat.tag.title = tagNode["Title"].asString();
+	if(!tagNode["Performer"].isNull())
+		mediaMeta_.mediaFormat.tag.performer = tagNode["Performer"].asString();
 	auto mediaStreamsNode = mediaMetaNode["MediaStreams"];
 	auto allVideoStreamsNode = mediaStreamsNode["VideoStreams"]["VideoStream"];
 	for (auto mediaStreamsNodeVideoStreamsVideoStream : allVideoStreamsNode)

+ 54 - 54
imm/src/model/ListImagesResult.cc

@@ -127,14 +127,14 @@ void ListImagesResult::parse(const std::string &payload)
 			imagesObject.croppingSuggestionFailReason = valueImagesImagesItem["CroppingSuggestionFailReason"].asString();
 		if(!valueImagesImagesItem["CroppingSuggestionModifyTime"].isNull())
 			imagesObject.croppingSuggestionModifyTime = valueImagesImagesItem["CroppingSuggestionModifyTime"].asString();
-		auto allCroppingSuggestionNode = allImagesNode["CroppingSuggestion"]["CroppingSuggestionItem"];
-		for (auto allImagesNodeCroppingSuggestionCroppingSuggestionItem : allCroppingSuggestionNode)
+		auto allCroppingSuggestionNode = valueImagesImagesItem["CroppingSuggestion"]["CroppingSuggestionItem"];
+		for (auto valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem : allCroppingSuggestionNode)
 		{
 			ImagesItem::CroppingSuggestionItem croppingSuggestionObject;
-			if(!allImagesNodeCroppingSuggestionCroppingSuggestionItem["AspectRatio"].isNull())
-				croppingSuggestionObject.aspectRatio = allImagesNodeCroppingSuggestionCroppingSuggestionItem["AspectRatio"].asString();
-			if(!allImagesNodeCroppingSuggestionCroppingSuggestionItem["Score"].isNull())
-				croppingSuggestionObject.score = std::stof(allImagesNodeCroppingSuggestionCroppingSuggestionItem["Score"].asString());
+			if(!valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["AspectRatio"].isNull())
+				croppingSuggestionObject.aspectRatio = valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["AspectRatio"].asString();
+			if(!valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["Score"].isNull())
+				croppingSuggestionObject.score = std::stof(valueImagesImagesItemCroppingSuggestionCroppingSuggestionItem["Score"].asString());
 			auto croppingBoundaryNode = value["CroppingBoundary"];
 			if(!croppingBoundaryNode["Width"].isNull())
 				croppingSuggestionObject.croppingBoundary.width = std::stoi(croppingBoundaryNode["Width"].asString());
@@ -146,30 +146,30 @@ void ListImagesResult::parse(const std::string &payload)
 				croppingSuggestionObject.croppingBoundary.top = std::stoi(croppingBoundaryNode["Top"].asString());
 			imagesObject.croppingSuggestion.push_back(croppingSuggestionObject);
 		}
-		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
-		for (auto allImagesNodeFacesFacesItem : allFacesNode)
+		auto allFacesNode = valueImagesImagesItem["Faces"]["FacesItem"];
+		for (auto valueImagesImagesItemFacesFacesItem : allFacesNode)
 		{
 			ImagesItem::FacesItem facesObject;
-			if(!allImagesNodeFacesFacesItem["Age"].isNull())
-				facesObject.age = std::stoi(allImagesNodeFacesFacesItem["Age"].asString());
-			if(!allImagesNodeFacesFacesItem["GenderConfidence"].isNull())
-				facesObject.genderConfidence = std::stof(allImagesNodeFacesFacesItem["GenderConfidence"].asString());
-			if(!allImagesNodeFacesFacesItem["Attractive"].isNull())
-				facesObject.attractive = std::stof(allImagesNodeFacesFacesItem["Attractive"].asString());
-			if(!allImagesNodeFacesFacesItem["Gender"].isNull())
-				facesObject.gender = allImagesNodeFacesFacesItem["Gender"].asString();
-			if(!allImagesNodeFacesFacesItem["FaceConfidence"].isNull())
-				facesObject.faceConfidence = std::stof(allImagesNodeFacesFacesItem["FaceConfidence"].asString());
-			if(!allImagesNodeFacesFacesItem["Emotion"].isNull())
-				facesObject.emotion = allImagesNodeFacesFacesItem["Emotion"].asString();
-			if(!allImagesNodeFacesFacesItem["FaceId"].isNull())
-				facesObject.faceId = allImagesNodeFacesFacesItem["FaceId"].asString();
-			if(!allImagesNodeFacesFacesItem["EmotionConfidence"].isNull())
-				facesObject.emotionConfidence = std::stof(allImagesNodeFacesFacesItem["EmotionConfidence"].asString());
-			if(!allImagesNodeFacesFacesItem["GroupId"].isNull())
-				facesObject.groupId = allImagesNodeFacesFacesItem["GroupId"].asString();
-			if(!allImagesNodeFacesFacesItem["FaceQuality"].isNull())
-				facesObject.faceQuality = std::stof(allImagesNodeFacesFacesItem["FaceQuality"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Age"].isNull())
+				facesObject.age = std::stoi(valueImagesImagesItemFacesFacesItem["Age"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["GenderConfidence"].isNull())
+				facesObject.genderConfidence = std::stof(valueImagesImagesItemFacesFacesItem["GenderConfidence"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Attractive"].isNull())
+				facesObject.attractive = std::stof(valueImagesImagesItemFacesFacesItem["Attractive"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Gender"].isNull())
+				facesObject.gender = valueImagesImagesItemFacesFacesItem["Gender"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["FaceConfidence"].isNull())
+				facesObject.faceConfidence = std::stof(valueImagesImagesItemFacesFacesItem["FaceConfidence"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["Emotion"].isNull())
+				facesObject.emotion = valueImagesImagesItemFacesFacesItem["Emotion"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["FaceId"].isNull())
+				facesObject.faceId = valueImagesImagesItemFacesFacesItem["FaceId"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["EmotionConfidence"].isNull())
+				facesObject.emotionConfidence = std::stof(valueImagesImagesItemFacesFacesItem["EmotionConfidence"].asString());
+			if(!valueImagesImagesItemFacesFacesItem["GroupId"].isNull())
+				facesObject.groupId = valueImagesImagesItemFacesFacesItem["GroupId"].asString();
+			if(!valueImagesImagesItemFacesFacesItem["FaceQuality"].isNull())
+				facesObject.faceQuality = std::stof(valueImagesImagesItemFacesFacesItem["FaceQuality"].asString());
 			auto emotionDetailsNode = value["EmotionDetails"];
 			if(!emotionDetailsNode["SAD"].isNull())
 				facesObject.emotionDetails.sAD = std::stof(emotionDetailsNode["SAD"].asString());
@@ -220,28 +220,28 @@ void ListImagesResult::parse(const std::string &payload)
 				facesObject.faceAttributes.headPose.yaw = std::stof(headPoseNode["Yaw"].asString());
 			imagesObject.faces.push_back(facesObject);
 		}
-		auto allTagsNode = allImagesNode["Tags"]["TagsItem"];
-		for (auto allImagesNodeTagsTagsItem : allTagsNode)
+		auto allTagsNode = valueImagesImagesItem["Tags"]["TagsItem"];
+		for (auto valueImagesImagesItemTagsTagsItem : allTagsNode)
 		{
 			ImagesItem::TagsItem tagsObject;
-			if(!allImagesNodeTagsTagsItem["TagConfidence"].isNull())
-				tagsObject.tagConfidence = std::stof(allImagesNodeTagsTagsItem["TagConfidence"].asString());
-			if(!allImagesNodeTagsTagsItem["TagLevel"].isNull())
-				tagsObject.tagLevel = std::stoi(allImagesNodeTagsTagsItem["TagLevel"].asString());
-			if(!allImagesNodeTagsTagsItem["TagName"].isNull())
-				tagsObject.tagName = allImagesNodeTagsTagsItem["TagName"].asString();
-			if(!allImagesNodeTagsTagsItem["ParentTagName"].isNull())
-				tagsObject.parentTagName = allImagesNodeTagsTagsItem["ParentTagName"].asString();
+			if(!valueImagesImagesItemTagsTagsItem["TagConfidence"].isNull())
+				tagsObject.tagConfidence = std::stof(valueImagesImagesItemTagsTagsItem["TagConfidence"].asString());
+			if(!valueImagesImagesItemTagsTagsItem["TagLevel"].isNull())
+				tagsObject.tagLevel = std::stoi(valueImagesImagesItemTagsTagsItem["TagLevel"].asString());
+			if(!valueImagesImagesItemTagsTagsItem["TagName"].isNull())
+				tagsObject.tagName = valueImagesImagesItemTagsTagsItem["TagName"].asString();
+			if(!valueImagesImagesItemTagsTagsItem["ParentTagName"].isNull())
+				tagsObject.parentTagName = valueImagesImagesItemTagsTagsItem["ParentTagName"].asString();
 			imagesObject.tags.push_back(tagsObject);
 		}
-		auto allOCRNode = allImagesNode["OCR"]["OCRItem"];
-		for (auto allImagesNodeOCROCRItem : allOCRNode)
+		auto allOCRNode = valueImagesImagesItem["OCR"]["OCRItem"];
+		for (auto valueImagesImagesItemOCROCRItem : allOCRNode)
 		{
 			ImagesItem::OCRItem oCRObject;
-			if(!allImagesNodeOCROCRItem["OCRContents"].isNull())
-				oCRObject.oCRContents = allImagesNodeOCROCRItem["OCRContents"].asString();
-			if(!allImagesNodeOCROCRItem["OCRConfidence"].isNull())
-				oCRObject.oCRConfidence = std::stof(allImagesNodeOCROCRItem["OCRConfidence"].asString());
+			if(!valueImagesImagesItemOCROCRItem["OCRContents"].isNull())
+				oCRObject.oCRContents = valueImagesImagesItemOCROCRItem["OCRContents"].asString();
+			if(!valueImagesImagesItemOCROCRItem["OCRConfidence"].isNull())
+				oCRObject.oCRConfidence = std::stof(valueImagesImagesItemOCROCRItem["OCRConfidence"].asString());
 			auto oCRBoundaryNode = value["OCRBoundary"];
 			if(!oCRBoundaryNode["Left"].isNull())
 				oCRObject.oCRBoundary.left = std::stoi(oCRBoundaryNode["Left"].asString());
@@ -253,18 +253,18 @@ void ListImagesResult::parse(const std::string &payload)
 				oCRObject.oCRBoundary.height = std::stoi(oCRBoundaryNode["Height"].asString());
 			imagesObject.oCR.push_back(oCRObject);
 		}
-		auto allCelebrityNode = allImagesNode["Celebrity"]["CelebrityItem"];
-		for (auto allImagesNodeCelebrityCelebrityItem : allCelebrityNode)
+		auto allCelebrityNode = valueImagesImagesItem["Celebrity"]["CelebrityItem"];
+		for (auto valueImagesImagesItemCelebrityCelebrityItem : allCelebrityNode)
 		{
 			ImagesItem::CelebrityItem celebrityObject;
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = allImagesNodeCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityGender"].isNull())
-				celebrityObject.celebrityGender = allImagesNodeCelebrityCelebrityItem["CelebrityGender"].asString();
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-				celebrityObject.celebrityConfidence = std::stof(allImagesNodeCelebrityCelebrityItem["CelebrityConfidence"].asString());
-			if(!allImagesNodeCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = allImagesNodeCelebrityCelebrityItem["CelebrityLibraryName"].asString();
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].isNull())
+				celebrityObject.celebrityName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityName"].asString();
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].isNull())
+				celebrityObject.celebrityGender = valueImagesImagesItemCelebrityCelebrityItem["CelebrityGender"].asString();
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].isNull())
+				celebrityObject.celebrityConfidence = std::stof(valueImagesImagesItemCelebrityCelebrityItem["CelebrityConfidence"].asString());
+			if(!valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
+				celebrityObject.celebrityLibraryName = valueImagesImagesItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
 			auto celebrityBoundaryNode = value["CelebrityBoundary"];
 			if(!celebrityBoundaryNode["Left"].isNull())
 				celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());

+ 22 - 22
imm/src/model/ListVideoAudiosResult.cc

@@ -85,30 +85,30 @@ void ListVideoAudiosResult::parse(const std::string &payload)
 			audiosObject.remarksD = valueAudiosAudiosItem["RemarksD"].asString();
 		if(!valueAudiosAudiosItem["ExternalId"].isNull())
 			audiosObject.externalId = valueAudiosAudiosItem["ExternalId"].asString();
-		auto allAudioTextsNode = allAudiosNode["AudioTexts"]["AudioTextsItem"];
-		for (auto allAudiosNodeAudioTextsAudioTextsItem : allAudioTextsNode)
+		auto allAudioTextsNode = valueAudiosAudiosItem["AudioTexts"]["AudioTextsItem"];
+		for (auto valueAudiosAudiosItemAudioTextsAudioTextsItem : allAudioTextsNode)
 		{
 			AudiosItem::AudioTextsItem audioTextsObject;
-			if(!allAudiosNodeAudioTextsAudioTextsItem["Text"].isNull())
-				audioTextsObject.text = allAudiosNodeAudioTextsAudioTextsItem["Text"].asString();
-			if(!allAudiosNodeAudioTextsAudioTextsItem["BeginTime"].isNull())
-				audioTextsObject.beginTime = std::stof(allAudiosNodeAudioTextsAudioTextsItem["BeginTime"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["EndTime"].isNull())
-				audioTextsObject.endTime = std::stof(allAudiosNodeAudioTextsAudioTextsItem["EndTime"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["SilenceDuration"].isNull())
-				audioTextsObject.silenceDuration = std::stof(allAudiosNodeAudioTextsAudioTextsItem["SilenceDuration"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["EmotionValue"].isNull())
-				audioTextsObject.emotionValue = std::stof(allAudiosNodeAudioTextsAudioTextsItem["EmotionValue"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["ChannelId"].isNull())
-				audioTextsObject.channelId = std::stoi(allAudiosNodeAudioTextsAudioTextsItem["ChannelId"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["SpeechRate"].isNull())
-				audioTextsObject.speechRate = std::stoi(allAudiosNodeAudioTextsAudioTextsItem["SpeechRate"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["Confidence"].isNull())
-				audioTextsObject.confidence = std::stof(allAudiosNodeAudioTextsAudioTextsItem["Confidence"].asString());
-			if(!allAudiosNodeAudioTextsAudioTextsItem["Person"].isNull())
-				audioTextsObject.person = allAudiosNodeAudioTextsAudioTextsItem["Person"].asString();
-			if(!allAudiosNodeAudioTextsAudioTextsItem["Library"].isNull())
-				audioTextsObject.library = allAudiosNodeAudioTextsAudioTextsItem["Library"].asString();
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["Text"].isNull())
+				audioTextsObject.text = valueAudiosAudiosItemAudioTextsAudioTextsItem["Text"].asString();
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["BeginTime"].isNull())
+				audioTextsObject.beginTime = std::stof(valueAudiosAudiosItemAudioTextsAudioTextsItem["BeginTime"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["EndTime"].isNull())
+				audioTextsObject.endTime = std::stof(valueAudiosAudiosItemAudioTextsAudioTextsItem["EndTime"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["SilenceDuration"].isNull())
+				audioTextsObject.silenceDuration = std::stof(valueAudiosAudiosItemAudioTextsAudioTextsItem["SilenceDuration"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["EmotionValue"].isNull())
+				audioTextsObject.emotionValue = std::stof(valueAudiosAudiosItemAudioTextsAudioTextsItem["EmotionValue"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["ChannelId"].isNull())
+				audioTextsObject.channelId = std::stoi(valueAudiosAudiosItemAudioTextsAudioTextsItem["ChannelId"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["SpeechRate"].isNull())
+				audioTextsObject.speechRate = std::stoi(valueAudiosAudiosItemAudioTextsAudioTextsItem["SpeechRate"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["Confidence"].isNull())
+				audioTextsObject.confidence = std::stof(valueAudiosAudiosItemAudioTextsAudioTextsItem["Confidence"].asString());
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["Person"].isNull())
+				audioTextsObject.person = valueAudiosAudiosItemAudioTextsAudioTextsItem["Person"].asString();
+			if(!valueAudiosAudiosItemAudioTextsAudioTextsItem["Library"].isNull())
+				audioTextsObject.library = valueAudiosAudiosItemAudioTextsAudioTextsItem["Library"].asString();
 			audiosObject.audioTexts.push_back(audioTextsObject);
 		}
 		audios_.push_back(audiosObject);

+ 48 - 48
imm/src/model/ListVideoFramesResult.cc

@@ -105,30 +105,30 @@ void ListVideoFramesResult::parse(const std::string &payload)
 			framesObject.remarksD = valueFramesFramesItem["RemarksD"].asString();
 		if(!valueFramesFramesItem["ExternalId"].isNull())
 			framesObject.externalId = valueFramesFramesItem["ExternalId"].asString();
-		auto allFacesNode = allFramesNode["Faces"]["FacesItem"];
-		for (auto allFramesNodeFacesFacesItem : allFacesNode)
+		auto allFacesNode = valueFramesFramesItem["Faces"]["FacesItem"];
+		for (auto valueFramesFramesItemFacesFacesItem : allFacesNode)
 		{
 			FramesItem::FacesItem facesObject;
-			if(!allFramesNodeFacesFacesItem["Age"].isNull())
-				facesObject.age = std::stoi(allFramesNodeFacesFacesItem["Age"].asString());
-			if(!allFramesNodeFacesFacesItem["GenderConfidence"].isNull())
-				facesObject.genderConfidence = std::stof(allFramesNodeFacesFacesItem["GenderConfidence"].asString());
-			if(!allFramesNodeFacesFacesItem["Attractive"].isNull())
-				facesObject.attractive = std::stof(allFramesNodeFacesFacesItem["Attractive"].asString());
-			if(!allFramesNodeFacesFacesItem["Gender"].isNull())
-				facesObject.gender = allFramesNodeFacesFacesItem["Gender"].asString();
-			if(!allFramesNodeFacesFacesItem["FaceConfidence"].isNull())
-				facesObject.faceConfidence = std::stof(allFramesNodeFacesFacesItem["FaceConfidence"].asString());
-			if(!allFramesNodeFacesFacesItem["Emotion"].isNull())
-				facesObject.emotion = allFramesNodeFacesFacesItem["Emotion"].asString();
-			if(!allFramesNodeFacesFacesItem["FaceId"].isNull())
-				facesObject.faceId = allFramesNodeFacesFacesItem["FaceId"].asString();
-			if(!allFramesNodeFacesFacesItem["EmotionConfidence"].isNull())
-				facesObject.emotionConfidence = std::stof(allFramesNodeFacesFacesItem["EmotionConfidence"].asString());
-			if(!allFramesNodeFacesFacesItem["GroupId"].isNull())
-				facesObject.groupId = allFramesNodeFacesFacesItem["GroupId"].asString();
-			if(!allFramesNodeFacesFacesItem["FaceQuality"].isNull())
-				facesObject.faceQuality = std::stof(allFramesNodeFacesFacesItem["FaceQuality"].asString());
+			if(!valueFramesFramesItemFacesFacesItem["Age"].isNull())
+				facesObject.age = std::stoi(valueFramesFramesItemFacesFacesItem["Age"].asString());
+			if(!valueFramesFramesItemFacesFacesItem["GenderConfidence"].isNull())
+				facesObject.genderConfidence = std::stof(valueFramesFramesItemFacesFacesItem["GenderConfidence"].asString());
+			if(!valueFramesFramesItemFacesFacesItem["Attractive"].isNull())
+				facesObject.attractive = std::stof(valueFramesFramesItemFacesFacesItem["Attractive"].asString());
+			if(!valueFramesFramesItemFacesFacesItem["Gender"].isNull())
+				facesObject.gender = valueFramesFramesItemFacesFacesItem["Gender"].asString();
+			if(!valueFramesFramesItemFacesFacesItem["FaceConfidence"].isNull())
+				facesObject.faceConfidence = std::stof(valueFramesFramesItemFacesFacesItem["FaceConfidence"].asString());
+			if(!valueFramesFramesItemFacesFacesItem["Emotion"].isNull())
+				facesObject.emotion = valueFramesFramesItemFacesFacesItem["Emotion"].asString();
+			if(!valueFramesFramesItemFacesFacesItem["FaceId"].isNull())
+				facesObject.faceId = valueFramesFramesItemFacesFacesItem["FaceId"].asString();
+			if(!valueFramesFramesItemFacesFacesItem["EmotionConfidence"].isNull())
+				facesObject.emotionConfidence = std::stof(valueFramesFramesItemFacesFacesItem["EmotionConfidence"].asString());
+			if(!valueFramesFramesItemFacesFacesItem["GroupId"].isNull())
+				facesObject.groupId = valueFramesFramesItemFacesFacesItem["GroupId"].asString();
+			if(!valueFramesFramesItemFacesFacesItem["FaceQuality"].isNull())
+				facesObject.faceQuality = std::stof(valueFramesFramesItemFacesFacesItem["FaceQuality"].asString());
 			auto emotionDetailsNode = value["EmotionDetails"];
 			if(!emotionDetailsNode["SAD"].isNull())
 				facesObject.emotionDetails.sAD = std::stof(emotionDetailsNode["SAD"].asString());
@@ -179,28 +179,28 @@ void ListVideoFramesResult::parse(const std::string &payload)
 				facesObject.faceAttributes.headPose.yaw = std::stof(headPoseNode["Yaw"].asString());
 			framesObject.faces.push_back(facesObject);
 		}
-		auto allTagsNode = allFramesNode["Tags"]["TagsItem"];
-		for (auto allFramesNodeTagsTagsItem : allTagsNode)
+		auto allTagsNode = valueFramesFramesItem["Tags"]["TagsItem"];
+		for (auto valueFramesFramesItemTagsTagsItem : allTagsNode)
 		{
 			FramesItem::TagsItem tagsObject;
-			if(!allFramesNodeTagsTagsItem["TagConfidence"].isNull())
-				tagsObject.tagConfidence = std::stof(allFramesNodeTagsTagsItem["TagConfidence"].asString());
-			if(!allFramesNodeTagsTagsItem["TagLevel"].isNull())
-				tagsObject.tagLevel = std::stoi(allFramesNodeTagsTagsItem["TagLevel"].asString());
-			if(!allFramesNodeTagsTagsItem["TagName"].isNull())
-				tagsObject.tagName = allFramesNodeTagsTagsItem["TagName"].asString();
-			if(!allFramesNodeTagsTagsItem["ParentTagName"].isNull())
-				tagsObject.parentTagName = allFramesNodeTagsTagsItem["ParentTagName"].asString();
+			if(!valueFramesFramesItemTagsTagsItem["TagConfidence"].isNull())
+				tagsObject.tagConfidence = std::stof(valueFramesFramesItemTagsTagsItem["TagConfidence"].asString());
+			if(!valueFramesFramesItemTagsTagsItem["TagLevel"].isNull())
+				tagsObject.tagLevel = std::stoi(valueFramesFramesItemTagsTagsItem["TagLevel"].asString());
+			if(!valueFramesFramesItemTagsTagsItem["TagName"].isNull())
+				tagsObject.tagName = valueFramesFramesItemTagsTagsItem["TagName"].asString();
+			if(!valueFramesFramesItemTagsTagsItem["ParentTagName"].isNull())
+				tagsObject.parentTagName = valueFramesFramesItemTagsTagsItem["ParentTagName"].asString();
 			framesObject.tags.push_back(tagsObject);
 		}
-		auto allOCRNode = allFramesNode["OCR"]["OCRItem"];
-		for (auto allFramesNodeOCROCRItem : allOCRNode)
+		auto allOCRNode = valueFramesFramesItem["OCR"]["OCRItem"];
+		for (auto valueFramesFramesItemOCROCRItem : allOCRNode)
 		{
 			FramesItem::OCRItem oCRObject;
-			if(!allFramesNodeOCROCRItem["OCRContents"].isNull())
-				oCRObject.oCRContents = allFramesNodeOCROCRItem["OCRContents"].asString();
-			if(!allFramesNodeOCROCRItem["OCRConfidence"].isNull())
-				oCRObject.oCRConfidence = std::stof(allFramesNodeOCROCRItem["OCRConfidence"].asString());
+			if(!valueFramesFramesItemOCROCRItem["OCRContents"].isNull())
+				oCRObject.oCRContents = valueFramesFramesItemOCROCRItem["OCRContents"].asString();
+			if(!valueFramesFramesItemOCROCRItem["OCRConfidence"].isNull())
+				oCRObject.oCRConfidence = std::stof(valueFramesFramesItemOCROCRItem["OCRConfidence"].asString());
 			auto oCRBoundaryNode = value["OCRBoundary"];
 			if(!oCRBoundaryNode["Left"].isNull())
 				oCRObject.oCRBoundary.left = std::stoi(oCRBoundaryNode["Left"].asString());
@@ -212,18 +212,18 @@ void ListVideoFramesResult::parse(const std::string &payload)
 				oCRObject.oCRBoundary.height = std::stoi(oCRBoundaryNode["Height"].asString());
 			framesObject.oCR.push_back(oCRObject);
 		}
-		auto allCelebrityNode = allFramesNode["Celebrity"]["CelebrityItem"];
-		for (auto allFramesNodeCelebrityCelebrityItem : allCelebrityNode)
+		auto allCelebrityNode = valueFramesFramesItem["Celebrity"]["CelebrityItem"];
+		for (auto valueFramesFramesItemCelebrityCelebrityItem : allCelebrityNode)
 		{
 			FramesItem::CelebrityItem celebrityObject;
-			if(!allFramesNodeCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = allFramesNodeCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!allFramesNodeCelebrityCelebrityItem["CelebrityGender"].isNull())
-				celebrityObject.celebrityGender = allFramesNodeCelebrityCelebrityItem["CelebrityGender"].asString();
-			if(!allFramesNodeCelebrityCelebrityItem["CelebrityConfidence"].isNull())
-				celebrityObject.celebrityConfidence = std::stof(allFramesNodeCelebrityCelebrityItem["CelebrityConfidence"].asString());
-			if(!allFramesNodeCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = allFramesNodeCelebrityCelebrityItem["CelebrityLibraryName"].asString();
+			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityName"].isNull())
+				celebrityObject.celebrityName = valueFramesFramesItemCelebrityCelebrityItem["CelebrityName"].asString();
+			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityGender"].isNull())
+				celebrityObject.celebrityGender = valueFramesFramesItemCelebrityCelebrityItem["CelebrityGender"].asString();
+			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityConfidence"].isNull())
+				celebrityObject.celebrityConfidence = std::stof(valueFramesFramesItemCelebrityCelebrityItem["CelebrityConfidence"].asString());
+			if(!valueFramesFramesItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
+				celebrityObject.celebrityLibraryName = valueFramesFramesItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
 			auto celebrityBoundaryNode = value["CelebrityBoundary"];
 			if(!celebrityBoundaryNode["Left"].isNull())
 				celebrityObject.celebrityBoundary.left = std::stoi(celebrityBoundaryNode["Left"].asString());

+ 30 - 30
imm/src/model/ListVideosResult.cc

@@ -95,46 +95,46 @@ void ListVideosResult::parse(const std::string &payload)
 			videosObject.remarksD = valueVideosVideosItem["RemarksD"].asString();
 		if(!valueVideosVideosItem["ExternalId"].isNull())
 			videosObject.externalId = valueVideosVideosItem["ExternalId"].asString();
-		auto allVideoTagsNode = allVideosNode["VideoTags"]["VideoTagsItem"];
-		for (auto allVideosNodeVideoTagsVideoTagsItem : allVideoTagsNode)
+		auto allVideoTagsNode = valueVideosVideosItem["VideoTags"]["VideoTagsItem"];
+		for (auto valueVideosVideosItemVideoTagsVideoTagsItem : allVideoTagsNode)
 		{
 			VideosItem::VideoTagsItem videoTagsObject;
-			if(!allVideosNodeVideoTagsVideoTagsItem["TagName"].isNull())
-				videoTagsObject.tagName = allVideosNodeVideoTagsVideoTagsItem["TagName"].asString();
-			if(!allVideosNodeVideoTagsVideoTagsItem["ParentTagName"].isNull())
-				videoTagsObject.parentTagName = allVideosNodeVideoTagsVideoTagsItem["ParentTagName"].asString();
-			if(!allVideosNodeVideoTagsVideoTagsItem["TagConfidence"].isNull())
-				videoTagsObject.tagConfidence = std::stof(allVideosNodeVideoTagsVideoTagsItem["TagConfidence"].asString());
-			if(!allVideosNodeVideoTagsVideoTagsItem["TagLevel"].isNull())
-				videoTagsObject.tagLevel = std::stoi(allVideosNodeVideoTagsVideoTagsItem["TagLevel"].asString());
+			if(!valueVideosVideosItemVideoTagsVideoTagsItem["TagName"].isNull())
+				videoTagsObject.tagName = valueVideosVideosItemVideoTagsVideoTagsItem["TagName"].asString();
+			if(!valueVideosVideosItemVideoTagsVideoTagsItem["ParentTagName"].isNull())
+				videoTagsObject.parentTagName = valueVideosVideosItemVideoTagsVideoTagsItem["ParentTagName"].asString();
+			if(!valueVideosVideosItemVideoTagsVideoTagsItem["TagConfidence"].isNull())
+				videoTagsObject.tagConfidence = std::stof(valueVideosVideosItemVideoTagsVideoTagsItem["TagConfidence"].asString());
+			if(!valueVideosVideosItemVideoTagsVideoTagsItem["TagLevel"].isNull())
+				videoTagsObject.tagLevel = std::stoi(valueVideosVideosItemVideoTagsVideoTagsItem["TagLevel"].asString());
 			videosObject.videoTags.push_back(videoTagsObject);
 		}
-		auto allCelebrityNode = allVideosNode["Celebrity"]["CelebrityItem"];
-		for (auto allVideosNodeCelebrityCelebrityItem : allCelebrityNode)
+		auto allCelebrityNode = valueVideosVideosItem["Celebrity"]["CelebrityItem"];
+		for (auto valueVideosVideosItemCelebrityCelebrityItem : allCelebrityNode)
 		{
 			VideosItem::CelebrityItem celebrityObject;
-			if(!allVideosNodeCelebrityCelebrityItem["CelebrityName"].isNull())
-				celebrityObject.celebrityName = allVideosNodeCelebrityCelebrityItem["CelebrityName"].asString();
-			if(!allVideosNodeCelebrityCelebrityItem["CelebrityNum"].isNull())
-				celebrityObject.celebrityNum = std::stoi(allVideosNodeCelebrityCelebrityItem["CelebrityNum"].asString());
-			if(!allVideosNodeCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
-				celebrityObject.celebrityLibraryName = allVideosNodeCelebrityCelebrityItem["CelebrityLibraryName"].asString();
+			if(!valueVideosVideosItemCelebrityCelebrityItem["CelebrityName"].isNull())
+				celebrityObject.celebrityName = valueVideosVideosItemCelebrityCelebrityItem["CelebrityName"].asString();
+			if(!valueVideosVideosItemCelebrityCelebrityItem["CelebrityNum"].isNull())
+				celebrityObject.celebrityNum = std::stoi(valueVideosVideosItemCelebrityCelebrityItem["CelebrityNum"].asString());
+			if(!valueVideosVideosItemCelebrityCelebrityItem["CelebrityLibraryName"].isNull())
+				celebrityObject.celebrityLibraryName = valueVideosVideosItemCelebrityCelebrityItem["CelebrityLibraryName"].asString();
 			videosObject.celebrity.push_back(celebrityObject);
 		}
-		auto allPersonsNode = allVideosNode["Persons"]["PersonsItem"];
-		for (auto allVideosNodePersonsPersonsItem : allPersonsNode)
+		auto allPersonsNode = valueVideosVideosItem["Persons"]["PersonsItem"];
+		for (auto valueVideosVideosItemPersonsPersonsItem : allPersonsNode)
 		{
 			VideosItem::PersonsItem personsObject;
-			if(!allVideosNodePersonsPersonsItem["PersonId"].isNull())
-				personsObject.personId = allVideosNodePersonsPersonsItem["PersonId"].asString();
-			if(!allVideosNodePersonsPersonsItem["Age"].isNull())
-				personsObject.age = std::stoi(allVideosNodePersonsPersonsItem["Age"].asString());
-			if(!allVideosNodePersonsPersonsItem["AgeConfidence"].isNull())
-				personsObject.ageConfidence = std::stof(allVideosNodePersonsPersonsItem["AgeConfidence"].asString());
-			if(!allVideosNodePersonsPersonsItem["Gender"].isNull())
-				personsObject.gender = allVideosNodePersonsPersonsItem["Gender"].asString();
-			if(!allVideosNodePersonsPersonsItem["GenderConfidence"].isNull())
-				personsObject.genderConfidence = std::stof(allVideosNodePersonsPersonsItem["GenderConfidence"].asString());
+			if(!valueVideosVideosItemPersonsPersonsItem["PersonId"].isNull())
+				personsObject.personId = valueVideosVideosItemPersonsPersonsItem["PersonId"].asString();
+			if(!valueVideosVideosItemPersonsPersonsItem["Age"].isNull())
+				personsObject.age = std::stoi(valueVideosVideosItemPersonsPersonsItem["Age"].asString());
+			if(!valueVideosVideosItemPersonsPersonsItem["AgeConfidence"].isNull())
+				personsObject.ageConfidence = std::stof(valueVideosVideosItemPersonsPersonsItem["AgeConfidence"].asString());
+			if(!valueVideosVideosItemPersonsPersonsItem["Gender"].isNull())
+				personsObject.gender = valueVideosVideosItemPersonsPersonsItem["Gender"].asString();
+			if(!valueVideosVideosItemPersonsPersonsItem["GenderConfidence"].isNull())
+				personsObject.genderConfidence = std::stof(valueVideosVideosItemPersonsPersonsItem["GenderConfidence"].asString());
 			videosObject.persons.push_back(personsObject);
 		}
 		videos_.push_back(videosObject);