Merge e6d74b695b into ecb5b5f44a

Dockerfile

@@ -30,8 +30,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         wget \
         unzip \
         python3-dev \
-        python3-opencv \
         python3-pip \
+        python3-opencv \
         libopencv-core-dev \
         libopencv-highgui-dev \
         libopencv-imgproc-dev \
@@ -44,20 +44,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
+RUN wget -O /mediapipe/BBB.mp4 https://download.blender.org/peach/bigbuckbunny_movies/BigBuckBunny_320x180.mp4
+
 RUN pip3 install --upgrade setuptools
-RUN pip3 install wheel
 RUN pip3 install future
 RUN pip3 install six==1.14.0
-RUN pip3 install tensorflow==1.14.0
+RUN pip3 install wheel
 RUN pip3 install tf_slim 
+RUN pip3 install tensorflow==1.14.0
 
 RUN ln -s /usr/bin/python3 /usr/bin/python
 
 # Install bazel
 ARG BAZEL_VERSION=3.7.2
 RUN mkdir /bazel && \
-    wget --no-check-certificate -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/b\
-azel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
+    wget --no-check-certificate -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
     wget --no-check-certificate -O  /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
     chmod +x /bazel/installer.sh && \
     /bazel/installer.sh  && \
@@ -65,5 +66,95 @@ azel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
 
 COPY . /mediapipe/
 
+####
+#### BUILD
+####
+
+#object detection TF
+RUN bazel build -c opt \
+    --define MEDIAPIPE_DISABLE_GPU=1 \
+    --define no_aws_support=true \
+    --linkopt=-s \
+    mediapipe/examples/desktop/object_detection:object_detection_tensorflow
+#object detection TFLite
+RUN bazel build -c opt \
+    --define MEDIAPIPE_DISABLE_GPU=1 \
+    mediapipe/examples/desktop/object_detection:object_detection_tflite
+#media sequence
+RUN bazel build -c opt \
+    --define MEDIAPIPE_DISABLE_GPU=1 \
+    mediapipe/examples/desktop/media_sequence:media_sequence_demo
+#autoflip
+RUN bazel build -c opt \
+    --define MEDIAPIPE_DISABLE_GPU=1 \
+    mediapipe/examples/desktop/autoflip:run_autoflip
+
+#yt8m
+RUN mkdir -p /tmp/mediapipe
+WORKDIR /tmp/mediapipe
+RUN curl -O http://data.yt8m.org/pca_matrix_data/inception3_mean_matrix_data.pb
+RUN curl -O http://data.yt8m.org/pca_matrix_data/inception3_projection_matrix_data.pb
+RUN curl -O http://data.yt8m.org/pca_matrix_data/vggish_mean_matrix_data.pb
+RUN curl -O http://data.yt8m.org/pca_matrix_data/vggish_projection_matrix_data.pb
+
+RUN curl -O http://download.tensorflow.org/models/image/imagenet/inception-2015-12-05.tgz
+RUN tar -xzf inception-2015-12-05.tgz
+RUN curl -O http://data.yt8m.org/models/baseline/saved_model.tar.gz
+RUN tar -xf saved_model.tar.gz
+
+WORKDIR /mediapipe
+RUN bazel build -c opt \
+    --define MEDIAPIPE_DISABLE_GPU=1 \
+    --linkopt=-s \
+    --define no_aws_support=true \
+    mediapipe/examples/desktop/youtube8m:extract_yt8m_features
+RUN bazel build -c opt \
+    --define='MEDIAPIPE_DISABLE_GPU=1' \
+    --linkopt=-s \
+    mediapipe/examples/desktop/youtube8m:model_inference
+RUN bazel build -c opt \
+    --define='MEDIAPIPE_DISABLE_GPU=1' \
+    --linkopt=-s \
+    mediapipe/examples/desktop/youtube8m:model_inference
+
+
+####
+#### RUN
+####
+
+#object detection TF
+RUN GLOG_logtostderr=1 bazel-bin/mediapipe/examples/desktop/object_detection/object_detection_tensorflow \
+    --calculator_graph_config_file=mediapipe/graphs/object_detection/object_detection_desktop_tensorflow_graph.pbtxt \
+    --input_side_packets=input_video_path=mediapipe/examples/desktop/object_detection/test_video.mp4,output_video_path=/tmp/output-tensorflow.mp4
+#object detection TFLite
+RUN GLOG_logtostderr=1 bazel-bin/mediapipe/examples/desktop/object_detection/object_detection_tflite \
+    --calculator_graph_config_file=mediapipe/graphs/object_detection/object_detection_desktop_tflite_graph.pbtxt \
+    --input_side_packets=input_video_path=mediapipe/examples/desktop/object_detection/test_video.mp4,output_video_path=/tmp/output-tflite.mp4
+
+#media sequence
+#TODO add python
+RUN python -m mediapipe.examples.desktop.media_sequence.demo_dataset \
+    --path_to_demo_data=/tmp/demo_data/ \
+    --path_to_mediapipe_binary=bazel-bin/mediapipe/examples/desktop/media_sequence/media_sequence_demo \
+    --path_to_graph_directory=mediapipe/graphs/media_sequence/
+RUN PYTHONPATH=$PYTHONPATH:/mediapipe python ./mediapipe/examples/desktop/media_sequence/read_demo_dataset.py
+
+#autoflip
+RUN GLOG_logtostderr=1 bazel-bin/mediapipe/examples/desktop/autoflip/run_autoflip \
+    --calculator_graph_config_file=mediapipe/examples/desktop/autoflip/autoflip_graph.pbtxt \
+    --input_side_packets=input_video_path=mediapipe/examples/desktop/object_detection/test_video.mp4,output_video_path=/tmp/output-autoflip.mp4,aspect_ratio=1:1
+
+#yt8m
+RUN python3 -m mediapipe.examples.desktop.youtube8m.generate_vggish_frozen_graph
+RUN python3 -m mediapipe.examples.desktop.youtube8m.generate_input_sequence_example \
+    --path_to_input_video=/mediapipe/BBB.mp4 \
+    --clip_end_time_sec=120
+
+RUN GLOG_logtostderr=1 bazel-bin/mediapipe/examples/desktop/youtube8m/extract_yt8m_features \
+    --calculator_graph_config_file=mediapipe/graphs/youtube8m/feature_extraction.pbtxt \
+    --input_side_packets=input_sequence_example=/tmp/mediapipe/metadata.pb  \
+    --output_side_packets=output_sequence_example=/tmp/mediapipe/features.pb
+
 # If we want the docker image to contain the pre-built object_detection_offline_demo binary, do the following
 # RUN bazel build -c opt --define MEDIAPIPE_DISABLE_GPU=1 mediapipe/examples/desktop/demo:object_detection_tensorflow_demo
