Skip to content

Preliminary integration of the frame reader and single stage component executor #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: streaming_integration
Choose a base branch
from
Open

Preliminary integration of the frame reader and single stage component executor #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a58f24f
added MPFDetectionObjects.h to the list of API include files
clnowacki Oct 17, 2018
01b14ef
Merge branch 'develop' of github.com:openmpf/openmpf-cpp-component-sd…
clnowacki Oct 25, 2018
b175256
Add docker repo link to README (#71)
brosenberg42 Nov 30, 2018
35103d1
Merge branch 'develop' of github.com:openmpf/openmpf-cpp-component-sd…
clnowacki Nov 30, 2018
04f24e3
Updated version to 3.0.0. (#72)
jrobble Dec 11, 2018
71ecb9c
Merge branch 'develop' of github.com:openmpf/openmpf-cpp-component-sd…
clnowacki Dec 12, 2018
15a3eb5
Add MPFVideoCapture constructor that takes a single string parameter.…
brosenberg42 Dec 13, 2018
7d5a74e
Merge branch 'develop' of github.com:openmpf/openmpf-cpp-component-sd…
clnowacki Dec 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions detection/api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions detection/api/include/MPFVideoCapture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 6 additions & 0 deletions detection/api/src/MPFVideoCapture.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions detection/examples/AudioOnlyComponent/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions detection/examples/FrameDataComponent/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions detection/examples/GenericComponent/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions detection/examples/HelloWorldComponent/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions detection/examples/ImageTransformerComponent/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions detection/examples/VideoCaptureComponent/plugin-files/descriptor/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down