Merge branch 'master' into hf-merge/video-rotation

Author: jrobble

detection/api/include/MPFVideoCapture.h

@@ -169,6 +169,8 @@ namespace MPF { namespace COMPONENT {
                                                 const cv::VideoCapture &cvVideoCapture);
 
         static SeekStrategy::CPtr GetSeekStrategy(const MPFVideoJob &job);
+
+        static cv::VideoCapture GetCvVideoCapture(const std::string &videoPath);
     };
 
 

detection/api/src/MPFImageReader.cpp

@@ -37,6 +37,7 @@ namespace MPF { namespace COMPONENT {
 
     MPFImageReader::MPFImageReader(const MPFImageJob &job) {
         cv::VideoCapture video_cap(job.data_uri);
+        video_cap.set(cv::CAP_PROP_ORIENTATION_AUTO, 0);
         if (!video_cap.isOpened()) {
             throw MPFDetectionException(MPFDetectionError::MPF_COULD_NOT_OPEN_MEDIA,
                                         "Failed to open \"" + job.data_uri + "\".");

detection/api/src/MPFVideoCapture.cpp

@@ -24,7 +24,6 @@
  * limitations under the License.                                             *
  ******************************************************************************/
 
-#include <algorithm>
 #include <iostream>
 #include <map>
 #include <stdexcept>
@@ -49,7 +48,7 @@ namespace MPF { namespace COMPONENT {
     MPFVideoCapture::MPFVideoCapture(const MPFVideoJob &videoJob, bool enableFrameTransformers,
                                      bool enableFrameFiltering)
             : videoPath_(videoJob.data_uri)
-            , cvVideoCapture_(videoJob.data_uri)
+            , cvVideoCapture_(GetCvVideoCapture(videoJob.data_uri))
             , frameFilter_(GetFrameFilter(enableFrameFiltering, videoJob, cvVideoCapture_))
             , frameTransformer_(GetFrameTransformer(enableFrameTransformers, videoJob))
             , seekStrategy_(GetSeekStrategy(videoJob)) {
@@ -68,6 +67,13 @@ namespace MPF { namespace COMPONENT {
     }
 
 
+    cv::VideoCapture MPFVideoCapture::GetCvVideoCapture(const std::string &videoPath) {
+        cv::VideoCapture videoCapture(videoPath);
+        videoCapture.set(cv::CAP_PROP_ORIENTATION_AUTO, 0);
+        return videoCapture;
+    }
+
+
     IFrameTransformer::Ptr MPFVideoCapture::GetFrameTransformer(bool enableFrameTransformers,
                                                                 const MPFVideoJob &job) const {
         if (enableFrameTransformers) {