Merge pull request opencv#26224 from mshabunin:cpp-videoio-backport

C-API cleanup: backport videoio changes from 5.x

Author: asmorkalov

modules/core/include/opencv2/core/cvdef.h

@@ -928,6 +928,17 @@ typedef hfloat float16_t;
 }
 #endif
 
+/** @brief Constructs the 'fourcc' code, used in video codecs and many other places.
+    Simply call it with 4 chars like `CV_FOURCC('I', 'Y', 'U', 'V')`
+*/
+CV_INLINE int CV_FOURCC(char c1, char c2, char c3, char c4)
+{
+    return (c1 & 255) + ((c2 & 255) << 8) + ((c3 & 255) << 16) + ((c4 & 255) << 24);
+}
+
+//! Macro to construct the fourcc code of the codec. Same as CV_FOURCC()
+#define CV_FOURCC_MACRO(c1, c2, c3, c4) (((c1) & 255) + (((c2) & 255) << 8) + (((c3) & 255) << 16) + (((c4) & 255) << 24))
+
 //! @}
 
 #ifndef __cplusplus

modules/dnn/include/opencv2/dnn/shape_utils.hpp

@@ -43,7 +43,7 @@
 #define OPENCV_DNN_DNN_SHAPE_UTILS_HPP
 
 #include <opencv2/dnn/dnn.hpp>
-#include <opencv2/core/types_c.h>  // CV_MAX_DIM
+#include <opencv2/core/cvdef.h>  // CV_MAX_DIM
 #include <iostream>
 #include <ostream>
 #include <sstream>

modules/videoio/include/opencv2/videoio/container_avi.private.hpp

@@ -9,9 +9,11 @@
 #  error this is a private header which should not be used from outside of the OpenCV library
 #endif
 
-#include "opencv2/core/cvdef.h"
-#include "opencv2/videoio/videoio_c.h"
+#include "opencv2/core/types.hpp"
 #include <deque>
