Tag:
Branch:
Tree:
940dc1f2b7
2.4
3.4
4.x
5.x
master
next
2.2
2.3.0
2.3.1
2.4.0
2.4.1
2.4.10
2.4.10.1
2.4.10.2
2.4.10.3
2.4.10.4
2.4.11
2.4.12
2.4.12.1
2.4.12.2
2.4.12.3
2.4.13
2.4.13.1
2.4.13.2
2.4.13.3
2.4.13.4
2.4.13.5
2.4.13.6
2.4.13.7
2.4.2
2.4.3
2.4.3-rc
2.4.3.1
2.4.3.2
2.4.4
2.4.4-beta
2.4.5
2.4.6
2.4.6.1
2.4.6.2
2.4.6.2-rc1
2.4.6.2r2
2.4.6.2r3
2.4.7
2.4.7-rc1
2.4.7.1
2.4.7.2
2.4.8
2.4.8.1
2.4.8.2
2.4.8.3
2.4.9
2.4.9.1
3.0-ocl-tech-preview
3.0-ocl-tp2
3.0.0
3.0.0-alpha
3.0.0-beta
3.0.0-rc1
3.1.0
3.2.0
3.2.0-rc
3.3.0
3.3.0-cvsdk
3.3.0-rc
3.3.1
3.3.1-cvsdk
3.4.0
3.4.0-rc
3.4.1
3.4.1-cvsdk
3.4.10
3.4.11
3.4.12
3.4.13
3.4.14
3.4.15
3.4.16
3.4.17
3.4.18
3.4.19
3.4.2
3.4.2-openvino
3.4.20
3.4.3
3.4.3-openvino
3.4.4
3.4.5
3.4.6
3.4.7
3.4.8
3.4.9
4.0.0
4.0.0-alpha
4.0.0-beta
4.0.0-openvino
4.0.0-rc
4.0.1
4.0.1-openvino
4.1.0
4.1.0-openvino
4.1.1
4.1.1-openvino
4.1.2
4.1.2-openvino
4.10.0
4.10.0-kleidicv
4.11.0
4.2.0
4.2.0-openvino
4.3.0
4.3.0-openvino
4.3.0-openvino-2020.3.0
4.4.0
4.4.0-openvino
4.5.0
4.5.0-openvino
4.5.1
4.5.1-openvino
4.5.2
4.5.2-openvino
4.5.3
4.5.3-openvino
4.5.3-openvino-2021.4.1
4.5.3-openvino-2021.4.2
4.5.4
4.5.5
4.5.5-openvino-2022.1.0
4.6.0
4.7.0
4.8.0
4.8.1
4.9.0
5.0.0-alpha
${ noResults }
4 Commits (940dc1f2b79abda111dbb7c408eaa3eda1a20135)
| Author | SHA1 | Message | Date |
|---|---|---|---|
Alexey Nikolaev
|
8396ae6e4f |
Merge pull request #12893 from aleksey-nikolaev:cap-update
V4L (V4L2): Refactoring. Added missed camera properties. Fixed getting `INF` for some properties. Singlethread as always (#12893) * cap_v4l: 1 Added cap_properties verbalization. 2 Set Get of properties elementary refactoring. 3 Removed converting parameters to/from [0,1] range. 4 Added all known conversion from V4L2_CID_* to CV_CAP_PROP_* * cap_v4l: 1. Removed all query for parameters range. 2. Refactored capture initialization. 3. Added selecting input channel by CV_CAP_PROP_MODE. Default value -1 the channels not changed. * cap_v4l: 1. Refactoring of Convert To RGB * cap_v4l: 1. Fixed use of video buffer index. 2. Removed extra memcopy for grab image. 3. Removed device closing from autosetup_capture_mode_v4l2 * cap_v4l: 1. The `goto` was eliminated 2. Fixed use of temporary buffer index for V4L2_PIX_FMT_SN9C10X 3. Fixed use of the bufferIndex 4. Removed trailing spaces and unused variables. * cap_v4l: 1. Alias for capture->buffers[capture->bufferIndex] 2. Reduced size of data for memcpy: bytesused instead of length 3. Refactoring. Code duplication. More info for debug * cap_v4l: 1. Added the ability to grab and retrieveFrame independently several times * cap_v4l: 1. Not need to close/open device for new capture parameters applying. 2. Removed using of device name as a flag that the capture is closed. Added sufficient function. 3. Refactoring. Added requestBuffers and createBuffers * cap_v4l: 1. Added tryIoctl with `select` like was in mainloop_v4l2. 2. Fixed buffer request for device without closing the device. 3. Some static function moved to CvCaptureCAM_V4L 4. Removed unused defines * cap_v4l: 1. Thread-safe now * cap_v4l: 1. Fixed thread-safe destructor 2. Fixed FPS setting * Missed brake * Removed thread-safety * cap_v4l: 1. Reverted conversion parameters to/from [0,1] by default for backward compatibility. 2. Added setting for turn off compatibility mode: set CV_CAP_PROP_MODE to 65536 3. Most static functions moved to CvCaptureCAM_V4L 4. Refactoring of icvRetrieveFrameCAM_V4L and using of frame_allocated flag * cap_v4l: 1. Added conversion to RGB from NV12, NV21 2. Refactoring. Removed wrappers for known format conversions. * Added `CAP_PROP_CHANNEL` to the enum VideoCaptureProperties. CAP_V4L migrated to use VideoCaptureProperties. * 1. Update comments. 2. Environment variable `OPENCV_VIDEOIO_V4L_RANGE_NORMALIZED` for setting default backward compatibility mode. 3. Revert getting of `CAP_PROP_MODE` as fourcc code in backward compatibility mode. * videoio: update cap_v4l - compatibilityMode => normalizePropRange * videoio(test): V4L2 MJPEG test `v4l2-ctl --list-formats` should have 'MJPG' entry * videoio: fix buffer initialization to avoid "munmap: Invalid argument" messages |
6 years ago |
wanghanmin
|
eb981cc7d7 |
Merge pull request #12138 from wanghanmin:wanghanmin-patch-videoio_crossbarsetting-1
* Update videoio.hpp
add VideoCapturePropertie for clossbar input pin setting
* Update cap_dshow.cpp
For some kind of capture card, such as "avermedia cv710 " , it use SerialDigital as input pin and so it can not work.
Here added new PhysicalConnectorType enumeration: PhysConn_Video_YRYBY and PhysConn_Video_SerialDigital to support it.
And also provide new property parameter CAP_CROSSBAR_INPIN_TYPE to set the crossbar input pin type which will be used in videoInput::start(int deviceID, videoDevice *VD):
" if(VD->useCrossbar)
{
DebugPrintOut("SETUP: Checking crossbar\n");
routeCrossbar(&VD->pCaptureGraph, &VD->pVideoInputFilter, VD->connection, CAPTURE_MODE);
}
"
And at last ,fixed one issue for function setSizeAndSubtype, added code
pVih->rcSource.top = pVih->rcSource.left = pVih->rcTarget.top =pVih->rcTarget.left=0;
pVih->rcSource.right = pVih->rcTarget.right= attemptWidth;
pVih->rcSource.bottom = pVih->rcTarget.bottom = attemptHeight;
without these code , rcSource and rcTarget will keeping use default resolution and cause fail in hr = VD->streamConf->SetFormat(VD->pAmMediaType) and cannot find suitable MediaType.
Tested with python3 and mfc (Avermedia cv710)
Python3 code:
import cv2
print("test cv")
cap=cv2.VideoCapture(0)
cap.set(5,60)
cap.set(3,1920)
cap.set(4,1080)
cap.set(31,6)
ret,img=cap.read()
cv2.namedWindow("cap",cv2.WINDOW_NORMAL)
cv2.resizeWindow("cap",960,640);
while True:
ret,img=cap.read()
if ret==False:
continue
cv2.imshow("cap",img)
if cv2.waitKey(1) & 0xFF == ord('q'):
break
cap.release()
cv2.destroyAllWindows()
MFC code:
void CcvtestDlg::OnBnClickedButton1()
{
VideoCapture cap(0);
cap.set(CAP_PROP_FRAME_WIDTH, 1920);
cap.set(CAP_PROP_FRAME_HEIGHT, 1080);
cap.set(CAP_CROSSBAR_INPIN_TYPE , 6);
Mat img;
namedWindow("test", WINDOW_NORMAL);
resizeWindow("test", 960, 640);
while (1)
{
if (cap.read(img))
{
imshow("test", img);
if ('q' ==waitKey(1))
break;
}
}
destroyAllWindows();
cap.release();
}
* Update cap_dshow.cpp
* Update videoio.hpp
move enum value of CAP_CROSSBAR_INPIN_TYPE to the end of list
* Update videoio.hpp
* Update cap_dshow.cpp
removed trailing whitespace
* Update test_camera.cpp
Add test for capture device using PhysConn_Video_SerialDigital as crossbar input pin
* Update test_camera.cpp
Correction of misunderstanding about how to add test case.
|
6 years ago |
Alexander Alekhin
|
51f7eb3a3c |
videoio(test): add "camera" tests
- disabled due specific requirements (camera, OpenNI camera, etc) - designed for manual validation |
7 years ago |