+

docs/solutions/media_sequence.md

@@ -98,10 +98,7 @@ process new data sets, in the documentation of
     PYTHONPATH="${PYTHONPATH};"+`pwd`
     ```
 
-    and then you can import the data set in Python using
-    [read_demo_dataset.py](https://github.com/google/mediapipe/tree/master/mediapipe/examples/desktop/media_sequence/read_demo_dataset.py)
-
-## Preparing a practical data set
+    and then you can import the data set in Python using [read_demo_dataset.py](mediapipe/examples/desktop/media_sequence/read_demo_dataset.py)
 
 As an example of processing a practical data set, a similar set of commands will
 prepare the [Charades data set](https://allenai.org/plato/charades/). The

mediapipe/examples/desktop/media_sequence/read_demo_dataset.py

@@ -1,3 +1,20 @@
+<<<<<<< HEAD
+import tensorflow as tf
+from mediapipe.examples.desktop.media_sequence.demo_dataset import DemoDataset
+demo_data_path = '/tmp/demo_data/'
+with tf.Graph().as_default():
+   d = DemoDataset(demo_data_path)
+   dataset = d.as_dataset('test')
+   # implement additional processing and batching here
+   dataset_output = dataset.make_one_shot_iterator().get_next()
+   images = dataset_output['images']
+   labels = dataset_output['labels']
+
+   with tf.Session() as sess:
+     images_, labels_ = sess.run([images, labels])
+   print('The shape of images_ is %s' % str(images_.shape))
+   print('The shape of labels_ is %s' % str(labels_.shape))
+=======
 # Copyright 2020 The MediaPipe Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,3 +62,4 @@ def main(argv):
 
 if __name__ == '__main__':
   app.run(main)
+>>>>>>> e9fbe868e55fa23aaabc31f9f847c22287062850

mediapipe/graphs/object_detection/object_detection_desktop_tflite_graph.pbtxt

@@ -173,7 +173,9 @@ node {
   input_side_packet: "OUTPUT_FILE_PATH:output_video_path"
   node_options: {
     [type.googleapis.com/mediapipe.OpenCvVideoEncoderCalculatorOptions]: {
+#MPEG
       codec: "avc1"
+#mkv
       video_format: "mp4"
     }
   }