Skip to content
Permalink
Browse files

Project import generated by Copybara.

PiperOrigin-RevId: 267280553
  • Loading branch information...
MediaPipe Team jqtang
MediaPipe Team authored and jqtang committed Sep 5, 2019
1 parent af67642 commit dc9216dc595585d495250d0692afe35985d816ff
Showing with 0 additions and 582 deletions.
  1. +0 −7 Dockerfile
  2. +0 −9 mediapipe/calculators/audio/BUILD
  3. +0 −4 mediapipe/calculators/audio/audio_decoder_calculator.cc
  4. +0 −25 mediapipe/calculators/audio/mfcc_mel_calculators.cc
  5. +0 −5 mediapipe/calculators/audio/rational_factor_resample_calculator.cc
  6. +0 −16 mediapipe/calculators/audio/spectrogram_calculator.cc
  7. +0 −3 mediapipe/calculators/audio/spectrogram_calculator.proto
  8. +0 −5 mediapipe/calculators/audio/time_series_framer_calculator.cc
  9. +0 −9 mediapipe/calculators/core/BUILD
  10. +0 −6 mediapipe/calculators/core/concatenate_vector_calculator.cc
  11. +0 −6 mediapipe/calculators/core/split_vector_calculator.cc
  12. +0 −4 mediapipe/calculators/image/image_transformation_calculator.cc
  13. +0 −9 mediapipe/calculators/tensorflow/BUILD
  14. +0 −9 mediapipe/calculators/tensorflow/tensorflow_inference_calculator.cc
  15. +0 −12 mediapipe/calculators/tflite/BUILD
  16. +0 −5 mediapipe/calculators/tflite/tflite_inference_calculator.cc
  17. +0 −8 mediapipe/calculators/video/opencv_video_decoder_calculator.cc
  18. +0 −4 mediapipe/docs/cycles.md
  19. +0 −3 mediapipe/docs/examples.md
  20. +0 −8 mediapipe/docs/framework_concepts.md
  21. +0 −4 mediapipe/docs/hello_world_android.md
  22. +0 −4 mediapipe/docs/hello_world_ios.md
  23. +0 −18 mediapipe/docs/help.md
  24. +0 −125 mediapipe/docs/install.md
  25. +0 −8 mediapipe/docs/media_sequence.md
  26. +0 −14 mediapipe/docs/mediapipe_ios_setup.md
  27. +0 −4 mediapipe/docs/troubleshooting.md
  28. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/edgedetectiongpu/MainActivity.java
  29. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/facedetectioncpu/MainActivity.java
  30. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/facedetectiongpu/MainActivity.java
  31. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/hairsegmentationgpu/MainActivity.java
  32. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/handdetectiongpu/MainActivity.java
  33. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/handtrackinggpu/MainActivity.java
  34. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/objectdetectioncpu/MainActivity.java
  35. +0 −4 mediapipe/examples/android/src/java/com/google/mediapipe/apps/objectdetectiongpu/MainActivity.java
  36. +0 −54 mediapipe/examples/desktop/README.md
  37. +0 −18 mediapipe/examples/ios/facedetectiongpu/Base.lproj/Main.storyboard
  38. +0 −7 mediapipe/examples/ios/handdetectiongpu/Base.lproj/Main.storyboard
  39. +0 −7 mediapipe/examples/ios/handtrackinggpu/Base.lproj/Main.storyboard
  40. +0 −7 mediapipe/examples/ios/objectdetectiongpu/Base.lproj/Main.storyboard
  41. +0 −8 mediapipe/framework/BUILD
  42. +0 −6 mediapipe/framework/formats/BUILD
  43. +0 −12 mediapipe/framework/graph_validation_test.cc
  44. +0 −4 mediapipe/framework/profiler/graph_profiler.cc
  45. +0 −11 mediapipe/framework/stream_handler/fixed_size_input_stream_handler.cc
  46. +0 −4 mediapipe/java/com/google/mediapipe/components/BUILD
  47. +0 −4 mediapipe/java/com/google/mediapipe/components/ExternalTextureConverter.java
  48. +0 −8 mediapipe/util/audio_decoder.cc
  49. +0 −7 mediapipe/util/audio_decoder.h
  50. +0 −6 mediapipe/util/sequence/README.md
  51. +0 −12 mediapipe/util/sequence/media_sequence.h
  52. +0 −12 mediapipe/util/sequence/media_sequence.py
  53. +0 −6 mediapipe/util/sequence/media_sequence_test.cc
  54. +0 −6 mediapipe/util/sequence/media_sequence_test.py
  55. +0 −4 setup_android_sdk_and_ndk.sh
  56. +0 −4 third_party/ffmpeg_linux.BUILD
  57. +0 −9 third_party/opencv_linux.BUILD
@@ -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/*

@@ -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 = [
@@ -64,11 +64,7 @@ ::mediapipe::Status AudioDecoderCalculator::GetContract(

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();
}
@@ -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 @@ ::mediapipe::Status FramewiseTransformCalculatorBase::Open(
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());
@@ -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(
@@ -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 @@ ::mediapipe::Status SpectrogramCalculator::Open(CalculatorContext* cc) {

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);
@@ -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];

@@ -206,13 +206,8 @@ ::mediapipe::Status TimeSeriesFramerCalculator::Close(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. "
@@ -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"],
@@ -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
@@ -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
@@ -244,11 +244,7 @@ ::mediapipe::Status ImageTransformationCalculator::Open(CalculatorContext* cc) {
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);
@@ -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"],

0 comments on commit dc9216d

Please sign in to comment.
You can’t perform that action at this time.