openmpf · brosenberg42 · Nov 14, 2023 · Jul 10, 2023 · Jul 10, 2023 · Aug 25, 2023
diff --git a/cpp/KeywordTagging/KeywordTagging.cpp b/cpp/KeywordTagging/KeywordTagging.cpp
@@ -379,10 +379,6 @@ bool KeywordTagging::Close() {
     return true;
 }
 
-string KeywordTagging::GetDetectionType() {
-    return "TEXT";
-}
-
 vector<MPFGenericTrack> KeywordTagging::GetDetections(const MPFGenericJob &job) {
     LOG4CXX_DEBUG(hw_logger_, "Processing \"" + job.data_uri + "\".");
 

diff --git a/cpp/KeywordTagging/KeywordTagging.h b/cpp/KeywordTagging/KeywordTagging.h
@@ -52,8 +52,6 @@ class KeywordTagging : public MPFDetectionComponent {
 
     bool Supports(MPFDetectionDataType data_type) override;
 
-    std::string GetDetectionType() override;
-
 private:
     log4cxx::LoggerPtr hw_logger_;
 

diff --git a/cpp/KeywordTagging/plugin-files/descriptor/descriptor.json b/cpp/KeywordTagging/plugin-files/descriptor/descriptor.json
@@ -15,6 +15,7 @@
     "name": "KEYWORDTAGGING",
     "description": "Performs keyword tagging.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/cpp/OalprLicensePlateTextDetection/LicensePlateTextDetection.cpp b/cpp/OalprLicensePlateTextDetection/LicensePlateTextDetection.cpp
@@ -44,11 +44,6 @@ using namespace alpr;
 using log4cxx::Logger;
 
 
-//-----------------------------------------------------------------------------
-/* virtual */ std::string LicensePlateTextDetection::GetDetectionType() {
-    return "TEXT";
-}
-
 //-----------------------------------------------------------------------------
 /* virtual */ bool LicensePlateTextDetection::Init() {
     //Set locale

diff --git a/cpp/OalprLicensePlateTextDetection/LicensePlateTextDetection.h b/cpp/OalprLicensePlateTextDetection/LicensePlateTextDetection.h
@@ -73,8 +73,6 @@ class LicensePlateTextDetection : public MPF::COMPONENT::MPFImageAndVideoDetecti
      */
     std::vector<MPF::COMPONENT::MPFVideoTrack> GetDetections(const MPF::COMPONENT::MPFVideoJob &job) override;
 
-    std::string GetDetectionType() override;
-
 private:
     std::vector<MPF::COMPONENT::MPFVideoTrack> GetDetectionsFromVideoCapture(
             const MPF::COMPONENT::MPFVideoJob &job,

diff --git a/cpp/OalprLicensePlateTextDetection/plugin-files/descriptor/descriptor.json b/cpp/OalprLicensePlateTextDetection/plugin-files/descriptor/descriptor.json
@@ -15,6 +15,7 @@
     "name": "OALPR",
     "description": "Detects license plate text in images and videos using the Open Automatic License Plate Recognition (OALPR) Library.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/cpp/OcvDnnDetection/OcvDnnDetection.cpp b/cpp/OcvDnnDetection/OcvDnnDetection.cpp
@@ -47,10 +47,6 @@
 
 using namespace MPF::COMPONENT;
 
-//-----------------------------------------------------------------------------
-std::string OcvDnnDetection::GetDetectionType() {
-    return "CLASS";
-}
 
 //-----------------------------------------------------------------------------
 bool OcvDnnDetection::Init() {

diff --git a/cpp/OcvDnnDetection/OcvDnnDetection.h b/cpp/OcvDnnDetection/OcvDnnDetection.h
@@ -65,9 +65,6 @@ class OcvDnnDetection : public MPF::COMPONENT::MPFImageAndVideoDetectionComponen
 
     std::vector<MPF::COMPONENT::MPFImageLocation> GetDetections(const MPF::COMPONENT::MPFImageJob &job) override;
 
-    std::string GetDetectionType() override;
-
-
 private:
 
     log4cxx::LoggerPtr logger_;

diff --git a/cpp/OcvDnnDetection/plugin-files/descriptor/descriptor.json b/cpp/OcvDnnDetection/plugin-files/descriptor/descriptor.json
@@ -14,6 +14,7 @@
     "name": "DNNCV",
     "description": "Performs object classification using the OpenCV Deep Neural Networks module.",
     "actionType": "DETECTION",
+    "trackType": "CLASS",
     "requiresCollection": {
       "states": []
     },

diff --git a/cpp/OcvFaceDetection/OcvFaceDetection.cpp b/cpp/OcvFaceDetection/OcvFaceDetection.cpp
@@ -65,11 +65,6 @@ using namespace MPF;
 using namespace COMPONENT;
 
 
-
-string OcvFaceDetection::GetDetectionType() {
-    return "FACE";
-}
-
 void OcvFaceDetection::SetModes(bool display_window, bool print_debug_info) {
     imshow_on = display_window;
 

diff --git a/cpp/OcvFaceDetection/OcvFaceDetection.h b/cpp/OcvFaceDetection/OcvFaceDetection.h
@@ -132,8 +132,6 @@ public :
     bool Init() override;
     bool Close() override;
 
-    std::string GetDetectionType() override;
-
     std::vector<MPF::COMPONENT::MPFVideoTrack> GetDetections(const MPF::COMPONENT::MPFVideoJob &job) override;
 
     std::vector<MPF::COMPONENT::MPFImageLocation> GetDetections(const MPF::COMPONENT::MPFImageJob &job) override;

diff --git a/cpp/OcvFaceDetection/plugin-files/descriptor/descriptor.json b/cpp/OcvFaceDetection/plugin-files/descriptor/descriptor.json
@@ -14,6 +14,7 @@
     "name": "FACECV",
     "description": "Detects faces in images and videos using the Open Computer Vision (OCV) library.",
     "actionType": "DETECTION",
+    "trackType": "FACE",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/cpp/OcvYoloDetection/OcvYoloDetection.cpp b/cpp/OcvYoloDetection/OcvYoloDetection.cpp
@@ -245,11 +245,6 @@ bool OcvYoloDetection::Close() {
 }
 
 
-std::string OcvYoloDetection::GetDetectionType() {
-    return "CLASS";
-}
-
-
 void OcvYoloDetection::InitYoloNetwork(const Properties &jobProperties, const Config &config) {
     auto modelName = GetProperty(jobProperties, "MODEL_NAME", "tiny yolo");
     auto modelsDirPath = GetProperty(jobProperties, "MODELS_DIR_PATH", ".");

diff --git a/cpp/OcvYoloDetection/OcvYoloDetection.h b/cpp/OcvYoloDetection/OcvYoloDetection.h
@@ -49,8 +49,6 @@ class OcvYoloDetection : public MPF::COMPONENT::MPFImageAndVideoDetectionCompone
 
     bool Close() override;
 
-    std::string GetDetectionType() override;
-
     std::vector<MPF::COMPONENT::MPFVideoTrack> GetDetections(
             const MPF::COMPONENT::MPFVideoJob &job) override;
 

diff --git a/cpp/OcvYoloDetection/plugin-files/descriptor/descriptor.json b/cpp/OcvYoloDetection/plugin-files/descriptor/descriptor.json
@@ -14,6 +14,7 @@
     "name": "OCVYOLO",
     "description": "Detects objects in images and videos using the Open Computer Vision (OCV) library using Yolo.",
     "actionType": "DETECTION",
+    "trackType": "CLASS",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/cpp/SceneChangeDetection/SceneChangeDetection.cpp b/cpp/SceneChangeDetection/SceneChangeDetection.cpp
@@ -41,10 +41,6 @@ using namespace MPF::COMPONENT;
 using namespace cv;
 
 
-std::string SceneChangeDetection::GetDetectionType() {
-    return "SCENE";
-}
-
 bool SceneChangeDetection::Init() {
 
     // Determine where the executable is running.

diff --git a/cpp/SceneChangeDetection/SceneChangeDetection.h b/cpp/SceneChangeDetection/SceneChangeDetection.h
@@ -49,8 +49,6 @@ class SceneChangeDetection : public MPF::COMPONENT::MPFVideoDetectionComponentAd
     std::vector<MPF::COMPONENT::MPFVideoTrack> GetDetections(
             const MPF::COMPONENT::MPFVideoJob &job) override;
 
-    std::string GetDetectionType() override;
-
 private:
     log4cxx::LoggerPtr logger_;
     cv::Mat dilateKernel;

diff --git a/cpp/SceneChangeDetection/plugin-files/descriptor/descriptor.json b/cpp/SceneChangeDetection/plugin-files/descriptor/descriptor.json
@@ -12,6 +12,7 @@
     "name" : "SCENECHANGE",
     "description" : "Segments a video into scenes based on 4 detectors.",
     "actionType" : "DETECTION",
+    "trackType": "SCENE",
     "outputChangedCounter" : 1,
     "requiresCollection" : {
       "states" : []

diff --git a/cpp/TesseractOCRTextDetection/TesseractOCRTextDetection.cpp b/cpp/TesseractOCRTextDetection/TesseractOCRTextDetection.cpp
@@ -127,10 +127,6 @@ bool TesseractOCRTextDetection::Close() {
 }
 
 
-string TesseractOCRTextDetection::GetDetectionType() {
-    return "TEXT";
-}
-
 bool TesseractOCRTextDetection::Supports(MPFDetectionDataType data_type) {
     return data_type == MPFDetectionDataType::IMAGE
         || data_type == MPFDetectionDataType::VIDEO

diff --git a/cpp/TesseractOCRTextDetection/TesseractOCRTextDetection.h b/cpp/TesseractOCRTextDetection/TesseractOCRTextDetection.h
@@ -72,8 +72,6 @@ namespace MPF {
 
             std::vector<MPFAudioTrack> GetDetections(const MPFAudioJob &job) override;
 
-            std::string GetDetectionType() override;
-
             bool Supports(MPFDetectionDataType data_type) override;
 
         private:

diff --git a/cpp/TesseractOCRTextDetection/plugin-files/descriptor/descriptor.json b/cpp/TesseractOCRTextDetection/plugin-files/descriptor/descriptor.json
@@ -15,6 +15,7 @@
     "name": "TESSERACTOCR",
     "description": "Performs Tesseract optical character recognition.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/cpp/TrtisDetection/TrtisDetection.cpp b/cpp/TrtisDetection/TrtisDetection.cpp
@@ -202,10 +202,6 @@ TrtisIpIrv2CocoJobConfig::TrtisIpIrv2CocoJobConfig(const MPFJob &job,
     maxSpaceGapPxSq = maxSpaceGap * maxSpaceGap * frameDiagSq;
 }
 
-/******************************************************************************/
-string TrtisDetection::GetDetectionType() {
-    return "FEATURE";
-}
 
 /******************************************************************************/
 bool TrtisDetection::Close() {

diff --git a/cpp/TrtisDetection/TrtisDetection.h b/cpp/TrtisDetection/TrtisDetection.h
@@ -122,7 +122,6 @@ namespace MPF{
       bool Close() override;
       vector<MPFVideoTrack> GetDetections(const MPFVideoJob &job) override;
       vector<MPFImageLocation> GetDetections(const MPFImageJob &job) override;
-      string GetDetectionType() override;
 
     private:
 

diff --git a/cpp/TrtisDetection/plugin-files/descriptor/descriptor.json b/cpp/TrtisDetection/plugin-files/descriptor/descriptor.json
@@ -14,6 +14,7 @@
     "name": "TRTIS",
     "description": "Returns a model-specific inference result from an input image.",
     "actionType": "DETECTION",
+    "trackType": "FEATURE",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/java/SphinxSpeechDetection/plugin-files/descriptor/descriptor.json b/java/SphinxSpeechDetection/plugin-files/descriptor/descriptor.json
@@ -14,6 +14,7 @@
     "name": "SPHINX",
     "description": "Detects and transcribes English language speech in audio and video files.",
     "actionType": "DETECTION",
+    "trackType": "SPEECH",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/...n/src/main/java/org/mitre/mpf/detection/sphinx/speech/SphinxSpeechDetectionComponent.java b/...n/src/main/java/org/mitre/mpf/detection/sphinx/speech/SphinxSpeechDetectionComponent.java
@@ -55,10 +55,6 @@ public SphinxSpeechDetectionComponent() {
         speechProcessor = new SphinxSpeechDetectionProcessor();
     }
 
-    @Override
-    public String getDetectionType() {
-        return "SPEECH";
-    }
 
     @Override
     public List<MPFAudioTrack> getDetections(MPFAudioJob job) throws MPFComponentDetectionError {

diff --git a/java/TikaImageDetection/plugin-files/descriptor/descriptor.json b/java/TikaImageDetection/plugin-files/descriptor/descriptor.json
@@ -9,6 +9,7 @@
     "name": "TIKAIMAGE",
     "description": "The Apache Tika image detection component.",
     "actionType": "DETECTION",
+    "trackType": "MEDIA",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/...mageDetection/src/main/java/org/mitre/mpf/detection/tika/TikaImageDetectionComponent.java b/...mageDetection/src/main/java/org/mitre/mpf/detection/tika/TikaImageDetectionComponent.java
@@ -219,11 +219,6 @@ public boolean supports(MPFDataType mpfDataType) {
         return MPFDataType.UNKNOWN == mpfDataType;
     }
 
-    @Override
-    public String getDetectionType() {
-        return "MEDIA";
-    }
-
     @Override
     public List<MPFImageLocation> getDetections(MPFImageJob job) throws MPFComponentDetectionError {
         throw new MPFComponentDetectionError(MPFDetectionError.MPF_UNSUPPORTED_DATA_TYPE,

diff --git a/java/TikaTextDetection/plugin-files/descriptor/descriptor.json b/java/TikaTextDetection/plugin-files/descriptor/descriptor.json
@@ -9,6 +9,7 @@
     "name": "TIKATEXT",
     "description": "The Apache Tika text detection component.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/...aTextDetection/src/main/java/org/mitre/mpf/detection/tika/TikaTextDetectionComponent.java b/...aTextDetection/src/main/java/org/mitre/mpf/detection/tika/TikaTextDetectionComponent.java
@@ -285,10 +285,6 @@ public boolean supports(MPFDataType mpfDataType) {
         return MPFDataType.UNKNOWN.equals(mpfDataType);
     }
 
-    public String getDetectionType() {
-        return "TEXT";
-    }
-
     public List<MPFImageLocation> getDetections(MPFImageJob job) throws MPFComponentDetectionError {
         throw new MPFComponentDetectionError(MPFDetectionError.MPF_UNSUPPORTED_DATA_TYPE, "Image detection not supported.");
     }

diff --git a/python/ArgosTranslation/argos_translation_component/argos_translation_component.py b/python/ArgosTranslation/argos_translation_component/argos_translation_component.py
@@ -40,7 +40,6 @@
 
 
 class ArgosTranslationComponent:
-    detection_type = 'TRANSLATION'
 
     def get_detections_from_video(self, job: mpf.VideoJob) -> Sequence[mpf.VideoTrack]:
         logger.info(f'Received video job.')

diff --git a/python/ArgosTranslation/plugin-files/descriptor/descriptor.json b/python/ArgosTranslation/plugin-files/descriptor/descriptor.json
@@ -9,6 +9,7 @@
     "name": "ARGOSTRANSLATION",
     "description": "Uses Argos Translate to perform translation.",
     "actionType": "DETECTION",
+    "trackType": "TRANSLATION",
     "requiresCollection": {
       "states": []
     },

diff --git a/python/AzureFormDetection/acs_form_detection_component/acs_form_detection_component.py b/python/AzureFormDetection/acs_form_detection_component/acs_form_detection_component.py
@@ -47,7 +47,6 @@
 
 
 class AcsFormDetectionComponent(mpf_util.ImageReaderMixin, object):
-    detection_type = 'TEXT'
 
     def get_detections_from_generic(self, generic_job):
         try:

diff --git a/python/AzureFormDetection/plugin-files/descriptor/descriptor.json b/python/AzureFormDetection/plugin-files/descriptor/descriptor.json
@@ -9,6 +9,7 @@
     "name": "AZUREFORM",
     "description": "Uses Azure Cognitive Services to perform form recognition in documents and images.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/python/AzureOcrTextDetection/acs_ocr_component/acs_ocr_component.py b/python/AzureOcrTextDetection/acs_ocr_component/acs_ocr_component.py
@@ -44,7 +44,6 @@
 
 
 class AcsOcrComponent(mpf_util.ImageReaderMixin, mpf_util.VideoCaptureMixin):
-    detection_type = 'TEXT'
 
     def get_detections_from_image_reader(self, image_job, image_reader):
         try:

diff --git a/python/AzureOcrTextDetection/plugin-files/descriptor/descriptor.json b/python/AzureOcrTextDetection/plugin-files/descriptor/descriptor.json
@@ -9,6 +9,7 @@
     "name": "AZUREOCR",
     "description": "Uses Azure Cognitive Services to perform optical character recognition.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/python/AzureReadTextDetection/acs_read_detection_component/acs_read_detection_component.py b/python/AzureReadTextDetection/acs_read_detection_component/acs_read_detection_component.py
@@ -44,7 +44,6 @@
 
 
 class AcsReadDetectionComponent(mpf_util.VideoCaptureMixin, mpf_util.ImageReaderMixin, object):
-    detection_type = 'TEXT'
 
     @staticmethod
     def get_detections_from_generic(generic_job):

diff --git a/python/AzureReadTextDetection/plugin-files/descriptor/descriptor.json b/python/AzureReadTextDetection/plugin-files/descriptor/descriptor.json
@@ -9,6 +9,7 @@
     "name": "AZUREREAD",
     "description": "Uses Azure Cognitive Services to perform optical character recognition using the Azure Read API.",
     "actionType": "DETECTION",
+    "trackType": "TEXT",
     "outputChangedCounter" : 1,
     "requiresCollection": {
       "states": []

diff --git a/python/AzureSpeechDetection/README.md b/python/AzureSpeechDetection/README.md
@@ -36,8 +36,7 @@ Returned `AudioTrack` objects have the following members in their `detection_pro
 
 | Property Key                   | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 |--------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `LONG_SPEAKER_ID`              | A unique speaker identifier, of the form "`<start_offset>-<stop_offset>-<#>`, where `<start_offset>` and `<stop_offset>` are integers indicating the segment range (in frame counts for video jobs, milliseconds for audio jobs) for sub-jobs when a job has been segmented by the Workflow Manager. The final `#` portion of the ID is a 1-indexed counter for speaker identity within the indicated segment range. When jobs are not segmented, or not submitted through the Workflow Manager at all, `stop_offset` may instead be `EOF`, indicating that the job extends to the end of the file. |
-| `SPEAKER_ID`                   | A dummy field set to "0".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| `SPEAKER_ID`              | A unique speaker identifier, of the form "`<start_offset>-<stop_offset>-<#>`, where `<start_offset>` and `<stop_offset>` are integers indicating the segment range (in frame counts for video jobs, milliseconds for audio jobs) for sub-jobs when a job has been segmented by the Workflow Manager. The final `#` portion of the ID is a 1-indexed counter for speaker identity within the indicated segment range. When jobs are not segmented, or not submitted through the Workflow Manager at all, `stop_offset` may instead be `EOF`, indicating that the job extends to the end of the file. |
 | `GENDER`                       | Only present if supplied by an upstream component. The gender of the speaker.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | `GENDER_CONFIDENCE`            | Only present if supplied by an upstream component. The confidence of the gender classification.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 | `TRANSCRIPT`                   | The text of the utterance transcript. Words are space-separated.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
@@ -59,7 +58,7 @@ AudioTracks also have the `start_time` and `stop_time` of their associated utter
 
 
 # Language Identifiers
-The following are the BCP-47 codes and their corresponding languages which Azure Speech-to-Text supports. 
+The following are the BCP-47 codes and their corresponding languages which Azure Speech-to-Text supports.
 
 
 | Language                       | BCP-47 | Language                     | BCP-47  |
@@ -167,4 +166,4 @@ If the language code supplied by a feed-forward track is not handled in `acs_spe
 |   `UZB`   | Uzbek               | `uz-UZ`  |
 |   `VIE`   | Vietnamese          | `vi-VN`  |
 |   `YUE`   | Chinese (Cantonese) | `zh-HK`* |
-|   `ZUL`   | Zulu                | `zu-ZA`  |
+|   `ZUL`   | Zulu                | `zu-ZA`  |
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,6 @@ @@
     class AcsFormDetectionComponent(mpf_util.ImageReaderMixin, object):
-        detection_type = 'TEXT'
         def get_detections_from_generic(self, generic_job):
             try:
@@ Expand Down @@