cassdlcm/mediapipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal change

Browse Source 
PiperOrigin-RevId: 516520860
This commit is contained in:
Alan Kelly 2023-03-14 07:38:36 -07:00 committed by Copybara-Service
parent 46ba1d8051
commit bc641a22a8
2 changed files with 79 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mediapipe/tasks/cc/vision/object_detector/object_detector_test.cc
View File

@ -108,31 +108,31 @@ std::vector<DetectionProto>
GenerateMobileSsdNoImageResizingFullExpectedResults() {
return {ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.6328125
score: 0.6210937
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 14 ymin: 197 width: 98 height: 99 }
bounding_box { xmin: 15 ymin: 197 width: 98 height: 99 }
})pb"),
ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.59765625
score: 0.609375
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 151 ymin: 78 width: 104 height: 223 }
bounding_box { xmin: 150 ymin: 78 width: 104 height: 223 }
})pb"),
ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.5
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 65 ymin: 199 width: 41 height: 101 }
bounding_box { xmin: 64 ymin: 199 width: 42 height: 101 }
})pb"),
ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "dog"
score: 0.48828125
score: 0.5
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 12 ymin: 110 width: 153 height: 193 }
bounding_box { xmin: 14 ymin: 110 width: 153 height: 193 }
})pb")};
}
@ -268,7 +268,7 @@ TEST_F(CreateFromOptionsTest, FailsWithIllegalCallbackInImageOrVideoMode) {
options->running_mode = running_mode;
options->result_callback =
[](absl::StatusOr<ObjectDetectorResult> detections, const Image& image,
int64 timestamp_ms) {};
int64_t timestamp_ms) {};
absl::StatusOr<std::unique_ptr<ObjectDetector>> object_detector =
ObjectDetector::Create(std::move(options));
EXPECT_EQ(object_detector.status().code(),
@ -381,28 +381,28 @@ TEST_F(ImageModeTest, Succeeds) {
score: 0.69921875
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 608 ymin: 161 width: 381 height: 439 }
bounding_box { xmin: 608 ymin: 164 width: 381 height: 432 }
})pb"),
ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.64453125
score: 0.65625
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 60 ymin: 398 width: 386 height: 196 }
bounding_box { xmin: 57 ymin: 398 width: 386 height: 196 }
})pb"),
ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.51171875
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 256 ymin: 395 width: 173 height: 202 }
bounding_box { xmin: 256 ymin: 394 width: 173 height: 202 }
})pb"),
ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.48828125
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 362 ymin: 191 width: 325 height: 419 }
bounding_box { xmin: 360 ymin: 195 width: 330 height: 412 }
})pb")}));
}
@ -484,10 +484,10 @@ TEST_F(ImageModeTest, SucceedsWithScoreCalibration) {
results,
ConvertToDetectionResult({ParseTextProtoOrDie<DetectionProto>(R"pb(
label: "cat"
score: 0.6531269142
score: 0.650467276
location_data {
format: BOUNDING_BOX
bounding_box { xmin: 14 ymin: 197 width: 98 height: 99 }
bounding_box { xmin: 15 ymin: 197 width: 98 height: 99 }
})pb")}));
}
@ -507,9 +507,9 @@ TEST_F(ImageModeTest, SucceedsWithScoreThresholdOption) {
GenerateMobileSsdNoImageResizingFullExpectedResults();
ExpectApproximatelyEqual(
results, ConvertToDetectionResult({full_expected_results[0],
full_expected_results[1],
full_expected_results[2]}));
results, ConvertToDetectionResult(
{full_expected_results[0], full_expected_results[1],
full_expected_results[2], full_expected_results[3]}));
}
TEST_F(ImageModeTest, SucceedsWithMaxResultsOption) {
@ -685,7 +685,7 @@ TEST_F(LiveStreamModeTest, FailsWithCallingWrongMethod) {
JoinPath("./", kTestDataDirectory, kMobileSsdWithMetadata);
options->running_mode = core::RunningMode::LIVE_STREAM;
options->result_callback = [](absl::StatusOr<ObjectDetectorResult> detections,
const Image& image, int64 timestamp_ms) {};
const Image& image, int64_t timestamp_ms) {};
MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr<ObjectDetector> object_detector,
ObjectDetector::Create(std::move(options)));
@ -716,7 +716,7 @@ TEST_F(LiveStreamModeTest, FailsWithOutOfOrderInputTimestamps) {
options->base_options.model_asset_path =
JoinPath("./", kTestDataDirectory, kMobileSsdWithMetadata);
options->result_callback = [](absl::StatusOr<ObjectDetectorResult> detections,
const Image& image, int64 timestamp_ms) {};
const Image& image, int64_t timestamp_ms) {};
MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr<ObjectDetector> object_detector,
ObjectDetector::Create(std::move(options)));
MP_ASSERT_OK(object_detector->DetectAsync(image, 1));
@ -742,13 +742,13 @@ TEST_F(LiveStreamModeTest, Succeeds) {
options->running_mode = core::RunningMode::LIVE_STREAM;
std::vector<ObjectDetectorResult> detection_results;
std::vector<std::pair<int, int>> image_sizes;
std::vector<int64> timestamps;
std::vector<int64_t> timestamps;
options->base_options.model_asset_path =
JoinPath("./", kTestDataDirectory, kMobileSsdWithMetadata);
options->result_callback =
[&detection_results, &image_sizes, &timestamps](
absl::StatusOr<ObjectDetectorResult> detections, const Image& image,
int64 timestamp_ms) {
int64_t timestamp_ms) {
MP_ASSERT_OK(detections.status());
detection_results.push_back(std::move(detections).value());
image_sizes.push_back({image.width(), image.height()});
@ -775,7 +775,7 @@ TEST_F(LiveStreamModeTest, Succeeds) {
EXPECT_EQ(image_size.first, image.width());
EXPECT_EQ(image_size.second, image.height());
}
int64 timestamp_ms = -1;
int64_t timestamp_ms = -1;
for (const auto& timestamp : timestamps) {
EXPECT_GT(timestamp, timestamp_ms);
timestamp_ms = timestamp;

42
mediapipe/tasks/python/test/vision/object_detector_test.py
View File

@ -42,48 +42,62 @@ _RUNNING_MODE = running_mode_module.VisionTaskRunningMode
_MODEL_FILE = 'coco_ssd_mobilenet_v1_1.0_quant_2018_06_29.tflite'
_IMAGE_FILE = 'cats_and_dogs.jpg'
_EXPECTED_DETECTION_RESULT = _DetectionResult(detections=[
_EXPECTED_DETECTION_RESULT = _DetectionResult(
detections=[
_Detection(
bounding_box=_BoundingBox(
origin_x=608, origin_y=161, width=381, height=439),
origin_x=608, origin_y=161, width=381, height=439
),
categories=[
_Category(
index=None,
score=0.69921875,
display_name=None,
category_name='cat')
]),
category_name='cat',
)
],
),
_Detection(
bounding_box=_BoundingBox(
origin_x=60, origin_y=398, width=386, height=196),
origin_x=60, origin_y=398, width=386, height=196
),
categories=[
_Category(
index=None,
score=0.64453125,
display_name=None,
category_name='cat')
]),
category_name='cat',
)
],
),
_Detection(
bounding_box=_BoundingBox(
origin_x=256, origin_y=395, width=173, height=202),
origin_x=256, origin_y=395, width=173, height=202
),
categories=[
_Category(
index=None,
score=0.51171875,
display_name=None,
category_name='cat')
]),
category_name='cat',
)
],
),
_Detection(
bounding_box=_BoundingBox(
origin_x=362, origin_y=191, width=325, height=419),
origin_x=362, origin_y=191, width=325, height=419
),
categories=[
_Category(
index=None,
score=0.48828125,
display_name=None,
category_name='cat')
])
])
category_name='cat',
)
],
),
]
)
_ALLOW_LIST = ['cat', 'dog']
_DENY_LIST = ['cat']
_SCORE_THRESHOLD = 0.3