No public description

PiperOrigin-RevId: 602190516
kp-forks · Jan 28, 2024 · ecf4d4f · ecf4d4f
1 parent fd5f31c
commit ecf4d4f
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 28 deletions.
diff --git a/mediapipe/framework/calculator_graph_event_loop_test.cc b/mediapipe/framework/calculator_graph_event_loop_test.cc
@@ -26,7 +26,6 @@
 #include "mediapipe/framework/port/core_proto_inc.h"
 #include "mediapipe/framework/port/gmock.h"
 #include "mediapipe/framework/port/gtest.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/logging.h"
 #include "mediapipe/framework/port/status_matchers.h"
 #include "mediapipe/framework/tool/sink.h"

diff --git a/mediapipe/framework/calculator_graph_stopping_test.cc b/mediapipe/framework/calculator_graph_stopping_test.cc
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <cstdint>
 #include <map>
 #include <string>
 #include <vector>
@@ -25,7 +26,6 @@
 #include "mediapipe/framework/port/core_proto_inc.h"
 #include "mediapipe/framework/port/gmock.h"
 #include "mediapipe/framework/port/gtest.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/logging.h"
 #include "mediapipe/framework/port/status_matchers.h"
 #include "mediapipe/framework/tool/sink.h"

diff --git a/mediapipe/framework/calculator_node.h b/mediapipe/framework/calculator_node.h
@@ -43,7 +43,6 @@
 #include "mediapipe/framework/packet_set.h"
 #include "mediapipe/framework/packet_type.h"
 #include "mediapipe/framework/port.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/status.h"
 #include "mediapipe/framework/stream_handler.pb.h"
 #include "mediapipe/framework/timestamp.h"

diff --git a/mediapipe/framework/calculator_parallel_execution_test.cc b/mediapipe/framework/calculator_parallel_execution_test.cc
@@ -31,7 +31,6 @@
 #include "mediapipe/framework/calculator_framework.h"
 #include "mediapipe/framework/port/gmock.h"
 #include "mediapipe/framework/port/gtest.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/parse_text_proto.h"
 #include "mediapipe/framework/port/status.h"
 #include "mediapipe/framework/port/status_matchers.h"

diff --git a/mediapipe/framework/packet.cc b/mediapipe/framework/packet.cc
@@ -18,7 +18,6 @@
 #include "absl/strings/str_cat.h"
 #include "mediapipe/framework/port.h"
 #include "mediapipe/framework/port/canonical_errors.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/ret_check.h"
 #include "mediapipe/framework/port/status.h"
 #include "mediapipe/framework/port/status_builder.h"

diff --git a/mediapipe/framework/scheduler.h b/mediapipe/framework/scheduler.h
@@ -27,7 +27,6 @@
 #include "absl/base/macros.h"
 #include "absl/synchronization/mutex.h"
 #include "mediapipe/framework/calculator_node.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/status.h"
 #include "mediapipe/framework/scheduler_queue.h"
 #include "mediapipe/framework/scheduler_shared.h"

