Project import generated by Copybara.

PiperOrigin-RevId: 267280553

mediapipe/framework/BUILD

@@ -139,11 +139,7 @@ mediapipe_cc_proto_library(
         ":stream_handler_cc_proto",
         "@com_google_protobuf//:cc_wkt_protos",
     ],
-<<<<<<< HEAD
-    visibility = ["//mediapipe:__subpackages__"],
-=======
     visibility = ["//visibility:public"],
->>>>>>> Project import generated by Copybara.
     deps = [":calculator_proto"],
 )
 
@@ -159,11 +155,7 @@ mediapipe_cc_proto_library(
 mediapipe_cc_proto_library(
     name = "calculator_options_cc_proto",
     srcs = ["calculator_options.proto"],
-<<<<<<< HEAD
-    visibility = ["//mediapipe:__subpackages__"],
-=======
     visibility = ["//visibility:public"],
->>>>>>> Project import generated by Copybara.
     deps = [":calculator_options_proto"],
 )
 

mediapipe/framework/formats/BUILD

@@ -32,15 +32,12 @@ proto_library(
 )
 
 proto_library(
-<<<<<<< HEAD
-=======
     name = "classification_proto",
     srcs = ["classification.proto"],
     visibility = ["//mediapipe:__subpackages__"],
 )
 
 proto_library(
->>>>>>> Project import generated by Copybara.
     name = "image_format_proto",
     srcs = ["image_format.proto"],
     visibility = ["//mediapipe:__subpackages__"],
@@ -73,8 +70,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
-<<<<<<< HEAD
-=======
     name = "classification_cc_proto",
     srcs = ["classification.proto"],
     visibility = ["//mediapipe:__subpackages__"],
@@ -82,7 +77,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
->>>>>>> Project import generated by Copybara.
     name = "image_format_cc_proto",
     srcs = ["image_format.proto"],
     visibility = [

mediapipe/framework/graph_validation_test.cc

@@ -32,11 +32,7 @@ namespace mediapipe {
 namespace {
 
 // Shows validation success for a graph and a subgraph.
-<<<<<<< HEAD
-TEST(ValidatedGraphConfigTest, InitilizeGraphFromProtos) {
-=======
 TEST(ValidatedGraphConfigTest, InitializeGraphFromProtos) {
->>>>>>> Project import generated by Copybara.
   auto config_1 = ParseTextProtoOrDie<CalculatorGraphConfig>(R"(
     type: "PassThroughGraph"
     input_stream: "INPUT:stream_1"
@@ -106,11 +102,7 @@ TEST(ValidatedGraphConfigTest, InitializeGraphFromProtos) {
 }
 
 // Shows validation failure due to an unregistered subgraph.
-<<<<<<< HEAD
-TEST(ValidatedGraphConfigTest, InitilizeGraphFromLinker) {
-=======
 TEST(ValidatedGraphConfigTest, InitializeGraphFromLinker) {
->>>>>>> Project import generated by Copybara.
   EXPECT_FALSE(SubgraphRegistry::IsRegistered("DubQuadTestSubgraph"));
   ValidatedGraphConfig builder_1;
   ::mediapipe::Status status_1 =
@@ -122,11 +114,7 @@ TEST(ValidatedGraphConfigTest, InitializeGraphFromLinker) {
 }
 
 // Shows validation success for a graph and a template subgraph.
-<<<<<<< HEAD
-TEST(ValidatedGraphConfigTest, InitilizeTemplateFromProtos) {
-=======
 TEST(ValidatedGraphConfigTest, InitializeTemplateFromProtos) {
->>>>>>> Project import generated by Copybara.
   mediapipe::tool::TemplateParser::Parser parser;
   CalculatorGraphTemplate config_1;
   CHECK(parser.ParseFromString(R"(

mediapipe/framework/profiler/graph_profiler.cc

@@ -520,11 +520,7 @@ class OstreamStream : public proto_ns::io::ZeroCopyOutputStream {
     return WriteBuffer();
   }
   void BackUp(int count) override { buffer_used_ -= count; }
-<<<<<<< HEAD
-  proto_int64 ByteCount() const override { return position_; }
-=======
   int64_t ByteCount() const override { return position_; }
->>>>>>> Project import generated by Copybara.
 
  private:
   // Writes the buffer to the ostream.

mediapipe/framework/stream_handler/fixed_size_input_stream_handler.cc

@@ -108,12 +108,6 @@ class FixedSizeInputStreamHandler : public DefaultInputStreamHandler {
   }
 
   // Returns the lowest timestamp of a packet ready to process.
-<<<<<<< HEAD
-  Timestamp MinTimestampOrBound() {
-    Timestamp min_bound = Timestamp::Done();
-    for (const auto& stream : input_stream_managers_) {
-      min_bound = std::min(min_bound, stream->MinTimestampOrBound(nullptr));
-=======
   Timestamp MinTimestampToProcess() {
     Timestamp min_bound = Timestamp::Done();
     for (const auto& stream : input_stream_managers_) {
@@ -126,7 +120,6 @@ class FixedSizeInputStreamHandler : public DefaultInputStreamHandler {
         stream_timestamp = PreviousAllowedInStream(stream_timestamp);
       }
       min_bound = std::min(min_bound, stream_timestamp);
->>>>>>> Project import generated by Copybara.
     }
     return min_bound;
   }
@@ -214,11 +207,7 @@ class FixedSizeInputStreamHandler : public DefaultInputStreamHandler {
     }
     // input_timestamp is recalculated here to process the most recent packets.
     EraseSurplusPackets(true);
-<<<<<<< HEAD
-    input_timestamp = MinTimestampOrBound();
-=======
     input_timestamp = MinTimestampToProcess();
->>>>>>> Project import generated by Copybara.
     DefaultInputStreamHandler::FillInputSet(input_timestamp, input_set);
     pending_ = false;
   }