Merge pull request #22248 from cudawarped:ffmpeg_rtsp_low_fps
authorcudawarped <12133430+cudawarped@users.noreply.github.com>
Mon, 12 Sep 2022 06:12:28 +0000 (07:12 +0100)
committerGitHub <noreply@github.com>
Mon, 12 Sep 2022 06:12:28 +0000 (09:12 +0300)
commit46d988e2cb98f55bdcd8713c21a3df6c83087ecc
treeb7fd4a519e49c2e528a3bc7f2f570e278530f61c
parent7a5122121b6177efb8092c251517dd5c40b13fbb
Merge pull request #22248 from cudawarped:ffmpeg_rtsp_low_fps

* Allow the number of threads FFMpeg uses to be selected during VideoCapture::open().
Reset interupt timer in grab if
err = avformat_find_stream_info(ic, NULL);
is interupted but open is successful.

* Correct the returned number of threads and amend test cases.

* Update container test case.

* Reverse changes added to existing videoio_container test case and include test combining thread change and raw read in the newly added videoio_read test case.
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/test/test_ffmpeg.cpp