From a58f24f1ee0e25b22ceb31d2841fd73b770eabba Mon Sep 17 00:00:00 2001 From: Carol Nowacki Date: Wed, 17 Oct 2018 15:12:24 -0400 Subject: [PATCH 1/4] added MPFDetectionObjects.h to the list of API include files --- detection/api/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/detection/api/CMakeLists.txt b/detection/api/CMakeLists.txt index 96fe38b..093d436 100644 --- a/detection/api/CMakeLists.txt +++ b/detection/api/CMakeLists.txt @@ -36,6 +36,7 @@ find_package(OpenCV 3.3 EXACT REQUIRED PATHS /opt/opencv-3.3.0 include_directories(include) set(SOURCE_FILES + include/MPFDetectionObjects.h include/MPFDetectionComponent.h include/MPFStreamingDetectionComponent.h From b175256ede4f522236d8d140ee6845187aa83ce6 Mon Sep 17 00:00:00 2001 From: brosenberg42 Date: Fri, 30 Nov 2018 08:01:30 -0500 Subject: [PATCH 2/4] Add docker repo link to README (#71) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d215376..3ef0d28 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ Using this API, detection components can be built to provide: * [OpenMPF Python Component SDK](https://github.com/openmpf/openmpf-python-component-sdk) - [OpenMPF Build Tools](https://github.com/openmpf/openmpf-build-tools) - [OpenMPF Web Site Source](https://github.com/openmpf/openmpf.github.io) +- [OpenMPF Docker](https://github.com/openmpf/openmpf-docker) ## Getting Started From 04f24e301c725b12ccaf4e9ebc6980abb519d853 Mon Sep 17 00:00:00 2001 From: Jeff Robble Date: Tue, 11 Dec 2018 16:40:25 -0500 Subject: [PATCH 3/4] Updated version to 3.0.0. (#72) --- .../plugin-files/descriptor/descriptor.json | 4 ++-- .../plugin-files/descriptor/descriptor.json | 4 ++-- .../GenericComponent/plugin-files/descriptor/descriptor.json | 4 ++-- .../plugin-files/descriptor/descriptor.json | 4 ++-- .../plugin-files/descriptor/descriptor.json | 4 ++-- .../plugin-files/descriptor/descriptor.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/detection/examples/AudioOnlyComponent/plugin-files/descriptor/descriptor.json b/detection/examples/AudioOnlyComponent/plugin-files/descriptor/descriptor.json index 858598c..ce3b5e9 100644 --- a/detection/examples/AudioOnlyComponent/plugin-files/descriptor/descriptor.json +++ b/detection/examples/AudioOnlyComponent/plugin-files/descriptor/descriptor.json @@ -1,7 +1,7 @@ { "componentName": "AudioOnlyComponent", - "componentVersion": "2.1.0", - "middlewareVersion": "2.1.0", + "componentVersion": "3.0.0", + "middlewareVersion": "3.0.0", "sourceLanguage": "c++", "batchLibrary": "${MPF_HOME}/plugins/AudioOnlyComponent/lib/libmpfAudioOnly.so", "environmentVariables": [ diff --git a/detection/examples/FrameDataComponent/plugin-files/descriptor/descriptor.json b/detection/examples/FrameDataComponent/plugin-files/descriptor/descriptor.json index 81bd2ee..7cf9bef 100644 --- a/detection/examples/FrameDataComponent/plugin-files/descriptor/descriptor.json +++ b/detection/examples/FrameDataComponent/plugin-files/descriptor/descriptor.json @@ -1,7 +1,7 @@ { "componentName": "FrameDataComponent", - "componentVersion": "2.1.0", - "middlewareVersion": "2.1.0", + "componentVersion": "3.0.0", + "middlewareVersion": "3.0.0", "sourceLanguage": "c++", "batchLibrary": "${MPF_HOME}/plugins/FrameDataComponent/lib/libmpfFrameData.so", "environmentVariables": [ diff --git a/detection/examples/GenericComponent/plugin-files/descriptor/descriptor.json b/detection/examples/GenericComponent/plugin-files/descriptor/descriptor.json index e43dc70..e72e22f 100644 --- a/detection/examples/GenericComponent/plugin-files/descriptor/descriptor.json +++ b/detection/examples/GenericComponent/plugin-files/descriptor/descriptor.json @@ -1,7 +1,7 @@ { "componentName": "GenericComponent", - "componentVersion": "2.1.0", - "middlewareVersion": "2.1.0", + "componentVersion": "3.0.0", + "middlewareVersion": "3.0.0", "sourceLanguage": "c++", "batchLibrary": "${MPF_HOME}/plugins/GenericComponent/lib/libmpfGeneric.so", "environmentVariables": [ diff --git a/detection/examples/HelloWorldComponent/plugin-files/descriptor/descriptor.json b/detection/examples/HelloWorldComponent/plugin-files/descriptor/descriptor.json index 9889608..5190920 100644 --- a/detection/examples/HelloWorldComponent/plugin-files/descriptor/descriptor.json +++ b/detection/examples/HelloWorldComponent/plugin-files/descriptor/descriptor.json @@ -1,7 +1,7 @@ { "componentName": "HelloWorldComponent", - "componentVersion": "2.1.0", - "middlewareVersion": "2.1.0", + "componentVersion": "3.0.0", + "middlewareVersion": "3.0.0", "sourceLanguage": "c++", "batchLibrary": "${MPF_HOME}/plugins/HelloWorldComponent/lib/libmpfHelloWorld.so", "streamLibrary": "${MPF_HOME}/plugins/HelloWorldComponent/lib/libmpfStreamingHelloWorld.so", diff --git a/detection/examples/ImageTransformerComponent/plugin-files/descriptor/descriptor.json b/detection/examples/ImageTransformerComponent/plugin-files/descriptor/descriptor.json index 9a6138b..f2633a6 100644 --- a/detection/examples/ImageTransformerComponent/plugin-files/descriptor/descriptor.json +++ b/detection/examples/ImageTransformerComponent/plugin-files/descriptor/descriptor.json @@ -1,7 +1,7 @@ { "componentName": "ImageTransformerComponent", - "componentVersion": "2.1.0", - "middlewareVersion": "2.1.0", + "componentVersion": "3.0.0", + "middlewareVersion": "3.0.0", "sourceLanguage": "c++", "batchLibrary": "${MPF_HOME}/plugins/ImageTransformerComponent/lib/libmpfImageTransformer.so", "environmentVariables": [ diff --git a/detection/examples/VideoCaptureComponent/plugin-files/descriptor/descriptor.json b/detection/examples/VideoCaptureComponent/plugin-files/descriptor/descriptor.json index 5b365c3..5f5e462 100644 --- a/detection/examples/VideoCaptureComponent/plugin-files/descriptor/descriptor.json +++ b/detection/examples/VideoCaptureComponent/plugin-files/descriptor/descriptor.json @@ -1,7 +1,7 @@ { "componentName": "VideoCaptureComponent", - "componentVersion": "2.1.0", - "middlewareVersion": "2.1.0", + "componentVersion": "3.0.0", + "middlewareVersion": "3.0.0", "sourceLanguage": "c++", "batchLibrary": "${MPF_HOME}/plugins/VideoCaptureComponent/lib/libmpfVideoCapture.so", "environmentVariables": [ From 15a3eb5ac4a2cb64ab32036dc369f7a220771c95 Mon Sep 17 00:00:00 2001 From: brosenberg42 Date: Thu, 13 Dec 2018 08:25:06 -0500 Subject: [PATCH 4/4] Add MPFVideoCapture constructor that takes a single string parameter. (#73) --- detection/api/include/MPFVideoCapture.h | 2 ++ detection/api/src/MPFVideoCapture.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/detection/api/include/MPFVideoCapture.h b/detection/api/include/MPFVideoCapture.h index f11cc6c..ab74348 100644 --- a/detection/api/include/MPFVideoCapture.h +++ b/detection/api/include/MPFVideoCapture.h @@ -57,6 +57,8 @@ namespace MPF { namespace COMPONENT { explicit MPFVideoCapture(const MPFVideoJob &videoJob, bool enableFrameTransformers=true, bool enableFrameFiltering=true); + explicit MPFVideoCapture(const std::string &videoPath); + bool Read(cv::Mat &frame); diff --git a/detection/api/src/MPFVideoCapture.cpp b/detection/api/src/MPFVideoCapture.cpp index c057fff..b5205fe 100644 --- a/detection/api/src/MPFVideoCapture.cpp +++ b/detection/api/src/MPFVideoCapture.cpp @@ -60,6 +60,12 @@ namespace MPF { namespace COMPONENT { } + MPFVideoCapture::MPFVideoCapture(const std::string &videoPath) + : MPFVideoCapture(MPFVideoJob("", videoPath, 0, -1, {}, {}), false, false) + { + } + + IFrameTransformer::Ptr MPFVideoCapture::GetFrameTransformer(bool enableFrameTransformers, const MPFVideoJob &job) const { if (enableFrameTransformers) {