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

Internal change

Browse Source 
PiperOrigin-RevId: 520861522
This commit is contained in:
MediaPipe Team 2023-03-31 01:37:17 -07:00 committed by Copybara-Service
parent 6a6786673e
commit 5fe4e1ad0e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediapipe/tasks/cc/vision/image_classifier/image_classifier.cc
View File

@ -167,7 +167,7 @@ absl::StatusOr<ImageClassifierResult> ImageClassifier::Classify(
} }
absl::StatusOr<ImageClassifierResult> ImageClassifier::ClassifyForVideo( absl::StatusOr<ImageClassifierResult> ImageClassifier::ClassifyForVideo(
Image image, int64 timestamp_ms, Image image, int64_t timestamp_ms,
std::optional<core::ImageProcessingOptions> image_processing_options) { std::optional<core::ImageProcessingOptions> image_processing_options) {
if (image.UsesGpu()) { if (image.UsesGpu()) {
return CreateStatusWithPayload( return CreateStatusWithPayload(
@ -191,7 +191,7 @@ absl::StatusOr<ImageClassifierResult> ImageClassifier::ClassifyForVideo(
} }
absl::Status ImageClassifier::ClassifyAsync( absl::Status ImageClassifier::ClassifyAsync(
Image image, int64 timestamp_ms, Image image, int64_t timestamp_ms,
std::optional<core::ImageProcessingOptions> image_processing_options) { std::optional<core::ImageProcessingOptions> image_processing_options) {
if (image.UsesGpu()) { if (image.UsesGpu()) {
return CreateStatusWithPayload( return CreateStatusWithPayload(

16
mediapipe/tasks/cc/vision/image_classifier/image_classifier_test.cc
View File

@ -233,7 +233,7 @@ TEST_F(CreateTest, FailsWithIllegalCallbackInImageOrVideoMode) {
JoinPath("./", kTestDataDirectory, kMobileNetQuantizedWithMetadata); JoinPath("./", kTestDataDirectory, kMobileNetQuantizedWithMetadata);
options->running_mode = running_mode; options->running_mode = running_mode;
options->result_callback = [](absl::StatusOr<ImageClassifierResult>, options->result_callback = [](absl::StatusOr<ImageClassifierResult>,
const Image& image, int64 timestamp_ms) {}; const Image& image, int64_t timestamp_ms) {};
auto image_classifier = ImageClassifier::Create(std::move(options)); auto image_classifier = ImageClassifier::Create(std::move(options));
@ -718,7 +718,7 @@ TEST_F(LiveStreamModeTest, FailsWithCallingWrongMethod) {
JoinPath("./", kTestDataDirectory, kMobileNetFloatWithMetadata); JoinPath("./", kTestDataDirectory, kMobileNetFloatWithMetadata);
options->running_mode = core::RunningMode::LIVE_STREAM; options->running_mode = core::RunningMode::LIVE_STREAM;
options->result_callback = [](absl::StatusOr<ImageClassifierResult>, options->result_callback = [](absl::StatusOr<ImageClassifierResult>,
const Image& image, int64 timestamp_ms) {}; const Image& image, int64_t timestamp_ms) {};
MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr<ImageClassifier> image_classifier, MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr<ImageClassifier> image_classifier,
ImageClassifier::Create(std::move(options))); ImageClassifier::Create(std::move(options)));
@ -749,7 +749,7 @@ TEST_F(LiveStreamModeTest, FailsWithOutOfOrderInputTimestamps) {
JoinPath("./", kTestDataDirectory, kMobileNetFloatWithMetadata); JoinPath("./", kTestDataDirectory, kMobileNetFloatWithMetadata);
options->running_mode = core::RunningMode::LIVE_STREAM; options->running_mode = core::RunningMode::LIVE_STREAM;
options->result_callback = [](absl::StatusOr<ImageClassifierResult>, options->result_callback = [](absl::StatusOr<ImageClassifierResult>,
const Image& image, int64 timestamp_ms) {}; const Image& image, int64_t timestamp_ms) {};
MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr<ImageClassifier> image_classifier, MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr<ImageClassifier> image_classifier,
ImageClassifier::Create(std::move(options))); ImageClassifier::Create(std::move(options)));
@ -768,7 +768,7 @@ TEST_F(LiveStreamModeTest, FailsWithOutOfOrderInputTimestamps) {
struct LiveStreamModeResults { struct LiveStreamModeResults {
ImageClassifierResult classification_result; ImageClassifierResult classification_result;
std::pair<int, int> image_size; std::pair<int, int> image_size;
int64 timestamp_ms; int64_t timestamp_ms;
}; };
TEST_F(LiveStreamModeTest, Succeeds) { TEST_F(LiveStreamModeTest, Succeeds) {
@ -784,7 +784,7 @@ TEST_F(LiveStreamModeTest, Succeeds) {
options->classifier_options.max_results = 3; options->classifier_options.max_results = 3;
options->result_callback = options->result_callback =
[&results](absl::StatusOr<ImageClassifierResult> classification_result, [&results](absl::StatusOr<ImageClassifierResult> classification_result,
const Image& image, int64 timestamp_ms) { const Image& image, int64_t timestamp_ms) {
MP_ASSERT_OK(classification_result.status()); MP_ASSERT_OK(classification_result.status());
results.push_back( results.push_back(
{.classification_result = std::move(classification_result).value(), {.classification_result = std::move(classification_result).value(),
@ -803,7 +803,7 @@ TEST_F(LiveStreamModeTest, Succeeds) {
// number of iterations. // number of iterations.
ASSERT_LE(results.size(), iterations); ASSERT_LE(results.size(), iterations);
ASSERT_GT(results.size(), 0); ASSERT_GT(results.size(), 0);
int64 timestamp_ms = -1; int64_t timestamp_ms = -1;
for (const auto& result : results) { for (const auto& result : results) {
EXPECT_GT(result.timestamp_ms, timestamp_ms); EXPECT_GT(result.timestamp_ms, timestamp_ms);
timestamp_ms = result.timestamp_ms; timestamp_ms = result.timestamp_ms;
@ -827,7 +827,7 @@ TEST_F(LiveStreamModeTest, SucceedsWithRegionOfInterest) {
options->classifier_options.max_results = 1; options->classifier_options.max_results = 1;
options->result_callback = options->result_callback =
[&results](absl::StatusOr<ImageClassifierResult> classification_result, [&results](absl::StatusOr<ImageClassifierResult> classification_result,
const Image& image, int64 timestamp_ms) { const Image& image, int64_t timestamp_ms) {
MP_ASSERT_OK(classification_result.status()); MP_ASSERT_OK(classification_result.status());
results.push_back( results.push_back(
{.classification_result = std::move(classification_result).value(), {.classification_result = std::move(classification_result).value(),
@ -850,7 +850,7 @@ TEST_F(LiveStreamModeTest, SucceedsWithRegionOfInterest) {
// number of iterations. // number of iterations.
ASSERT_LE(results.size(), iterations); ASSERT_LE(results.size(), iterations);
ASSERT_GT(results.size(), 0); ASSERT_GT(results.size(), 0);
int64 timestamp_ms = -1; int64_t timestamp_ms = -1;
for (const auto& result : results) { for (const auto& result : results) {
EXPECT_GT(result.timestamp_ms, timestamp_ms); EXPECT_GT(result.timestamp_ms, timestamp_ms);
timestamp_ms = result.timestamp_ms; timestamp_ms = result.timestamp_ms;