Promote cv::VideoCapture properties in VideoReader.

opencv · Apr 27, 2023 · 5efb784 · 5efb784
1 parent 960b3f6
commit 5efb784
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/modules/cudacodec/src/ffmpeg_video_source.cpp b/modules/cudacodec/src/ffmpeg_video_source.cpp
@@ -192,14 +192,8 @@ void cv::cudacodec::detail::FFmpegVideoSource::updateFormat(const FormatInfo& vi
 
 bool cv::cudacodec::detail::FFmpegVideoSource::get(const int propertyId, double& propertyVal) const
 {
-    CV_Assert(videoCaptureParams.size() % 2 == 0);
-    for (std::size_t i = 0; i < videoCaptureParams.size(); i += 2) {
-        if (videoCaptureParams.at(i) == propertyId) {
-            propertyVal = videoCaptureParams.at(i + 1);
-            return true;
-        }
-    }
-    return false;
+    propertyVal = cap.get(propertyId);
+    return propertyVal != 0.;
 }
 
 bool cv::cudacodec::detail::FFmpegVideoSource::getNextPacket(unsigned char** data, size_t* size)

diff --git a/modules/cudacodec/test/test_video.cpp b/modules/cudacodec/test/test_video.cpp
@@ -554,6 +554,7 @@ CUDA_TEST_P(TransCode, H264ToH265)
 }
 
 INSTANTIATE_TEST_CASE_P(CUDA_Codec, TransCode, ALL_DEVICES);
+
 #endif
 
 #if defined(HAVE_NVCUVENC)