diff --git a/mediapipe/tasks/cc/vision/image_embedder/image_embedder.cc b/mediapipe/tasks/cc/vision/image_embedder/image_embedder.cc index c8e56d36..1425e97c 100644 --- a/mediapipe/tasks/cc/vision/image_embedder/image_embedder.cc +++ b/mediapipe/tasks/cc/vision/image_embedder/image_embedder.cc @@ -163,7 +163,7 @@ absl::StatusOr ImageEmbedder::Embed( } absl::StatusOr ImageEmbedder::EmbedForVideo( - Image image, int64 timestamp_ms, + Image image, int64_t timestamp_ms, std::optional image_processing_options) { if (image.UsesGpu()) { return CreateStatusWithPayload( @@ -187,7 +187,7 @@ absl::StatusOr ImageEmbedder::EmbedForVideo( } absl::Status ImageEmbedder::EmbedAsync( - Image image, int64 timestamp_ms, + Image image, int64_t timestamp_ms, std::optional image_processing_options) { if (image.UsesGpu()) { return CreateStatusWithPayload( diff --git a/mediapipe/tasks/cc/vision/image_embedder/image_embedder_test.cc b/mediapipe/tasks/cc/vision/image_embedder/image_embedder_test.cc index 4024550f..748333f7 100644 --- a/mediapipe/tasks/cc/vision/image_embedder/image_embedder_test.cc +++ b/mediapipe/tasks/cc/vision/image_embedder/image_embedder_test.cc @@ -150,7 +150,7 @@ TEST_F(CreateTest, FailsWithIllegalCallbackInImageOrVideoMode) { JoinPath("./", kTestDataDirectory, kMobileNetV3Embedder); options->running_mode = running_mode; options->result_callback = [](absl::StatusOr, - const Image& image, int64 timestamp_ms) {}; + const Image& image, int64_t timestamp_ms) {}; auto image_embedder = ImageEmbedder::Create(std::move(options)); @@ -505,7 +505,7 @@ TEST_F(LiveStreamModeTest, FailsWithCallingWrongMethod) { JoinPath("./", kTestDataDirectory, kMobileNetV3Embedder); options->running_mode = core::RunningMode::LIVE_STREAM; options->result_callback = [](absl::StatusOr, - const Image& image, int64 timestamp_ms) {}; + const Image& image, int64_t timestamp_ms) {}; MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr image_embedder, ImageEmbedder::Create(std::move(options))); @@ -536,7 +536,7 @@ TEST_F(LiveStreamModeTest, FailsWithOutOfOrderInputTimestamps) { JoinPath("./", kTestDataDirectory, kMobileNetV3Embedder); options->running_mode = core::RunningMode::LIVE_STREAM; options->result_callback = [](absl::StatusOr, - const Image& image, int64 timestamp_ms) {}; + const Image& image, int64_t timestamp_ms) {}; MP_ASSERT_OK_AND_ASSIGN(std::unique_ptr image_embedder, ImageEmbedder::Create(std::move(options))); @@ -555,7 +555,7 @@ TEST_F(LiveStreamModeTest, FailsWithOutOfOrderInputTimestamps) { struct LiveStreamModeResults { ImageEmbedderResult embedding_result; std::pair image_size; - int64 timestamp_ms; + int64_t timestamp_ms; }; TEST_F(LiveStreamModeTest, Succeeds) { @@ -570,7 +570,7 @@ TEST_F(LiveStreamModeTest, Succeeds) { options->running_mode = core::RunningMode::LIVE_STREAM; options->result_callback = [&results](absl::StatusOr embedding_result, - const Image& image, int64 timestamp_ms) { + const Image& image, int64_t timestamp_ms) { MP_ASSERT_OK(embedding_result.status()); results.push_back( {.embedding_result = std::move(embedding_result).value(), @@ -589,7 +589,7 @@ TEST_F(LiveStreamModeTest, Succeeds) { // number of iterations. ASSERT_LE(results.size(), iterations); ASSERT_GT(results.size(), 0); - int64 timestamp_ms = -1; + int64_t timestamp_ms = -1; for (int i = 0; i < results.size(); ++i) { const auto& result = results[i]; EXPECT_GT(result.timestamp_ms, timestamp_ms);