generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4004 from paroj:camera-api

Browse Source
This commit is contained in:
Alexander Alekhin 2015-07-21 15:57:47 +00:00
commit c1c0f23fd1
3 changed files with 177 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
modules/videoio/include/opencv2/videoio.hpp
View File

@ -90,7 +90,10 @@ enum { CAP_ANY = 0, // autodetect
CAP_INTELPERC = 1500, // Intel Perceptual Computing SDK CAP_INTELPERC = 1500, // Intel Perceptual Computing SDK
CAP_OPENNI2 = 1600, // OpenNI2 (for Kinect) CAP_OPENNI2 = 1600, // OpenNI2 (for Kinect)
CAP_OPENNI2_ASUS = 1610, // OpenNI2 (for Asus Xtion and Occipital Structure sensors) CAP_OPENNI2_ASUS = 1610, // OpenNI2 (for Asus Xtion and Occipital Structure sensors)
CAP_GPHOTO2 = 1700 // gPhoto2 connection CAP_GPHOTO2 = 1700, // gPhoto2 connection
CAP_GSTREAMER = 1800, // GStreamer
CAP_FFMPEG = 1900, // FFMPEG
CAP_IMAGES = 2000 // OpenCV Image Sequence (e.g. img_%02d.jpg)
}; };
// generic properties (based on DC1394 properties) // generic properties (based on DC1394 properties)
@ -398,10 +401,19 @@ public:
CV_WRAP VideoCapture(const String& filename); CV_WRAP VideoCapture(const String& filename);
/** @overload /** @overload
@param device id of the opened video capturing device (i.e. a camera index). If there is a single @param filename name of the opened video file (eg. video.avi) or image sequence (eg.
camera connected, just pass 0. img_%02d.jpg, which will read samples like img_00.jpg, img_01.jpg, img_02.jpg, ...)
@param apiPreference preferred Capture API to use. Can be used to enforce a specific reader
implementation if multiple are available: e.g. CAP_FFMPEG or CAP_IMAGES
*/ */
CV_WRAP VideoCapture(int device); CV_WRAP VideoCapture(const String& filename, int apiPreference);
/** @overload
@param index = camera_id + domain_offset (CAP_*). id of the video capturing device to open. If there is a single
camera connected, just pass 0. Advanced Usage: to open Camera 1 using the MS Media Foundation API: index = 1 + CAP_MSMF
*/
CV_WRAP VideoCapture(int index);
virtual ~VideoCapture(); virtual ~VideoCapture();
@ -415,9 +427,10 @@ public:
CV_WRAP virtual bool open(const String& filename); CV_WRAP virtual bool open(const String& filename);
/** @overload /** @overload
@param device id of the opened video capturing device (i.e. a camera index). @param index = camera_id + domain_offset (CAP_*). id of the video capturing device to open. If there is a single
camera connected, just pass 0. Advanced Usage: to open Camera 1 using the MS Media Foundation API: index = 1 + CAP_MSMF
*/ */
CV_WRAP virtual bool open(int device); CV_WRAP virtual bool open(int index);
/** @brief Returns true if video capturing has been initialized already. /** @brief Returns true if video capturing has been initialized already.
@ -541,6 +554,18 @@ public:
*/ */
CV_WRAP virtual double get(int propId) const; CV_WRAP virtual double get(int propId) const;
/** @overload
@param filename name of the opened video file (eg. video.avi) or image sequence (eg.
img_%02d.jpg, which will read samples like img_00.jpg, img_01.jpg, img_02.jpg, ...)
@param apiPreference preferred Capture API to use. Can be used to enforce a specific reader
implementation if multiple are available: e.g. CAP_FFMPEG or CAP_IMAGES
The methods first call VideoCapture::release to close the already opened file or camera.
*/
CV_WRAP virtual bool open(const String& filename, int apiPreference);
protected: protected:
Ptr<CvCapture> cap; Ptr<CvCapture> cap;
Ptr<IVideoCapture> icap; Ptr<IVideoCapture> icap;

9
modules/videoio/include/opencv2/videoio/videoio_c.h
View File

