Skip to content

Fix for Issue #240 #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 1, 2024
Merged

Fix for Issue #240 #247

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e67e678
issue 240 fix
rv355 Oct 28, 2024
8d895fa
Merge branch 'develop' into rv355_udfbug
rv355 Oct 28, 2024
2718549
Automated updates: Format and/or coverage
sys-vdms Oct 28, 2024
e9b6bac
Merge branch 'develop' into rv355_udfbug
cwlacewe Oct 31, 2024
233faa1
Merge branch 'develop' into rv355_udfbug
cwlacewe Oct 31, 2024
dcb97c9
Automated updates: Format and/or coverage
sys-vdms Oct 31, 2024
36c771b
Automated updates: Format and/or coverage
sys-vdms Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/coverage/cpp.develop.coverage_report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ src/vcl/TDBImage.cc 471 371 78% 164,186,209,25
src/vcl/TDBObject.cc 326 271 83% 112-114,116,118,120,219,221-222,258,321-322,386-388,398,432-433,462-463,493-494,496,500-501,503,621-632,638-651,661-663
src/vcl/TDBSparseDescriptorSet.cc 245 230 93% 163,190-191,230-232,252,294-296,308-309,380-381,441
src/vcl/utils.cc 71 63 88% 54-55,65,71,79,91,93,121
src/vcl/Video.cc 743 531 71% 66,127,133,138,160,166-167,189,191-195,198-201,218-223,231,233-239,241-245,248-250,254-255,260-261,263-264,266,268,271-272,274-275,278-279,296,314-327,344,346,348-350,379,412-414,456,465,488,494,517,637,639,650,656,660-661,670,689,692,694-695,698-699,728-729,750-752,755-756,758-759,762-763,782-785,813-815,818,821-823,838-841,849,851,853-858,870-873,907,929,944,967,971,992,994-995,997,999-1001,1004,1006,1008,1010-1013,1015,1017-1021,1026-1027,1030,1033,1035-1036,1039-1042,1045,1051,1053,1079,1087,1104,1119,1123,1130,1134,1151,1154,1163-1164,1166,1171-1173,1176-1177,1180-1181,1186,1204-1207,1260,1264,1266-1267,1269-1270,1272,1274,1277-1278,1281-1282,1288-1292
src/vcl/Video.cc 746 565 75% 66,127,133,138,160,166-167,189,191-195,198-201,218-223,231,233-239,241-245,248-250,254-255,260-261,263-264,266,268,271-272,274-275,278-279,296,314-327,344,346,348-350,379,412-414,456,465,488,494,517,637,639,650,656,660-661,670,689,692,694-695,698-699,728-729,750-752,755-756,758-759,762-763,782-785,813-815,818,821-823,838-841,849,851,853-858,870-873,907,929,944,967,971,1000-1001,1020-1021,1042,1079,1087,1104,1119,1123,1130,1134,1151,1154,1159-1160,1163-1164,1166,1177,1181,1186,1204-1207,1260,1264,1266-1267,1269-1270,1272,1274,1277-1278,1281-1282,1288-1292
src/vdms.cc 108 0 0% 39,41-42,44-47,49-50,52-55,57-58,61-63,65-66,68,70,73-75,78,82,84-87,89,91-97,99-102,104-105,107-110,112-114,116-119,121-122,124-127,129-130,132-135,137-138,140-141,145-147,150-153,156,158-160,163,165,168,171-177,183,185,188-189,193,196,202-203,206,212-215,218,220
src/VDMSConfig.cc 181 168 92% 119-121,196,198,201-202,208-209,213-214,325-326
src/VideoCommand.cc 474 117 24% 50,53-54,56-58,60,62,65-66,68-69,72,74-76,78-80,82,84-87,89-90,92-93,95,97-99,102,109,111,116,121-124,130,132,158-161,167-168,170,181,184,201,213,217-220,227-229,231-233,239,241-247,249-250,253-255,257-259,261-262,264,266-278,280-282,284-285,296,300,325,329,331,333,335,337,340-341,343,346,350,352,357-358,380-381,383-384,387-392,394,396,398-399,405,407,429-431,436,442-445,449-454,456-463,467-473,475,480-485,488,490-491,494-496,504,509,527-532,535-539,555,558,560-562,565-567,569-570,572-576,579-580,583-585,587,589-591,594-597,601-606,611-612,614-615,617-621,624-626,628,630-632,634-637,640-641,644,646,651,664,666-673,677,680,683,688-689,691-695,698-699,701,703,705,708,712,714,716-719,721-723,726,728,730,732-733,735-736,740,745,748-749,751-753,755,757,759-761,763-764,767-769,773-776,780-786,790-794,798,801,803,805,807,809-813,817-821,824-825,827-830,833-836,841-842,846-851,855-856,859-860
Expand All @@ -57,5 +57,5 @@ utils/src/comm/Exception.cc 6 0 0% 35-40
utils/src/stats/SystemStats.cc 250 249 99% 453
utils/src/timers/TimerMap.cc 82 75 91% 126,151,153,155-158
------------------------------------------------------------------------------
TOTAL 10238 6537 63%
TOTAL 10241 6571 64%
------------------------------------------------------------------------------
2 changes: 1 addition & 1 deletion .github/coverage/cpp.develop.coverage_value.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
63.8504
64.1637
3 changes: 2 additions & 1 deletion tests/cleandbs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ rm -rf /tmp/trusted_server_key.pem || true
rm -rf /tmp/trusted_client_cert.pem || true
rm -rf /tmp/trusted_client_key.pem || true
rm -rf /tmp/untrusted_client_cert.pem || true
rm -rf /tmp/untrusted_client_key.pem || true
rm -rf /tmp/untrusted_client_key.pem || true
rm -rf /tmp/rpathimage.jpg || true
5 changes: 3 additions & 2 deletions tests/unit_tests/Image_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,14 +909,14 @@ TEST_F(ImageTest, ImageLoop) {
imageLoop.set_nrof_entities(1);

imageLoop.enqueue(&img);

while (imageLoop.is_loop_running()) {
continue;
}

std::map<std::string, VCL::Image *> imageMap = imageLoop.get_image_map();
std::map<std::string, VCL::Image *>::iterator iter = imageMap.begin();

ASSERT_TRUE(iter->second->get_query_error_response() == "");

while (iter != imageMap.end()) {
std::vector<unsigned char> img_enc =
iter->second->get_encoded_image_async(img.get_image_format());
Expand Down Expand Up @@ -1080,6 +1080,7 @@ TEST_F(ImageTest, RemoteMetadata) {

img.syncremoteOperation(_url, _options);
cv::Mat vcl_img = img.get_cvmat();
ASSERT_TRUE(img.get_ingest_metadata().size() > 0);
for (auto metadata : img.get_ingest_metadata()) {
ASSERT_STREQ(metadata["object"].asString().data(), "face");
}
Expand Down
4 changes: 3 additions & 1 deletion tests/unit_tests/Video_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,7 @@ TEST_F(VideoTest, SyncRemoteWriteWithMetadata) {
_options["id"] = "metadata";
_options["media_type"] = "video";
_options["otype"] = "face";
_options["ingestion"] = 1;

try {

Expand All @@ -1403,6 +1404,7 @@ TEST_F(VideoTest, SyncRemoteWriteWithMetadata) {
VCL::Video video_data(temp_video_input); //
video_data.syncremoteOperation(_url, _options);
video_data.store(syncremote_name_vcl, VCL::Video::Codec::H264);
ASSERT_TRUE(video_data.get_ingest_metadata().size() > 0);
for (auto metadata : video_data.get_ingest_metadata()) {
ASSERT_STREQ(metadata["1"]["bbox"]["object"].asString().data(), "face");
}
Expand Down Expand Up @@ -1439,7 +1441,7 @@ TEST_F(VideoTest, UDFWriteWithMetadata) {
"/video_test_UDFWrite_input.avi");
copy_video_to_temp(_video_path_avi_xvid, temp_video_input, get_fourcc());
std::string temp_video_test(VDMS::VDMSConfig::instance()->get_path_tmp() +
"/video_test_UDFemoteWrite_test.avi");
"/video_test_UDFWrite_test.avi");
copy_video_to_temp(_video_path_avi_xvid, temp_video_test, get_fourcc());

std::string udf_name_vcl("videos_tests/udf_vcl.mp4");
Expand Down