diff --git a/mediapipe/docs/hello_world_desktop.md b/mediapipe/docs/hello_world_desktop.md index 21d6ae933..b31994d2a 100644 --- a/mediapipe/docs/hello_world_desktop.md +++ b/mediapipe/docs/hello_world_desktop.md @@ -9,6 +9,7 @@ $ git clone https://github.com/google/mediapipe/mediapipe.git $ cd mediapipe + $ export GLOG_logtostderr=1 # Need bazel flag 'MEDIAPIPE_DISABLE_GPU=1' as desktop GPU is not supported currently. $ bazel run --define 'MEDIAPIPE_DISABLE_GPU=1' \ mediapipe/examples/desktop/hello_world:hello_world diff --git a/mediapipe/docs/help.md b/mediapipe/docs/help.md index 3e104b25d..d1873a4ac 100644 --- a/mediapipe/docs/help.md +++ b/mediapipe/docs/help.md @@ -14,6 +14,6 @@ answers and support from the MediaPipe community. ### Bugs and Feature requests To report bugs or make feature requests, -[file an issue on Github](https://github.com/google/mediapipe/mediapipe/issues). +[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) diff --git a/mediapipe/docs/images/favicon.ico b/mediapipe/docs/images/favicon.ico new file mode 100644 index 000000000..9ac07a20c Binary files /dev/null and b/mediapipe/docs/images/favicon.ico differ diff --git a/mediapipe/docs/images/logo.png b/mediapipe/docs/images/logo.png new file mode 100644 index 000000000..1cca19eb2 Binary files /dev/null and b/mediapipe/docs/images/logo.png differ diff --git a/mediapipe/docs/images/mobile/object_detection_desktop_tflite.png b/mediapipe/docs/images/mobile/object_detection_desktop_tflite.png deleted file mode 100644 index f987f1db3..000000000 Binary files a/mediapipe/docs/images/mobile/object_detection_desktop_tflite.png and /dev/null differ diff --git a/mediapipe/docs/images/object_detection_desktop_tflite.png b/mediapipe/docs/images/object_detection_desktop_tflite.png index 2dfa5084a..f987f1db3 100644 Binary files a/mediapipe/docs/images/object_detection_desktop_tflite.png and b/mediapipe/docs/images/object_detection_desktop_tflite.png differ diff --git a/mediapipe/docs/install.md b/mediapipe/docs/install.md index 0308fcc35..1a53ac02a 100644 --- a/mediapipe/docs/install.md +++ b/mediapipe/docs/install.md @@ -107,6 +107,7 @@ Required libraries 4. Run the hello world desktop example ```bash + $ export GLOG_logtostderr=1 # Need bazel flag 'MEDIAPIPE_DISABLE_GPU=1' as desktop GPU is currently not supported $ bazel run --define 'MEDIAPIPE_DISABLE_GPU=1' \ mediapipe/examples/desktop/hello_world:hello_world @@ -191,6 +192,7 @@ Required libraries 4. Run the hello world desktop example ```bash + $ export GLOG_logtostderr=1 # Need bazel flag 'MEDIAPIPE_DISABLE_GPU=1' as desktop GPU is currently not supported $ bazel run --define 'MEDIAPIPE_DISABLE_GPU=1' \ mediapipe/examples/desktop/hello_world:hello_world @@ -279,6 +281,7 @@ Required libraries 4. Run the hello world desktop example ```bash + $ export GLOG_logtostderr=1 # Need bazel flag 'MEDIAPIPE_DISABLE_GPU=1' as desktop GPU is currently not supported $ bazel run --define 'MEDIAPIPE_DISABLE_GPU=1' \ mediapipe/examples/desktop/hello_world:hello_world @@ -331,7 +334,7 @@ This will use a Docker image that will isolate mediapipe's installation from the ```bash $ docker run -it --name mediapipe mediapipe:latest - root@bca08b91ff63:/mediapipe# bazel run --define 'MEDIAPIPE_DISABLE_GPU=1' mediapipe/examples/desktop/hello_world:hello_world + root@bca08b91ff63:/mediapipe# GLOG_logtostderr=1 bazel run --define 'MEDIAPIPE_DISABLE_GPU=1' mediapipe/examples/desktop/hello_world:hello_world # Should print: # Hello World! diff --git a/mediapipe/docs/object_detection_desktop.md b/mediapipe/docs/object_detection_desktop.md index c6c62fa59..9222e903b 100644 --- a/mediapipe/docs/object_detection_desktop.md +++ b/mediapipe/docs/object_detection_desktop.md @@ -34,6 +34,7 @@ $ bazel build -c opt \ # INFO: 2675 processes: 2673 linux-sandbox, 2 local. # INFO: Build completed successfully, 2807 total actions +$ export GLOG_logtostderr=1 # Replace and . # You can find a test video in mediapipe/examples/desktop/object_detection. $ bazel-bin/mediapipe/examples/desktop/object_detection/object_detection_tensorflow \ @@ -198,6 +199,7 @@ $ bazel build -c opt --define 'MEDIAPIPE_DISABLE_GPU=1' \ # INFO: 711 processes: 710 linux-sandbox, 1 local. # INFO: Build completed successfully, 734 total actions +$ export GLOG_logtostderr=1 # Replace and . # You can find a test video in mediapipe/examples/desktop/object_detection. $ bazel-bin/mediapipe/examples/desktop/object_detection/object_detection_tflite \ diff --git a/mediapipe/examples/desktop/hello_world/hello_world.cc b/mediapipe/examples/desktop/hello_world/hello_world.cc index 0fe378d4b..64f3d348b 100644 --- a/mediapipe/examples/desktop/hello_world/hello_world.cc +++ b/mediapipe/examples/desktop/hello_world/hello_world.cc @@ -60,6 +60,7 @@ namespace mediapipe { } // namespace mediapipe int main(int argc, char** argv) { + google::InitGoogleLogging(argv[0]); CHECK(mediapipe::PrintHelloWorld().ok()); return 0; } diff --git a/mediapipe/examples/desktop/media_sequence/run_graph_file_io_main.cc b/mediapipe/examples/desktop/media_sequence/run_graph_file_io_main.cc index 9a8e44dab..31a6df5bf 100644 --- a/mediapipe/examples/desktop/media_sequence/run_graph_file_io_main.cc +++ b/mediapipe/examples/desktop/media_sequence/run_graph_file_io_main.cc @@ -82,6 +82,7 @@ DEFINE_string(output_side_packets, "", } int main(int argc, char** argv) { + google::InitGoogleLogging(argv[0]); gflags::ParseCommandLineFlags(&argc, &argv, true); ::mediapipe::Status run_status = RunMediaPipeGraph(); if (!run_status.ok()) { diff --git a/mediapipe/examples/desktop/simple_run_graph_main.cc b/mediapipe/examples/desktop/simple_run_graph_main.cc index 5b6eb2876..214ad1fdf 100644 --- a/mediapipe/examples/desktop/simple_run_graph_main.cc +++ b/mediapipe/examples/desktop/simple_run_graph_main.cc @@ -58,6 +58,7 @@ DEFINE_string(input_side_packets, "", } int main(int argc, char** argv) { + google::InitGoogleLogging(argv[0]); gflags::ParseCommandLineFlags(&argc, &argv, true); ::mediapipe::Status run_status = RunMediaPipeGraph(); if (!run_status.ok()) { diff --git a/mediapipe/framework/packet.h b/mediapipe/framework/packet.h index bed981493..f1b6895c8 100644 --- a/mediapipe/framework/packet.h +++ b/mediapipe/framework/packet.h @@ -128,16 +128,16 @@ class Packet { // responsible for ensuring that no other thread is doing anything // with the Packet. // Example usage: - // ASSIGN_OR_RETURN(std::unique_ptr frame, - // p.ConsumeOrCopy()); + // ASSIGN_OR_RETURN(std::unique_ptr detection, + // p.ConsumeOrCopy()); // // The unique_ptr type can be omitted with auto. - // ASSIGN_OR_RETURN(auto frame, p.ConsumeOrCopy()); + // ASSIGN_OR_RETURN(auto detection, p.ConsumeOrCopy()); // If you would like to crash on failure (prefer ASSIGN_OR_RETURN): - // auto frame = p.ConsumeOrCopy().ValueOrDie(); + // auto detection = p.ConsumeOrCopy().ValueOrDie(); // // In functions which do not return ::mediapipe::Status use an adaptor // // function as the third argument to ASSIGN_OR_RETURN. In tests, // // use an adaptor which returns void. - // ASSIGN_OR_RETURN(auto frame, p.ConsumeOrCopy(), + // ASSIGN_OR_RETURN(auto detection, p.ConsumeOrCopy(), // _.With([](const ::mediapipe::Status& status) { // EXPECT_OK(status); // // Use CHECK_OK to crash and report a usable line