@ -63,6 +63,9 @@ typedef struct CvCapture CvCapture;
/* start capturing frames from video file */ /* start capturing frames from video file */
CVAPI(CvCapture*) cvCreateFileCapture( const char* filename ); CVAPI(CvCapture*) cvCreateFileCapture( const char* filename );
/* start capturing frames from video file. allows specifying a preferred API to use */
CVAPI(CvCapture*) cvCreateFileCaptureWithPreference( const char* filename , int apiPreference);
enum enum
{ {
CV_CAP_ANY =0, // autodetect CV_CAP_ANY =0, // autodetect
@ -111,8 +114,10 @@ enum
CV_CAP_INTELPERC = 1500, // Intel Perceptual Computing CV_CAP_INTELPERC = 1500, // Intel Perceptual Computing
CV_CAP_OPENNI2 = 1600, // OpenNI2 (for Kinect) CV_CAP_OPENNI2 = 1600, // OpenNI2 (for Kinect)
CV_CAP_GPHOTO2 = 1700,
CV_CAP_GPHOTO2 = 1700 CV_CAP_GSTREAMER = 1800, // GStreamer
CV_CAP_FFMPEG = 1900, // FFMPEG
CV_CAP_IMAGES = 2000 // OpenCV Image Sequence (e.g. img_%02d.jpg)
}; };
/* start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) */ /* start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) */

336
modules/videoio/src/cap.cpp
View File

