diff --git a/Dockerfile b/Dockerfile index ff0b059db..efa95301d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,10 +24,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ ca-certificates \ -<<<<<<< HEAD -======= curl \ ->>>>>>> Project import generated by Copybara. git \ wget \ unzip \ @@ -39,11 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libopencv-video-dev \ software-properties-common && \ add-apt-repository -y ppa:openjdk-r/ppa && \ -<<<<<<< HEAD - apt-get update && apt-get install -y openjdk-11-jdk && \ -======= apt-get update && apt-get install -y openjdk-8-jdk && \ ->>>>>>> Project import generated by Copybara. apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/mediapipe/calculators/audio/BUILD b/mediapipe/calculators/audio/BUILD index 7306ea0ff..0408be420 100644 --- a/mediapipe/calculators/audio/BUILD +++ b/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 = [ diff --git a/mediapipe/calculators/audio/audio_decoder_calculator.cc b/mediapipe/calculators/audio/audio_decoder_calculator.cc index 4fffd4391..5e379ce4d 100644 --- a/mediapipe/calculators/audio/audio_decoder_calculator.cc +++ b/mediapipe/calculators/audio/audio_decoder_calculator.cc @@ -64,11 +64,7 @@ class AudioDecoderCalculator : public CalculatorBase { cc->Outputs().Tag("AUDIO").Set(); if (cc->Outputs().HasTag("AUDIO_HEADER")) { -<<<<<<< HEAD - cc->Outputs().Tag("AUDIO_HEADER").Set(); -======= cc->Outputs().Tag("AUDIO_HEADER").SetNone(); ->>>>>>> Project import generated by Copybara. } return ::mediapipe::OkStatus(); } diff --git a/mediapipe/calculators/audio/mfcc_mel_calculators.cc b/mediapipe/calculators/audio/mfcc_mel_calculators.cc index 4d04414a5..009a63e83 100644 --- a/mediapipe/calculators/audio/mfcc_mel_calculators.cc +++ b/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 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(); ->>>>>>> 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(); ->>>>>>> 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()); diff --git a/mediapipe/calculators/audio/rational_factor_resample_calculator.cc b/mediapipe/calculators/audio/rational_factor_resample_calculator.cc index 3c882db26..6af157a71 100644 --- a/mediapipe/calculators/audio/rational_factor_resample_calculator.cc +++ b/mediapipe/calculators/audio/rational_factor_resample_calculator.cc @@ -64,13 +64,8 @@ void CopyVectorToChannel(const std::vector& 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(); ->>>>>>> Project import generated by Copybara. if (!resample_options.has_target_sample_rate()) { return tool::StatusInvalid( diff --git a/mediapipe/calculators/audio/spectrogram_calculator.cc b/mediapipe/calculators/audio/spectrogram_calculator.cc index fae9ae7cc..6415a295b 100644 --- a/mediapipe/calculators/audio/spectrogram_calculator.cc +++ b/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(); ->>>>>>> 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(); ->>>>>>> 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 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); diff --git a/mediapipe/calculators/audio/spectrogram_calculator.proto b/mediapipe/calculators/audio/spectrogram_calculator.proto index c29a6f206..af3ad9d19 100644 --- a/mediapipe/calculators/audio/spectrogram_calculator.proto +++ b/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]; diff --git a/mediapipe/calculators/audio/time_series_framer_calculator.cc b/mediapipe/calculators/audio/time_series_framer_calculator.cc index 0879c89db..60344f462 100644 --- a/mediapipe/calculators/audio/time_series_framer_calculator.cc +++ b/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(); ->>>>>>> Project import generated by Copybara. RET_CHECK_GT(framer_options.frame_duration_seconds(), 0.0) << "Invalid or missing frame_duration_seconds. " diff --git a/mediapipe/calculators/core/BUILD b/mediapipe/calculators/core/BUILD index 4ede4bbb7..1fd56f153 100644 --- a/mediapipe/calculators/core/BUILD +++ b/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"], diff --git a/mediapipe/calculators/core/concatenate_vector_calculator.cc b/mediapipe/calculators/core/concatenate_vector_calculator.cc index 633236b65..7a8445f48 100644 --- a/mediapipe/calculators/core/concatenate_vector_calculator.cc +++ b/mediapipe/calculators/core/concatenate_vector_calculator.cc @@ -16,10 +16,7 @@ #include -<<<<<<< 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 ConcatenateTfLiteTensorVectorCalculator; REGISTER_CALCULATOR(ConcatenateTfLiteTensorVectorCalculator); -<<<<<<< HEAD -======= typedef ConcatenateVectorCalculator<::mediapipe::NormalizedLandmark> ConcatenateLandmarkVectorCalculator; REGISTER_CALCULATOR(ConcatenateLandmarkVectorCalculator); ->>>>>>> Project import generated by Copybara. } // namespace mediapipe diff --git a/mediapipe/calculators/core/split_vector_calculator.cc b/mediapipe/calculators/core/split_vector_calculator.cc index cc09c5183..3e60b8072 100644 --- a/mediapipe/calculators/core/split_vector_calculator.cc +++ b/mediapipe/calculators/core/split_vector_calculator.cc @@ -16,10 +16,7 @@ #include -<<<<<<< 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 SplitTfLiteTensorVectorCalculator; REGISTER_CALCULATOR(SplitTfLiteTensorVectorCalculator); -<<<<<<< HEAD -======= typedef SplitVectorCalculator<::mediapipe::NormalizedLandmark> SplitLandmarkVectorCalculator; REGISTER_CALCULATOR(SplitLandmarkVectorCalculator); ->>>>>>> Project import generated by Copybara. } // namespace mediapipe diff --git a/mediapipe/calculators/image/image_transformation_calculator.cc b/mediapipe/calculators/image/image_transformation_calculator.cc index c3afadcbd..233bb1ab7 100644 --- a/mediapipe/calculators/image/image_transformation_calculator.cc +++ b/mediapipe/calculators/image/image_transformation_calculator.cc @@ -244,11 +244,7 @@ REGISTER_CALCULATOR(ImageTransformationCalculator); rotation_ = DegreesToRotationMode( cc->InputSidePackets().Tag("ROTATION_DEGREES").Get()); } 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); diff --git a/mediapipe/calculators/tensorflow/BUILD b/mediapipe/calculators/tensorflow/BUILD index a130f877d..bbc59703e 100644 --- a/mediapipe/calculators/tensorflow/BUILD +++ b/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"], diff --git a/mediapipe/calculators/tensorflow/tensorflow_inference_calculator.cc b/mediapipe/calculators/tensorflow/tensorflow_inference_calculator.cc index 9e9c18f9c..1ba7c2cd1 100644 --- a/mediapipe/calculators/tensorflow/tensorflow_inference_calculator.cc +++ b/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); } diff --git a/mediapipe/calculators/tflite/BUILD b/mediapipe/calculators/tflite/BUILD index 06c434be9..8f86adc8e 100644 --- a/mediapipe/calculators/tflite/BUILD +++ b/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"], diff --git a/mediapipe/calculators/tflite/tflite_inference_calculator.cc b/mediapipe/calculators/tflite/tflite_inference_calculator.cc index b7ef86a7a..76208b661 100644 --- a/mediapipe/calculators/tflite/tflite_inference_calculator.cc +++ b/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; } diff --git a/mediapipe/calculators/video/opencv_video_decoder_calculator.cc b/mediapipe/calculators/video/opencv_video_decoder_calculator.cc index b4795b30c..b333e3c7e 100644 --- a/mediapipe/calculators/video/opencv_video_decoder_calculator.cc +++ b/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); diff --git a/mediapipe/docs/cycles.md b/mediapipe/docs/cycles.md index 89aa5428c..5b43e0e8d 100644 --- a/mediapipe/docs/cycles.md +++ b/mediapipe/docs/cycles.md @@ -61,11 +61,7 @@ ordering and ignores packet timestamps, which will eliminate this inconvenience. By default, MediaPipe calls the `Close()` method of a non-source calculator when all of its input streams are done. In the example graph, we want to stop the adder node as soon as the integer source is done. This is accomplished by -<<<<<<< HEAD -configuring the adder node with an alternative input stream hander, -======= configuring the adder node with an alternative input stream handler, ->>>>>>> Project import generated by Copybara. `EarlyCloseInputStreamHandler`. ## Relevant Source Code diff --git a/mediapipe/docs/examples.md b/mediapipe/docs/examples.md index aa503bbfc..6e3156283 100644 --- a/mediapipe/docs/examples.md +++ b/mediapipe/docs/examples.md @@ -85,14 +85,11 @@ and model details are described in the [Hello World for C++](./hello_world_desktop.md) shows how to run a simple graph using the MediaPipe C++ APIs. -<<<<<<< HEAD -======= ### Feature Extration for YouTube-8M Challenge [Feature Extration for YouTube-8M Challenge](./youtube_8m.md) shows how to use MediaPipe to prepare training data for the YouTube-8M Challenge. ->>>>>>> Project import generated by Copybara. ### Preparing Data Sets with MediaSequence [Preparing Data Sets with MediaSequence](./media_sequence.md) shows how to use diff --git a/mediapipe/docs/framework_concepts.md b/mediapipe/docs/framework_concepts.md index 9c837514a..a2bf2ee67 100644 --- a/mediapipe/docs/framework_concepts.md +++ b/mediapipe/docs/framework_concepts.md @@ -17,11 +17,7 @@ packets and produces zero or more output streams and/or side packets. ### CalculatorBase A calculator is created by defining a new sub-class of the -<<<<<<< HEAD -[`CalculatorBase`](http://github.com/google/mediapipe/mediapipe/framework/calculator_base.cc) -======= [`CalculatorBase`](https://github.com/google/mediapipe/tree/master/mediapipe/framework/calculator_base.cc) ->>>>>>> Project import generated by Copybara. class, implementing a number of methods, and registering the new sub-class with Mediapipe. At a minimum, a new calculator must implement the below four methods @@ -35,11 +31,7 @@ Mediapipe. At a minimum, a new calculator must implement the below four methods * After all calls to `Process()` finish or when all input streams close, the framework calls `Close()`. This function is always called if `Open()` was called and succeeded and even if the graph run terminated because of an error. No inputs are available via any input streams during `Close()`, but it still has access to input side packets and therefore may write outputs. After `Close()` returns, the calculator should be considered a dead node. The calculator object is destroyed as soon as the graph finishes running. The following are code snippets from -<<<<<<< HEAD -[CalculatorBase.h](http://github.com/google/mediapipe/mediapipe/framework/calculator_base.h). -======= [CalculatorBase.h](https://github.com/google/mediapipe/tree/master/mediapipe/framework/calculator_base.h). ->>>>>>> Project import generated by Copybara. ```c++ class CalculatorBase { diff --git a/mediapipe/docs/hello_world_android.md b/mediapipe/docs/hello_world_android.md index d9feae7eb..35f628349 100644 --- a/mediapipe/docs/hello_world_android.md +++ b/mediapipe/docs/hello_world_android.md @@ -643,11 +643,7 @@ Initialize the asset manager in `onCreate(Bundle)` before initializing `eglManager`: ``` -<<<<<<< HEAD -// Initilize asset manager so that MediaPipe native libraries can access the app assets, e.g., -======= // Initialize asset manager so that MediaPipe native libraries can access the app assets, e.g., ->>>>>>> Project import generated by Copybara. // binary graphs. AndroidAssetUtil.initializeNativeAssetManager(this); ``` diff --git a/mediapipe/docs/hello_world_ios.md b/mediapipe/docs/hello_world_ios.md index 3ed989da1..76cc8afb3 100644 --- a/mediapipe/docs/hello_world_ios.md +++ b/mediapipe/docs/hello_world_ios.md @@ -6,11 +6,7 @@ This codelab uses MediaPipe on an iOS device. ### What you will learn -<<<<<<< HEAD -How to develop an Android application that uses MediaPipe and run a MediaPipe -======= How to develop an iOS application that uses MediaPipe and run a MediaPipe ->>>>>>> Project import generated by Copybara. graph on iOS. ### What you will build diff --git a/mediapipe/docs/help.md b/mediapipe/docs/help.md index 362f021de..6667afb78 100644 --- a/mediapipe/docs/help.md +++ b/mediapipe/docs/help.md @@ -1,18 +1,9 @@ -<<<<<<< HEAD -## Getting help - -- [Technical questions](#technical-questions) -- [Bugs and Feature requests](#bugs-and-feature-requests) - -Below are the various ways to get help -======= ## Getting Help - [Technical questions](#technical-questions) - [Bugs and feature requests](#bugs-and-feature-requests) Below are the various ways to get help: ->>>>>>> Project import generated by Copybara. ### Technical questions @@ -20,14 +11,6 @@ For help with technical or algorithmic questions, visit [Stack Overflow](https://stackoverflow.com/questions/tagged/mediapipe) to find answers and support from the MediaPipe community. -<<<<<<< HEAD -### Bugs and Feature requests - -To report bugs or make feature requests, -[file an issue on GitHub](https://github.com/google/mediapipe/mediapipe/issues). -Please choose the appropriate repository for the project from the -[MediaPipe repo](https://github.com/google/mediapipe/mediapipe) -======= ### Bugs and feature requests To report bugs or make feature requests, @@ -56,4 +39,3 @@ Describe the problem clearly here. Be sure to convey here why it's a bug in Medi ### Source code / logs Include any logs or source code that would be helpful to diagnose the problem. If including tracebacks, please include the full traceback. Large logs and files should be attached instead of being pasted into the issue as text. ->>>>>>> Project import generated by Copybara. diff --git a/mediapipe/docs/install.md b/mediapipe/docs/install.md index a6aa2c11b..3c18f83a4 100644 --- a/mediapipe/docs/install.md +++ b/mediapipe/docs/install.md @@ -49,17 +49,10 @@ To build and run iOS apps: [documentation](https://docs.bazel.build/versions/master/install-ubuntu.html) to install any version of Bazel manually. -<<<<<<< HEAD -3. Install OpenCV. - - Option 1. Use package manager tool to install the pre-compiled OpenCV - libraries. -======= 3. Install OpenCV and FFmpeg. Option 1. Use package manager tool to install the pre-compiled OpenCV libraries. FFmpeg will be installed via libopencv-video-dev. ->>>>>>> Project import generated by Copybara. Note: Debian 9 and Ubuntu 16.04 provide OpenCV 2.4.9. You may want to take option 2 or 3 to install OpenCV 3 or above. @@ -90,26 +83,6 @@ To build and run iOS apps: ) cc_library( -<<<<<<< HEAD - name = "opencv", - srcs = glob( - [ - "lib/libopencv_core.so*", - "lib/libopencv_highgui.so*", - "lib/libopencv_imgcodecs.so*", - "lib/libopencv_imgproc.so*", - "lib/libopencv_video.so*", - "lib/libopencv_videoio.so*", - - ], - ), - hdrs = glob(["include/opencv4/**/*.h*"]), - includes = ["include/opencv4/"], - linkstatic = 1, - visibility = ["//visibility:public"], - ) - -======= name = "opencv", srcs = glob( [ @@ -126,7 +99,6 @@ To build and run iOS apps: linkstatic = 1, visibility = ["//visibility:public"], ) ->>>>>>> Project import generated by Copybara. ``` 4. Run the [Hello World desktop example](./hello_world_desktop.md). @@ -194,26 +166,6 @@ To build and run iOS apps: ) cc_library( -<<<<<<< HEAD - name = "opencv", - srcs = glob( - [ - "lib/libopencv_core.so*", - "lib/libopencv_highgui.so*", - "lib/libopencv_imgcodecs.so*", - "lib/libopencv_imgproc.so*", - "lib/libopencv_video.so*", - "lib/libopencv_videoio.so*", - - ], - ), - hdrs = glob(["include/opencv4/**/*.h*"]), - includes = ["include/opencv4/"], - linkstatic = 1, - visibility = ["//visibility:public"], - ) - -======= name = "opencv", srcs = glob( [ @@ -230,7 +182,6 @@ To build and run iOS apps: linkstatic = 1, visibility = ["//visibility:public"], ) ->>>>>>> Project import generated by Copybara. ``` 4. Run the [Hello World desktop example](./hello_world_desktop.md). @@ -284,17 +235,10 @@ To build and run iOS apps: [documentation](https://docs.bazel.build/versions/master/install-ubuntu.html) to install any version of Bazel manually. -<<<<<<< HEAD -4. Install OpenCV. - - Option 1. Use HomeBrew package manager tool to install the pre-compiled - OpenCV libraries. -======= 4. Install OpenCV and FFmpeg. Option 1. Use HomeBrew package manager tool to install the pre-compiled OpenCV libraries. FFmpeg will be installed via OpenCV. ->>>>>>> Project import generated by Copybara. ```bash $ brew install opencv @@ -306,35 +250,6 @@ To build and run iOS apps: $ port install opencv ``` -<<<<<<< HEAD - Note: when using MacPorts, please edit the [`WORKSAPCE`] and - [`opencv_linux.BUILD`] files like the following: - - ```bash - new_local_repository( - name = "macos_opencv", - build_file = "@//third_party:opencv_macos.BUILD", - path = "/opt", - ) - - cc_library( - name = "opencv", - srcs = glob( - [ - "local/lib/libopencv_core.dylib", - "local/lib/libopencv_highgui.dylib", - "local/lib/libopencv_imgcodecs.dylib", - "local/lib/libopencv_imgproc.dylib", - "local/lib/libopencv_video.dylib", - "local/lib/libopencv_videoio.dylib", - ], - ), - hdrs = glob(["local/include/opencv2/**/*.h*"]), - includes = ["local/include/"], - linkstatic = 1, - visibility = ["//visibility:public"], - ) -======= Note: when using MacPorts, please edit the [`WORKSAPCE`], [`opencv_macos.BUILD`], and [`ffmpeg_macos.BUILD`] files like the following: @@ -387,7 +302,6 @@ To build and run iOS apps: visibility = ["//visibility:public"], ) ->>>>>>> Project import generated by Copybara. ``` 5. Run the [Hello World desktop example](./hello_world_desktop.md). @@ -457,17 +371,10 @@ To build and run iOS apps: username@DESKTOP-TMVLBJ1:~$ cd mediapipe ``` -<<<<<<< HEAD -7. Install OpenCV. - - Option 1. Use package manager tool to install the pre-compiled OpenCV - libraries. -======= 7. Install OpenCV and FFmpeg. Option 1. Use package manager tool to install the pre-compiled OpenCV libraries. FFmpeg will be installed via libopencv-video-dev. ->>>>>>> Project import generated by Copybara. ```bash username@DESKTOP-TMVLBJ1:~/mediapipe$ sudo apt-get install libopencv-core-dev libopencv-highgui-dev \ @@ -495,26 +402,6 @@ To build and run iOS apps: ) cc_library( -<<<<<<< HEAD - name = "opencv", - srcs = glob( - [ - "lib/libopencv_core.so*", - "lib/libopencv_highgui.so*", - "lib/libopencv_imgcodecs.so*", - "lib/libopencv_imgproc.so*", - "lib/libopencv_video.so*", - "lib/libopencv_videoio.so*", - - ], - ), - hdrs = glob(["include/opencv4/**/*.h*"]), - includes = ["include/opencv4/"], - linkstatic = 1, - visibility = ["//visibility:public"], - ) - -======= name = "opencv", srcs = glob( [ @@ -531,7 +418,6 @@ To build and run iOS apps: linkstatic = 1, visibility = ["//visibility:public"], ) ->>>>>>> Project import generated by Copybara. ``` 8. Run the [Hello World desktop example](./hello_world_desktop.md). @@ -561,11 +447,7 @@ To build and run iOS apps: This will use a Docker image that will isolate mediapipe's installation from the rest of the system. 1. [Install Docker](https://docs.docker.com/install/#supported-platforms) on -<<<<<<< HEAD - your host sytem. -======= your host system. ->>>>>>> Project import generated by Copybara. 2. Build a docker image with tag "mediapipe". @@ -610,9 +492,6 @@ This will use a Docker image that will isolate mediapipe's installation from the # Hello World! ``` -<<<<<<< HEAD -