diff --git a/mediapipe/framework/scheduler_queue.h b/mediapipe/framework/scheduler_queue.h
@@ -26,7 +26,6 @@
 #include "absl/synchronization/mutex.h"
 #include "mediapipe/framework/calculator_context.h"
 #include "mediapipe/framework/executor.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/scheduler_shared.h"
 
 namespace mediapipe {

diff --git a/mediapipe/framework/test_calculators.cc b/mediapipe/framework/test_calculators.cc
@@ -14,6 +14,7 @@
 //
 // Simple calculators that are useful for test cases.
 
+#include <cstdint>
 #include <memory>
 #include <random>
 #include <string>
@@ -26,7 +27,6 @@
 #include "mediapipe/framework/calculator_framework.h"
 #include "mediapipe/framework/deps/mathutil.h"
 #include "mediapipe/framework/formats/matrix.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/logging.h"
 #include "mediapipe/framework/port/ret_check.h"
 #include "mediapipe/framework/port/status.h"

diff --git a/mediapipe/framework/timestamp.h b/mediapipe/framework/timestamp.h
@@ -50,7 +50,6 @@
 
 #include "absl/log/absl_check.h"
 #include "mediapipe/framework/deps/safe_int.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/logging.h"
 
 namespace mediapipe {
@@ -269,7 +268,8 @@ std::ostream& operator<<(std::ostream& os, TimestampDiff arg);
 
 // Implementation details.
 
-inline Timestamp::Timestamp() : timestamp_(kint64min) {}
+inline Timestamp::Timestamp()
+    : timestamp_(std::numeric_limits<int64_t>::min()) {}
 
 inline Timestamp::Timestamp(int64_t timestamp) : timestamp_(timestamp) {
   ABSL_CHECK(!IsSpecialValue())
@@ -293,30 +293,32 @@ inline Timestamp Timestamp::CreateNoErrorChecking(int64_t timestamp) {
 inline Timestamp Timestamp::Unset() { return Timestamp(); }
 
 inline Timestamp Timestamp::Unstarted() {
-  return CreateNoErrorChecking(kint64min + 1);
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::min() + 1);
 }
 
 inline Timestamp Timestamp::PreStream() {
-  return CreateNoErrorChecking(kint64min + 2);
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::min() + 2);
 }
 
 inline Timestamp Timestamp::Min() {
-  return CreateNoErrorChecking(kint64min + 3);
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::min() + 3);
 }
 
 inline Timestamp Timestamp::Max() {
-  return CreateNoErrorChecking(kint64max - 3);
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::max() - 3);
 }
 
 inline Timestamp Timestamp::PostStream() {
-  return CreateNoErrorChecking(kint64max - 2);
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::max() - 2);
 }
 
 inline Timestamp Timestamp::OneOverPostStream() {
-  return CreateNoErrorChecking(kint64max - 1);
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::max() - 1);
 }
 
-inline Timestamp Timestamp::Done() { return CreateNoErrorChecking(kint64max); }
+inline Timestamp Timestamp::Done() {
+  return CreateNoErrorChecking(std::numeric_limits<int64_t>::max());
+}
 
 }  // namespace mediapipe
 

diff --git a/mediapipe/framework/timestamp_test.cc b/mediapipe/framework/timestamp_test.cc
@@ -14,6 +14,8 @@
 
 #include "mediapipe/framework/timestamp.h"
 
+#include <cstdint>
+#include <limits>
 #include <memory>
 #include <vector>
 
