Project import generated by Copybara.

PiperOrigin-RevId: 267280553

mediapipe/calculators/audio/BUILD

@@ -68,8 +68,6 @@ mediapipe_cc_proto_library(
 )
 
 proto_library(
-<<<<<<< HEAD
-=======
     name = "stabilized_log_calculator_proto",
     srcs = ["stabilized_log_calculator.proto"],
     visibility = ["//visibility:public"],
@@ -87,7 +85,6 @@ mediapipe_cc_proto_library(
 )
 
 proto_library(
->>>>>>> Project import generated by Copybara.
     name = "time_series_framer_calculator_proto",
     srcs = ["time_series_framer_calculator.proto"],
     visibility = ["//visibility:public"],
@@ -177,8 +174,6 @@ cc_library(
 )
 
 cc_library(
-<<<<<<< HEAD
-=======
     name = "stabilized_log_calculator",
     srcs = ["stabilized_log_calculator.cc"],
     visibility = ["//visibility:public"],
@@ -195,7 +190,6 @@ cc_library(
 )
 
 cc_library(
->>>>>>> Project import generated by Copybara.
     name = "spectrogram_calculator",
     srcs = ["spectrogram_calculator.cc"],
     visibility = ["//visibility:public"],
@@ -306,8 +300,6 @@ cc_test(
 )
 
 cc_test(
-<<<<<<< HEAD
-=======
     name = "stabilized_log_calculator_test",
     srcs = ["stabilized_log_calculator_test.cc"],
     deps = [
@@ -326,7 +318,6 @@ cc_test(
 )
 
 cc_test(
->>>>>>> Project import generated by Copybara.
     name = "time_series_framer_calculator_test",
     srcs = ["time_series_framer_calculator_test.cc"],
     deps = [

mediapipe/calculators/audio/audio_decoder_calculator.cc

@@ -64,11 +64,7 @@ class AudioDecoderCalculator : public CalculatorBase {
 
   cc->Outputs().Tag("AUDIO").Set<Matrix>();
   if (cc->Outputs().HasTag("AUDIO_HEADER")) {
-<<<<<<< HEAD
-    cc->Outputs().Tag("AUDIO_HEADER").Set<mediapipe::TimeSeriesHeader>();
-=======
     cc->Outputs().Tag("AUDIO_HEADER").SetNone();
->>>>>>> Project import generated by Copybara.
   }
   return ::mediapipe::OkStatus();
 }

mediapipe/calculators/audio/mfcc_mel_calculators.cc

@@ -90,13 +90,8 @@ class FramewiseTransformCalculatorBase : public CalculatorBase {
  private:
   // Takes header and options, and sets up state including calling
   // set_num_output_channels() on the base object.
-<<<<<<< HEAD
-  virtual ::mediapipe::Status ConfigureTransform(
-      const TimeSeriesHeader& header, const CalculatorOptions& options) = 0;
-=======
   virtual ::mediapipe::Status ConfigureTransform(const TimeSeriesHeader& header,
                                                  CalculatorContext* cc) = 0;
->>>>>>> Project import generated by Copybara.
 
   // Takes a vector<double> corresponding to an input frame, and
   // perform the specific transformation to produce an output frame.
@@ -113,11 +108,7 @@ class FramewiseTransformCalculatorBase : public CalculatorBase {
   RETURN_IF_ERROR(time_series_util::FillTimeSeriesHeaderIfValid(
       cc->Inputs().Index(0).Header(), &input_header));
 
-<<<<<<< HEAD
-  ::mediapipe::Status status = ConfigureTransform(input_header, cc->Options());
-=======
   ::mediapipe::Status status = ConfigureTransform(input_header, cc);
->>>>>>> Project import generated by Copybara.
 
   auto output_header = new TimeSeriesHeader(input_header);
   output_header->set_num_channels(num_output_channels_);
@@ -184,17 +175,9 @@ class MfccCalculator : public FramewiseTransformCalculatorBase {
   }
 
  private:
-<<<<<<< HEAD
-  ::mediapipe::Status ConfigureTransform(
-      const TimeSeriesHeader& header,
-      const CalculatorOptions& options) override {
-    MfccCalculatorOptions mfcc_options;
-    time_series_util::FillOptionsExtensionOrDie(options, &mfcc_options);
-=======
   ::mediapipe::Status ConfigureTransform(const TimeSeriesHeader& header,
                                          CalculatorContext* cc) override {
     MfccCalculatorOptions mfcc_options = cc->Options<MfccCalculatorOptions>();
->>>>>>> Project import generated by Copybara.
     mfcc_.reset(new audio_dsp::Mfcc());
     int input_length = header.num_channels();
     // Set up the parameters to the Mfcc object.
@@ -250,18 +233,10 @@ class MelSpectrumCalculator : public FramewiseTransformCalculatorBase {
   }
 
  private:
-<<<<<<< HEAD
-  ::mediapipe::Status ConfigureTransform(
-      const TimeSeriesHeader& header,
-      const CalculatorOptions& options) override {
-    MelSpectrumCalculatorOptions mel_spectrum_options;
-    time_series_util::FillOptionsExtensionOrDie(options, &mel_spectrum_options);
-=======
   ::mediapipe::Status ConfigureTransform(const TimeSeriesHeader& header,
                                          CalculatorContext* cc) override {
     MelSpectrumCalculatorOptions mel_spectrum_options =
         cc->Options<MelSpectrumCalculatorOptions>();
->>>>>>> Project import generated by Copybara.
     mel_filterbank_.reset(new audio_dsp::MelFilterbank());
     int input_length = header.num_channels();
     set_num_output_channels(mel_spectrum_options.channel_count());

mediapipe/calculators/audio/rational_factor_resample_calculator.cc

@@ -64,13 +64,8 @@ void CopyVectorToChannel(const std::vector<float>& vec, Matrix* matrix,
 
 ::mediapipe::Status RationalFactorResampleCalculator::Open(
     CalculatorContext* cc) {
-<<<<<<< HEAD
-  RationalFactorResampleCalculatorOptions resample_options;
-  time_series_util::FillOptionsExtensionOrDie(cc->Options(), &resample_options);
-=======
   RationalFactorResampleCalculatorOptions resample_options =
       cc->Options<RationalFactorResampleCalculatorOptions>();
->>>>>>> Project import generated by Copybara.
 
   if (!resample_options.has_target_sample_rate()) {
     return tool::StatusInvalid(

mediapipe/calculators/audio/spectrogram_calculator.cc

@@ -71,15 +71,8 @@ class SpectrogramCalculator : public CalculatorBase {
         // Input stream with TimeSeriesHeader.
     );
 
-<<<<<<< HEAD
-    SpectrogramCalculatorOptions spectrogram_options;
-    time_series_util::FillOptionsExtensionOrDie(cc->Options(),
-                                                &spectrogram_options);
-
-=======
     SpectrogramCalculatorOptions spectrogram_options =
         cc->Options<SpectrogramCalculatorOptions>();
->>>>>>> Project import generated by Copybara.
     if (!spectrogram_options.allow_multichannel_input()) {
       if (spectrogram_options.output_type() ==
           SpectrogramCalculatorOptions::COMPLEX) {
@@ -177,14 +170,8 @@ REGISTER_CALCULATOR(SpectrogramCalculator);
 const float SpectrogramCalculator::kLnPowerToDb = 4.342944819032518;
 
 ::mediapipe::Status SpectrogramCalculator::Open(CalculatorContext* cc) {
-<<<<<<< HEAD
-  SpectrogramCalculatorOptions spectrogram_options;
-  time_series_util::FillOptionsExtensionOrDie(cc->Options(),
-                                              &spectrogram_options);
-=======
   SpectrogramCalculatorOptions spectrogram_options =
       cc->Options<SpectrogramCalculatorOptions>();
->>>>>>> Project import generated by Copybara.
 
   if (spectrogram_options.frame_duration_seconds() <= 0.0) {
     ::mediapipe::InvalidArgumentErrorBuilder(MEDIAPIPE_LOC)
@@ -233,13 +220,10 @@ const float SpectrogramCalculator::kLnPowerToDb = 4.342944819032518;
 
   std::vector<double> window;
   switch (spectrogram_options.window_type()) {
-<<<<<<< HEAD
-=======
     case SpectrogramCalculatorOptions::COSINE:
       audio_dsp::CosineWindow().GetPeriodicSamples(frame_duration_samples_,
                                                    &window);
       break;
->>>>>>> Project import generated by Copybara.
     case SpectrogramCalculatorOptions::HANN:
       audio_dsp::HannWindow().GetPeriodicSamples(frame_duration_samples_,
                                                  &window);

mediapipe/calculators/audio/spectrogram_calculator.proto

@@ -58,10 +58,7 @@ message SpectrogramCalculatorOptions {
   enum WindowType {
     HANN = 0;
     HAMMING = 1;
-<<<<<<< HEAD
-=======
     COSINE = 2;
->>>>>>> Project import generated by Copybara.
   }
   optional WindowType window_type = 6 [default = HANN];
 

mediapipe/calculators/audio/time_series_framer_calculator.cc

@@ -206,13 +206,8 @@ void TimeSeriesFramerCalculator::FrameOutput(CalculatorContext* cc) {
 }
 
 ::mediapipe::Status TimeSeriesFramerCalculator::Open(CalculatorContext* cc) {
-<<<<<<< HEAD
-  TimeSeriesFramerCalculatorOptions framer_options;
-  time_series_util::FillOptionsExtensionOrDie(cc->Options(), &framer_options);
-=======
   TimeSeriesFramerCalculatorOptions framer_options =
       cc->Options<TimeSeriesFramerCalculatorOptions>();
->>>>>>> Project import generated by Copybara.
 
   RET_CHECK_GT(framer_options.frame_duration_seconds(), 0.0)
       << "Invalid or missing frame_duration_seconds. "

mediapipe/calculators/core/BUILD

@@ -162,10 +162,7 @@ cc_library(
     deps = [
         ":concatenate_vector_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
-<<<<<<< HEAD
-=======
         "//mediapipe/framework/formats:landmark_cc_proto",
->>>>>>> Project import generated by Copybara.
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
         "@org_tensorflow//tensorflow/lite:framework",
@@ -527,10 +524,7 @@ cc_library(
     deps = [
         ":split_vector_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
-<<<<<<< HEAD
-=======
         "//mediapipe/framework/formats:landmark_cc_proto",
->>>>>>> Project import generated by Copybara.
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
         "//mediapipe/util:resource_util",
@@ -636,8 +630,6 @@ cc_test(
 )
 
 cc_library(
-<<<<<<< HEAD
-=======
     name = "matrix_to_vector_calculator",
     srcs = ["matrix_to_vector_calculator.cc"],
     visibility = ["//visibility:public"],
@@ -673,7 +665,6 @@ cc_test(
 )
 
 cc_library(
->>>>>>> Project import generated by Copybara.
     name = "merge_calculator",
     srcs = ["merge_calculator.cc"],
     visibility = ["//visibility:public"],

mediapipe/calculators/core/concatenate_vector_calculator.cc

@@ -16,10 +16,7 @@
 
 #include <vector>
 
-<<<<<<< HEAD
-=======
 #include "mediapipe/framework/formats/landmark.pb.h"
->>>>>>> Project import generated by Copybara.
 #include "tensorflow/lite/interpreter.h"
 
 namespace mediapipe {
@@ -45,10 +42,7 @@ typedef ConcatenateVectorCalculator<TfLiteTensor>
     ConcatenateTfLiteTensorVectorCalculator;
 REGISTER_CALCULATOR(ConcatenateTfLiteTensorVectorCalculator);
 
-<<<<<<< HEAD
-=======
 typedef ConcatenateVectorCalculator<::mediapipe::NormalizedLandmark>
     ConcatenateLandmarkVectorCalculator;
 REGISTER_CALCULATOR(ConcatenateLandmarkVectorCalculator);
->>>>>>> Project import generated by Copybara.
 }  // namespace mediapipe

mediapipe/calculators/core/split_vector_calculator.cc

@@ -16,10 +16,7 @@
 
 #include <vector>
 
-<<<<<<< HEAD
-=======
 #include "mediapipe/framework/formats/landmark.pb.h"
->>>>>>> Project import generated by Copybara.
 #include "tensorflow/lite/interpreter.h"
 
 namespace mediapipe {
@@ -41,10 +38,7 @@ namespace mediapipe {
 typedef SplitVectorCalculator<TfLiteTensor> SplitTfLiteTensorVectorCalculator;
 REGISTER_CALCULATOR(SplitTfLiteTensorVectorCalculator);
 
-<<<<<<< HEAD
-=======
 typedef SplitVectorCalculator<::mediapipe::NormalizedLandmark>
     SplitLandmarkVectorCalculator;
 REGISTER_CALCULATOR(SplitLandmarkVectorCalculator);
->>>>>>> Project import generated by Copybara.
 }  // namespace mediapipe

mediapipe/calculators/image/image_transformation_calculator.cc

@@ -244,11 +244,7 @@ REGISTER_CALCULATOR(ImageTransformationCalculator);
     rotation_ = DegreesToRotationMode(
         cc->InputSidePackets().Tag("ROTATION_DEGREES").Get<int>());
   } else {
-<<<<<<< HEAD
-    rotation_ = DegreesToRotationMode(options_.rotation_mode());
-=======
     rotation_ = options_.rotation_mode();
->>>>>>> Project import generated by Copybara.
   }
 
   scale_mode_ = ParseScaleMode(options_.scale_mode(), DEFAULT_SCALE_MODE);

mediapipe/calculators/tensorflow/BUILD

@@ -188,8 +188,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
-<<<<<<< HEAD
-=======
     name = "tensorflow_session_from_frozen_graph_calculator_cc_proto",
     srcs = ["tensorflow_session_from_frozen_graph_calculator.proto"],
     cc_deps = [
@@ -201,7 +199,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
->>>>>>> Project import generated by Copybara.
     name = "tensorflow_session_from_saved_model_generator_cc_proto",
     srcs = ["tensorflow_session_from_saved_model_generator.proto"],
     cc_deps = ["//mediapipe/framework:packet_generator_cc_proto"],
@@ -459,8 +456,6 @@ cc_library(
 )
 
 cc_library(
-<<<<<<< HEAD
-=======
     name = "tensorflow_session_from_frozen_graph_calculator",
     srcs = ["tensorflow_session_from_frozen_graph_calculator.cc"],
     features = ["no_layering_check"],
@@ -490,7 +485,6 @@ cc_library(
 )
 
 cc_library(
->>>>>>> Project import generated by Copybara.
     name = "tensorflow_session_from_frozen_graph_generator",
     srcs = ["tensorflow_session_from_frozen_graph_generator.cc"],
     features = ["no_layering_check"],
@@ -784,8 +778,6 @@ cc_test(
 )
 
 cc_test(
-<<<<<<< HEAD
-=======
     name = "tensorflow_session_from_frozen_graph_calculator_test",
     srcs = ["tensorflow_session_from_frozen_graph_calculator_test.cc"],
     data = [":test_frozen_graph"],
@@ -816,7 +808,6 @@ cc_test(
 )
 
 cc_test(
->>>>>>> Project import generated by Copybara.
     name = "tensorflow_session_from_frozen_graph_generator_test",
     srcs = ["tensorflow_session_from_frozen_graph_generator_test.cc"],
     data = [":test_frozen_graph"],

mediapipe/calculators/tensorflow/tensorflow_inference_calculator.cc

@@ -34,13 +34,10 @@
 #include "tensorflow/core/framework/tensor_shape.h"
 #include "tensorflow/core/framework/tensor_util.h"
 
-<<<<<<< HEAD
-=======
 #if !defined(__ANDROID__) && !defined(__APPLE__)
 #include "tensorflow/core/profiler/lib/traceme.h"
 #endif
 
->>>>>>> Project import generated by Copybara.
 namespace tf = ::tensorflow;
 
 namespace mediapipe {
@@ -442,11 +439,6 @@ class TensorFlowInferenceCalculator : public CalculatorBase {
       session_run_throttle->Acquire(1);
     }
     const int64 run_start_time = absl::ToUnixMicros(clock_->TimeNow());
-<<<<<<< HEAD
-    const tf::Status tf_status =
-        session_->Run(input_tensors, output_tensor_names,
-                      {} /* target_node_names */, &outputs);
-=======
     tf::Status tf_status;
     {
 #if !defined(__ANDROID__) && !defined(__APPLE__)
@@ -456,7 +448,6 @@ class TensorFlowInferenceCalculator : public CalculatorBase {
                                 {} /* target_node_names */, &outputs);
     }
 
->>>>>>> Project import generated by Copybara.
     if (session_run_throttle != nullptr) {
       session_run_throttle->Release(1);
     }

mediapipe/calculators/tflite/BUILD

@@ -62,8 +62,6 @@ proto_library(
 )
 
 proto_library(
-<<<<<<< HEAD
-=======
     name = "tflite_tensors_to_classification_calculator_proto",
     srcs = ["tflite_tensors_to_classification_calculator.proto"],
     visibility = ["//visibility:public"],
@@ -71,7 +69,6 @@ proto_library(
 )
 
 proto_library(
->>>>>>> Project import generated by Copybara.
     name = "tflite_tensors_to_landmarks_calculator_proto",
     srcs = ["tflite_tensors_to_landmarks_calculator.proto"],
     visibility = ["//visibility:public"],
@@ -127,8 +124,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
-<<<<<<< HEAD
-=======
     name = "tflite_tensors_to_classification_calculator_cc_proto",
     srcs = ["tflite_tensors_to_classification_calculator.proto"],
     cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
@@ -137,7 +132,6 @@ mediapipe_cc_proto_library(
 )
 
 mediapipe_cc_proto_library(
->>>>>>> Project import generated by Copybara.
     name = "tflite_tensors_to_landmarks_calculator_cc_proto",
     srcs = ["tflite_tensors_to_landmarks_calculator.proto"],
     cc_deps = ["//mediapipe/framework:calculator_cc_proto"],
@@ -332,8 +326,6 @@ cc_library(
     alwayslink = 1,
 )
 
-<<<<<<< HEAD
-=======
 cc_test(
     name = "tflite_tensors_to_classification_calculator_test",
     srcs = ["tflite_tensors_to_classification_calculator_test.cc"],
@@ -353,7 +345,6 @@ cc_test(
     ],
 )
 
->>>>>>> Project import generated by Copybara.
 cc_library(
     name = "tflite_tensors_to_detections_calculator",
     srcs = ["tflite_tensors_to_detections_calculator.cc"],
@@ -383,8 +374,6 @@ cc_library(
 )
 
 cc_library(
-<<<<<<< HEAD
-=======
     name = "tflite_tensors_to_classification_calculator",
     srcs = ["tflite_tensors_to_classification_calculator.cc"],
     visibility = ["//visibility:public"],
@@ -416,7 +405,6 @@ cc_library(
 )
 
 cc_library(
->>>>>>> Project import generated by Copybara.
     name = "tflite_tensors_to_landmarks_calculator",
     srcs = ["tflite_tensors_to_landmarks_calculator.cc"],
     visibility = ["//visibility:public"],

mediapipe/calculators/tflite/tflite_inference_calculator.cc

@@ -434,14 +434,9 @@ REGISTER_CALCULATOR(TfLiteInferenceCalculator);
     use_quantized_tensors_ = false;
   } else {
     RET_CHECK_EQ(interpreter_->AllocateTensors(), kTfLiteOk);
-<<<<<<< HEAD
-    use_quantized_tensors_ = (interpreter_->tensor(0)->quantization.type ==
-                              kTfLiteAffineQuantization);
-=======
     use_quantized_tensors_ =
         (interpreter_->tensor(interpreter_->inputs()[0])->quantization.type ==
          kTfLiteAffineQuantization);
->>>>>>> Project import generated by Copybara.
     if (use_quantized_tensors_) gpu_inference_ = false;
   }
 

mediapipe/calculators/video/opencv_video_decoder_calculator.cc

@@ -154,10 +154,6 @@ class OpenCvVideoDecoderCalculator : public CalculatorBase {
                      cv::COLOR_BGRA2RGBA);
       }
     }
-<<<<<<< HEAD
-    cc->Outputs().Tag("VIDEO").Add(image_frame.release(), timestamp);
-    decoded_frames_++;
-=======
     // If the timestamp of the current frame is not greater than the one of the
     // previous frame, the new frame will be discarded.
     if (prev_timestamp_ < timestamp) {
@@ -166,7 +162,6 @@ class OpenCvVideoDecoderCalculator : public CalculatorBase {
       decoded_frames_++;
     }
 
->>>>>>> Project import generated by Copybara.
     return ::mediapipe::OkStatus();
   }
 
@@ -189,10 +184,7 @@ class OpenCvVideoDecoderCalculator : public CalculatorBase {
   int frame_count_;
   int decoded_frames_ = 0;
   ImageFormat::Format format_;
-<<<<<<< HEAD
-=======
   Timestamp prev_timestamp_ = Timestamp::Unset();
->>>>>>> Project import generated by Copybara.
 };
 
 REGISTER_CALCULATOR(OpenCvVideoDecoderCalculator);