+#include <vector>
+#include <string>
+#include <memory>
 
 namespace cv
 {
@@ -80,8 +82,8 @@ class CV_EXPORTS AVIReadContainer
 public:
     AVIReadContainer();
 
-    void initStream(const String& filename);
-    void initStream(Ptr<VideoInputStream> m_file_stream_);
+    void initStream(const std::string& filename);
+    void initStream(std::shared_ptr<VideoInputStream> m_file_stream_);
 
     void close();
     //stores founded frames in m_frame_list which can be accessed via getFrames
@@ -121,7 +123,7 @@ class CV_EXPORTS AVIReadContainer
 
     void printError(RiffChunk& chunk, unsigned int expected_fourcc);
 
-    Ptr<VideoInputStream> m_file_stream;
+    std::shared_ptr<VideoInputStream> m_file_stream;
     unsigned int   m_stream_id;
     unsigned long long int   m_movi_start;
     unsigned long long int    m_movi_end;
@@ -150,7 +152,7 @@ class CV_EXPORTS AVIWriteContainer
     AVIWriteContainer();
     ~AVIWriteContainer();
 
-    bool initContainer(const String& filename, double fps, Size size, bool iscolor);
+    bool initContainer(const std::string& filename, double fps, cv::Size size, bool iscolor);
     void startWriteAVI(int stream_count);
     void writeStreamHeader(Codecs codec_);
     void startWriteChunk(uint32_t fourcc);
@@ -180,7 +182,7 @@ class CV_EXPORTS AVIWriteContainer
     void jflushStream(unsigned currval, int bitIdx);
 
 private:
-    Ptr<BitStream> strm;
+    std::shared_ptr<BitStream> strm;
     int outfps;
     int width, height, channels;
     size_t moviPointer;

modules/videoio/include/opencv2/videoio/legacy/constants_c.h

@@ -5,6 +5,8 @@
 #ifndef OPENCV_VIDEOIO_LEGACY_CONSTANTS_H
 #define OPENCV_VIDEOIO_LEGACY_CONSTANTS_H
 
+#include "opencv2/core/cvdef.h"
+
 enum
 {
     CV_CAP_ANY      =0,     // autodetect
@@ -410,22 +412,6 @@ enum
     CV_CAP_PROP_VIEWFINDER                = 17010  // Enter liveview mode.
 };
 
-//! Macro to construct the fourcc code of the codec. Same as CV_FOURCC()
-#define CV_FOURCC_MACRO(c1, c2, c3, c4) (((c1) & 255) + (((c2) & 255) << 8) + (((c3) & 255) << 16) + (((c4) & 255) << 24))
-
-/** @brief Constructs the fourcc code of the codec function
-
-Simply call it with 4 chars fourcc code like `CV_FOURCC('I', 'Y', 'U', 'V')`
-
-List of codes can be obtained at [Video Codecs by FOURCC](https://fourcc.org/codecs.php) page.
-FFMPEG backend with MP4 container natively uses other values as fourcc code:
-see [ObjectType](http://mp4ra.org/#/codecs).
-*/
-CV_INLINE int CV_FOURCC(char c1, char c2, char c3, char c4)
-{
-    return CV_FOURCC_MACRO(c1, c2, c3, c4);
-}
-
 //! (Windows only) Open Codec Selection Dialog
 #define CV_FOURCC_PROMPT -1
 //! (Linux only) Use default codec for specified filename

modules/videoio/src/cap_android_camera.cpp

@@ -403,17 +403,17 @@ class AndroidCameraCapture : public IVideoCapture
     double getProperty(int property_id) const CV_OVERRIDE
     {
         switch (property_id) {
-            case CV_CAP_PROP_FRAME_WIDTH:
+            case CAP_PROP_FRAME_WIDTH:
                 return isOpened() ? frameWidth : desiredWidth;
-            case CV_CAP_PROP_FRAME_HEIGHT:
+            case CAP_PROP_FRAME_HEIGHT:
                 return isOpened() ? frameHeight : desiredHeight;
             case CAP_PROP_AUTO_EXPOSURE:
                 return autoExposure ? 1 : 0;
-            case CV_CAP_PROP_EXPOSURE:
+            case CAP_PROP_EXPOSURE:
                 return exposureTime;
-            case CV_CAP_PROP_ISO_SPEED:
+            case CAP_PROP_ISO_SPEED:
                 return sensitivity;
-            case CV_CAP_PROP_FOURCC:
+            case CAP_PROP_FOURCC:
                 return fourCC;
             default:
                 break;
@@ -425,7 +425,7 @@ class AndroidCameraCapture : public IVideoCapture
     bool setProperty(int property_id, double value) CV_OVERRIDE
     {
         switch (property_id) {
-            case CV_CAP_PROP_FRAME_WIDTH:
+            case CAP_PROP_FRAME_WIDTH:
                 desiredWidth = value;
                 settingWidth = true;
                 if (settingWidth && settingHeight) {
@@ -434,7 +434,7 @@ class AndroidCameraCapture : public IVideoCapture
                     settingHeight = false;
                 }
                 return true;
-            case CV_CAP_PROP_FRAME_HEIGHT:
+            case CAP_PROP_FRAME_HEIGHT:
                 desiredHeight = value;
                 settingHeight = true;
                 if (settingWidth && settingHeight) {
@@ -443,7 +443,7 @@ class AndroidCameraCapture : public IVideoCapture
                     settingHeight = false;
                 }
                 return true;
-            case CV_CAP_PROP_FOURCC:
+            case CAP_PROP_FOURCC:
                 {
                     uint32_t newFourCC = cvRound(value);
                     if (fourCC == newFourCC) {
@@ -485,18 +485,18 @@ class AndroidCameraCapture : public IVideoCapture
                     return status == ACAMERA_OK;
                 }
                 return true;
-            case CV_CAP_PROP_EXPOSURE:
+            case CAP_PROP_EXPOSURE:
                 if (isOpened() && exposureRange.Supported()) {
                     exposureTime = (int64_t)value;
-                    LOGI("Setting CV_CAP_PROP_EXPOSURE will have no effect unless CAP_PROP_AUTO_EXPOSURE is off");
+                    LOGI("Setting CAP_PROP_EXPOSURE will have no effect unless CAP_PROP_AUTO_EXPOSURE is off");
                     camera_status_t status = ACaptureRequest_setEntry_i64(captureRequest.get(), ACAMERA_SENSOR_EXPOSURE_TIME, 1, &exposureTime);
                     return status == ACAMERA_OK;
                 }
                 return false;
-            case CV_CAP_PROP_ISO_SPEED:
+            case CAP_PROP_ISO_SPEED:
                 if (isOpened() && sensitivityRange.Supported()) {
                     sensitivity = (int32_t)value;
-                    LOGI("Setting CV_CAP_PROP_ISO_SPEED will have no effect unless CAP_PROP_AUTO_EXPOSURE is off");
+                    LOGI("Setting CAP_PROP_ISO_SPEED will have no effect unless CAP_PROP_AUTO_EXPOSURE is off");
                     camera_status_t status = ACaptureRequest_setEntry_i32(captureRequest.get(), ACAMERA_SENSOR_SENSITIVITY, 1, &sensitivity);
                     return status == ACAMERA_OK;
                 }

modules/videoio/src/cap_android_mediandk.cpp

@@ -182,16 +182,16 @@ class AndroidMediaNdkCapture : public IVideoCapture
     {
         switch (property_id)
         {
-            case CV_CAP_PROP_FRAME_WIDTH:
+            case CAP_PROP_FRAME_WIDTH:
                 return (( videoOrientationAuto &&
                          (cv::ROTATE_90_CLOCKWISE == videoRotationCode || cv::ROTATE_90_COUNTERCLOCKWISE == videoRotationCode))
                         ? videoHeight : videoWidth);
-            case CV_CAP_PROP_FRAME_HEIGHT:
+            case CAP_PROP_FRAME_HEIGHT:
                 return (( videoOrientationAuto &&
                          (cv::ROTATE_90_CLOCKWISE == videoRotationCode || cv::ROTATE_90_COUNTERCLOCKWISE == videoRotationCode))
                         ? videoWidth : videoHeight);
-            case CV_CAP_PROP_FPS: return videoFrameRate;
-            case CV_CAP_PROP_FRAME_COUNT: return videoFrameCount;
+            case CAP_PROP_FPS: return videoFrameRate;
+            case CAP_PROP_FRAME_COUNT: return videoFrameCount;
             case CAP_PROP_ORIENTATION_META: return videoRotation;
             case CAP_PROP_ORIENTATION_AUTO: return videoOrientationAuto ? 1 : 0;
         }
@@ -661,7 +661,7 @@ const AndroidMediaNdkVideoWriter::FourCCInfo AndroidMediaNdkVideoWriter::FOURCC_
     { CV_FOURCC('H', '2', '6', '5'), "video/hevc", AMEDIAMUXER_OUTPUT_FORMAT_MPEG_4 },
     { CV_FOURCC('H', '2', '6', '3'), "video/3gpp", AMEDIAMUXER_OUTPUT_FORMAT_MPEG_4 },
     { CV_FOURCC('M', 'P', '4', 'V'), "video/mp4v-es", AMEDIAMUXER_OUTPUT_FORMAT_MPEG_4 },
-    { 0, NULL },
+    { 0, NULL, AMEDIAMUXER_OUTPUT_FORMAT_MPEG_4 },
 };