@ -126,289 +126,221 @@ CV_IMPL int cvGetCaptureDomain( CvCapture* capture)
*/ */
CV_IMPL CvCapture * cvCreateCameraCapture (int index) CV_IMPL CvCapture * cvCreateCameraCapture (int index)
{ {
int domains[] =
{
#ifdef HAVE_MSMF
CV_CAP_MSMF,
#endif
#if 1
CV_CAP_IEEE1394, // identical to CV_CAP_DC1394
#endif
#ifdef HAVE_TYZX
CV_CAP_STEREO,
#endif
#ifdef HAVE_PVAPI
CV_CAP_PVAPI,
#endif
#if 1
CV_CAP_VFW, // identical to CV_CAP_V4L
#endif
#ifdef HAVE_MIL
CV_CAP_MIL,
#endif
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
CV_CAP_QT,
#endif
#ifdef HAVE_UNICAP
CV_CAP_UNICAP,
#endif
#ifdef HAVE_OPENNI
CV_CAP_OPENNI,
#endif
#ifdef HAVE_OPENNI2
CV_CAP_OPENNI2,
#endif
#ifdef HAVE_XIMEA
CV_CAP_XIAPI,
#endif
#ifdef HAVE_AVFOUNDATION
CV_CAP_AVFOUNDATION,
#endif
#ifdef HAVE_GIGE_API
CV_CAP_GIGANETIX,
#endif
#ifdef HAVE_INTELPERC
CV_CAP_INTELPERC,
#endif
-1
};
// interpret preferred interface (0 = autodetect) // interpret preferred interface (0 = autodetect)
int pref = (index / 100) * 100; int pref = (index / 100) * 100;
if (pref)
{
domains[0]=pref;
index %= 100;
domains[1]=-1;
}
// try every possibly installed camera API // local variable to memorize the captured device
for (int i = 0; domains[i] >= 0; i++) CvCapture *capture = 0;
{
#if defined(HAVE_MSMF) || \ switch (pref)
defined(HAVE_TYZX) || \ {
defined(HAVE_VFW) || \ default:
defined(HAVE_LIBV4L) || \ // user specified an API we do not know
defined(HAVE_CAMV4L) || \ // bail out to let the user know that it is not available
defined(HAVE_CAMV4L2) || \ if (pref) break;
defined(HAVE_VIDEOIO) || \
defined(HAVE_GSTREAMER) || \
defined(HAVE_DC1394_2) || \
defined(HAVE_DC1394) || \
defined(HAVE_CMU1394) || \
defined(HAVE_MIL) || \
defined(HAVE_QUICKTIME) || \
defined(HAVE_QTKIT) || \
defined(HAVE_UNICAP) || \
defined(HAVE_PVAPI) || \
defined(HAVE_OPENNI) || \
defined(HAVE_OPENNI2) || \
defined(HAVE_XIMEA) || \
defined(HAVE_AVFOUNDATION) || \
defined(HAVE_GIGE_API) || \
defined(HAVE_INTELPERC) || \
(0)
// local variable to memorize the captured device
CvCapture *capture;
#endif
switch (domains[i])
{
#ifdef HAVE_MSMF #ifdef HAVE_MSMF
case CV_CAP_MSMF: case CV_CAP_MSMF:
capture = cvCreateCameraCapture_MSMF (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_MSMF(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_TYZX #ifdef HAVE_TYZX
case CV_CAP_STEREO: case CV_CAP_STEREO:
capture = cvCreateCameraCapture_TYZX (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_TYZX(index);
return capture; if (pref) break;
break;
#endif #endif
case CV_CAP_VFW: case CV_CAP_VFW:
#ifdef HAVE_VFW #ifdef HAVE_VFW
capture = cvCreateCameraCapture_VFW (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_VFW(index);
return capture;
#endif #endif
#if defined HAVE_LIBV4L || defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO #if defined HAVE_LIBV4L || defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO
capture = cvCreateCameraCapture_V4L (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_V4L(index);
return capture;
#endif #endif
#ifdef HAVE_GSTREAMER #ifdef HAVE_GSTREAMER
if (!capture)
capture = cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_V4L2, 0); capture = cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_V4L2, 0);
if (capture)
return capture;
capture = cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_V4L, 0);
if (capture)
return capture;
#endif
break; //CV_CAP_VFW
case CV_CAP_FIREWIRE: if (!capture)
capture = cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_V4L, 0);
#endif
if (pref) break; // CV_CAP_VFW
case CV_CAP_FIREWIRE:
#ifdef HAVE_DC1394_2 #ifdef HAVE_DC1394_2
capture = cvCreateCameraCapture_DC1394_2 (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_DC1394_2(index);
return capture;
#endif #endif
#ifdef HAVE_DC1394 #ifdef HAVE_DC1394
capture = cvCreateCameraCapture_DC1394 (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_DC1394(index);
return capture;
#endif #endif
#ifdef HAVE_CMU1394 #ifdef HAVE_CMU1394
capture = cvCreateCameraCapture_CMU (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_CMU(index);
return capture;
#endif #endif
#if defined(HAVE_GSTREAMER) && 0 #if defined(HAVE_GSTREAMER) && 0
//Re-enable again when gstreamer 1394 support will land in the backend code // Re-enable again when gstreamer 1394 support will land in the backend code
if (!capture)
capture = cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_1394, 0); capture = cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_1394, 0);
if (capture)
return capture;
#endif #endif
break; //CV_CAP_FIREWIRE if (pref) break; // CV_CAP_FIREWIRE
#ifdef HAVE_MIL #ifdef HAVE_MIL
case CV_CAP_MIL: case CV_CAP_MIL:
capture = cvCreateCameraCapture_MIL (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_MIL(index);
return capture; if (pref) break;
break;
#endif #endif
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT) #if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
case CV_CAP_QT: case CV_CAP_QT:
capture = cvCreateCameraCapture_QT (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_QT(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_UNICAP #ifdef HAVE_UNICAP
case CV_CAP_UNICAP: case CV_CAP_UNICAP:
capture = cvCreateCameraCapture_Unicap (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_Unicap(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_PVAPI #ifdef HAVE_PVAPI
case CV_CAP_PVAPI: case CV_CAP_PVAPI:
capture = cvCreateCameraCapture_PvAPI (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_PvAPI(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_OPENNI #ifdef HAVE_OPENNI
case CV_CAP_OPENNI: case CV_CAP_OPENNI:
capture = cvCreateCameraCapture_OpenNI (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_OpenNI(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_OPENNI2 #ifdef HAVE_OPENNI2
case CV_CAP_OPENNI2: case CV_CAP_OPENNI2:
if (!capture)
capture = cvCreateCameraCapture_OpenNI(index); capture = cvCreateCameraCapture_OpenNI(index);
if (capture) if (pref) break;
return capture;
break;
#endif #endif
#ifdef HAVE_XIMEA #ifdef HAVE_XIMEA
case CV_CAP_XIAPI: case CV_CAP_XIAPI:
capture = cvCreateCameraCapture_XIMEA (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_XIMEA(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_AVFOUNDATION #ifdef HAVE_AVFOUNDATION
case CV_CAP_AVFOUNDATION: case CV_CAP_AVFOUNDATION:
capture = cvCreateCameraCapture_AVFoundation (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_AVFoundation(index);
return capture; if (pref) break;
break;
#endif #endif
#ifdef HAVE_GIGE_API #ifdef HAVE_GIGE_API
case CV_CAP_GIGANETIX: case CV_CAP_GIGANETIX:
capture = cvCreateCameraCapture_Giganetix (index); if (!capture)
if (capture) capture = cvCreateCameraCapture_Giganetix(index);
return capture; if (pref) break; // CV_CAP_GIGANETIX
break; // CV_CAP_GIGANETIX
#endif #endif
}
} }
// failed open a camera return capture;
return 0;
} }
/** /**
* Videoreader dispatching method: it tries to find the first * Videoreader dispatching method: it tries to find the first
* API that can access a given filename. * API that can access a given filename.
*/ */
CV_IMPL CvCapture * cvCreateFileCapture (const char * filename) CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, int apiPreference)
{ {
CvCapture * result = 0; CvCapture * result = 0;
switch(apiPreference) {
default:
// user specified an API we do not know
// bail out to let the user know that it is not available
if (apiPreference) break;
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
if (! result) case CV_CAP_FFMPEG:
result = cvCreateFileCapture_FFMPEG_proxy (filename); if (! result)
result = cvCreateFileCapture_FFMPEG_proxy (filename);
if (apiPreference) break;
#endif #endif
#ifdef HAVE_VFW #ifdef HAVE_VFW
if (! result) case CV_CAP_VFW:
result = cvCreateFileCapture_VFW (filename); if (! result)
result = cvCreateFileCapture_VFW (filename);
if (apiPreference) break;
#endif #endif
case CV_CAP_MSMF:
#ifdef HAVE_MSMF #ifdef HAVE_MSMF
if (! result) if (! result)
result = cvCreateFileCapture_MSMF (filename); result = cvCreateFileCapture_MSMF (filename);
#endif #endif
#ifdef HAVE_XINE #ifdef HAVE_XINE
if (! result) if (! result)
result = cvCreateFileCapture_XINE (filename); result = cvCreateFileCapture_XINE (filename);
#endif #endif
if (apiPreference) break;
#ifdef HAVE_GSTREAMER #ifdef HAVE_GSTREAMER
if (! result) case CV_CAP_GSTREAMER:
result = cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename); if (! result)
result = cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename);
if (apiPreference) break;
#endif #endif
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT) #if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
if (! result) case CV_CAP_QT:
result = cvCreateFileCapture_QT (filename); if (! result)
result = cvCreateFileCapture_QT (filename);
if (apiPreference) break;
#endif #endif
#ifdef HAVE_AVFOUNDATION #ifdef HAVE_AVFOUNDATION
if (! result) case CV_CAP_AVFOUNDATION:
result = cvCreateFileCapture_AVFoundation (filename); if (! result)
result = cvCreateFileCapture_AVFoundation (filename);
if (apiPreference) break;
#endif #endif
#ifdef HAVE_OPENNI #ifdef HAVE_OPENNI
if (! result) case CV_CAP_OPENNI:
result = cvCreateFileCapture_OpenNI (filename); if (! result)
result = cvCreateFileCapture_OpenNI (filename);
if (apiPreference) break;
#endif #endif
if (! result) case CV_CAP_IMAGES:
result = cvCreateFileCapture_Images (filename); if (! result)
result = cvCreateFileCapture_Images (filename);
}
return result; return result;
} }
CV_IMPL CvCapture * cvCreateFileCapture (const char * filename)
{
return cvCreateFileCaptureWithPreference(filename, CV_CAP_ANY);
}
/** /**
* Videowriter dispatching method: it tries to find the first * Videowriter dispatching method: it tries to find the first
* API that can write a given stream. * API that can write a given stream.
@ -615,14 +547,19 @@ static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int _fourcc
VideoCapture::VideoCapture() VideoCapture::VideoCapture()
{} {}
VideoCapture::VideoCapture(const String& filename) VideoCapture::VideoCapture(const String& filename, int apiPreference)
{ {
open(filename); open(filename, apiPreference);
} }
VideoCapture::VideoCapture(int device) VideoCapture::VideoCapture(const String& filename)
{ {
open(device); open(filename, CAP_ANY);
}
VideoCapture::VideoCapture(int index)
{
open(index);
} }
VideoCapture::~VideoCapture() VideoCapture::~VideoCapture()
@ -631,24 +568,29 @@ VideoCapture::~VideoCapture()
cap.release(); cap.release();
} }
bool VideoCapture::open(const String& filename) bool VideoCapture::open(const String& filename, int apiPreference)
{ {
if (isOpened()) release(); if (isOpened()) release();
icap = IVideoCapture_create(filename); icap = IVideoCapture_create(filename);
if (!icap.empty()) if (!icap.empty())
return true; return true;
cap.reset(cvCreateFileCapture(filename.c_str())); cap.reset(cvCreateFileCaptureWithPreference(filename.c_str(), apiPreference));
return isOpened(); return isOpened();
} }
bool VideoCapture::open(int device) bool VideoCapture::open(const String& filename)
{
return open(filename, CAP_ANY);
}
bool VideoCapture::open(int index)
{ {
if (isOpened()) release(); if (isOpened()) release();
icap = IVideoCapture_create(device); icap = IVideoCapture_create(index);
if (!icap.empty()) if (!icap.empty())
return true; return true;
cap.reset(cvCreateCameraCapture(device)); cap.reset(cvCreateCameraCapture(index));
return isOpened(); return isOpened();
} }