@@ -34,9 +36,10 @@ TEST(TimestampDeathTest, ConstructorDieOnSpecialValue) {
 }
 
 TEST(TimestampDeathTest, Overflow) {
-  Timestamp large = Timestamp(kint64max / 2 + 100);
-  TimestampDiff large_diff = TimestampDiff(kint64max / 2 + 100);
-  Timestamp small = Timestamp(kint64min / 2 - 100);
+  Timestamp large = Timestamp(std::numeric_limits<int64_t>::max() / 2 + 100);
+  TimestampDiff large_diff =
+      TimestampDiff(std::numeric_limits<int64_t>::max() / 2 + 100);
+  Timestamp small = Timestamp(std::numeric_limits<int64_t>::min() / 2 - 100);
   EXPECT_FALSE(large.IsSpecialValue());
   EXPECT_FALSE(small.IsSpecialValue());
   EXPECT_DEATH(large_diff + large_diff, "");

diff --git a/mediapipe/framework/validated_graph_config.cc b/mediapipe/framework/validated_graph_config.cc
@@ -34,7 +34,6 @@
 #include "mediapipe/framework/packet_type.h"
 #include "mediapipe/framework/port.h"
 #include "mediapipe/framework/port/core_proto_inc.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/logging.h"
 #include "mediapipe/framework/port/proto_ns.h"
 #include "mediapipe/framework/port/ret_check.h"

diff --git a/mediapipe/util/audio_decoder.h b/mediapipe/util/audio_decoder.h
@@ -24,7 +24,6 @@
 #include "absl/time/time.h"
 #include "mediapipe/framework/formats/time_series_header.pb.h"
 #include "mediapipe/framework/packet.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/status.h"
 #include "mediapipe/framework/timestamp.h"
 #include "mediapipe/util/audio_decoder.pb.h"

diff --git a/mediapipe/util/cpu_util.cc b/mediapipe/util/cpu_util.cc
@@ -15,6 +15,7 @@
 #include "mediapipe/util/cpu_util.h"
 
 #include <cmath>
+#include <cstdint>
 
 #ifdef __ANDROID__
 #include "ndk/sources/android/cpufeatures/cpu-features.h"
@@ -31,7 +32,6 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/substitute.h"
 #include "mediapipe/framework/port/canonical_errors.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/statusor.h"
 
 namespace mediapipe {

diff --git a/mediapipe/util/image_frame_util.cc b/mediapipe/util/image_frame_util.cc
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstdint>
 #include <functional>
 #include <string>
 #include <vector>
@@ -35,7 +36,6 @@
 #include "mediapipe/framework/formats/image_frame_opencv.h"
 #include "mediapipe/framework/formats/yuv_image.h"
 #include "mediapipe/framework/port/aligned_malloc_and_free.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/port.h"
 #include "mediapipe/framework/port/status_macros.h"
 

diff --git a/mediapipe/util/image_frame_util.h b/mediapipe/util/image_frame_util.h
@@ -16,11 +16,11 @@
 #ifndef MEDIAPIPE_UTIL_IMAGE_FRAME_UTIL_H_
 #define MEDIAPIPE_UTIL_IMAGE_FRAME_UTIL_H_
 
+#include <cstdint>
 #include <string>
 
 #include "absl/strings/string_view.h"
 #include "mediapipe/framework/formats/image_format.pb.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/opencv_imgproc_inc.h"
 #include "mediapipe/framework/tool/status_util.h"
 

diff --git a/mediapipe/util/label_map_util.h b/mediapipe/util/label_map_util.h
@@ -15,8 +15,9 @@
 #ifndef MEDIAPIPE_UTIL_LABEL_MAP_UTIL_H_
 #define MEDIAPIPE_UTIL_LABEL_MAP_UTIL_H_
 
+#include <cstdint>
+
 #include "absl/strings/string_view.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/proto_ns.h"
 #include "mediapipe/framework/port/statusor.h"
 #include "mediapipe/util/label_map.pb.h"

diff --git a/mediapipe/util/time_series_test_util.h b/mediapipe/util/time_series_test_util.h
@@ -15,6 +15,7 @@
 #ifndef MEDIAPIPE_UTIL_TIME_SERIES_TEST_UTIL_H_
 #define MEDIAPIPE_UTIL_TIME_SERIES_TEST_UTIL_H_
 
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
@@ -31,7 +32,6 @@
 #include "mediapipe/framework/formats/time_series_header.pb.h"
 #include "mediapipe/framework/port/gmock.h"
 #include "mediapipe/framework/port/gtest.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/parse_text_proto.h"
 #include "mediapipe/framework/port/status.h"
 #include "mediapipe/framework/port/status_matchers.h"

diff --git a/mediapipe/util/time_series_util.h b/mediapipe/util/time_series_util.h
@@ -17,14 +17,14 @@
 #ifndef MEDIAPIPE_UTIL_TIME_SERIES_UTIL_H_
 #define MEDIAPIPE_UTIL_TIME_SERIES_UTIL_H_
 
+#include <cstdint>
 #include <string>
 #include <typeinfo>
 
 #include "absl/strings/str_cat.h"
 #include "mediapipe/framework/calculator_framework.h"
 #include "mediapipe/framework/formats/matrix.h"
 #include "mediapipe/framework/formats/time_series_header.pb.h"
-#include "mediapipe/framework/port/integral_types.h"
 #include "mediapipe/framework/port/status.h"
 
 namespace mediapipe {