Skip to content

Commit b3cd244

Browse files
mshabuninmshabunin
committed
Merge pull request opencv#8985 from alalek:update_videoio
2 parents c60b7d7 + d7597a8 commit b3cd244

File tree

6 files changed

+64
-60
lines changed

6 files changed

+64
-60
lines changed

‎modules/videoio/include/opencv2/videoio.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ enum VideoCaptureAPIs {
115115
CAP_FFMPEG = 1900, //!< Open and record video file or stream using the FFMPEG library
116116
CAP_IMAGES = 2000, //!< OpenCV Image Sequence (e.g. img_%02d.jpg)
117117
CAP_ARAVIS = 2100, //!< Aravis SDK
118-
CAP_OCV_MJPEG = 2200, //!< Built-in MotionJPEG codec
118+
CAP_OPENCV_MJPEG = 2200, //!< Built-in OpenCV MotionJPEG codec
119119
CAP_INTEL_MFX = 2300 //!< Intel MediaSDK
120120
};
121121

‎modules/videoio/include/opencv2/videoio/videoio_c.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ enum
124124
CV_CAP_FFMPEG = 1900, // FFMPEG
125125
CV_CAP_IMAGES = 2000, // OpenCV Image Sequence (e.g. img_%02d.jpg)
126126

127-
CV_CAP_ARAVIS = 2100, // Aravis GigE SDK
128-
CV_CAP_OCV_MJPEG = 2200 // Built-in MotionJPEG codec
127+
CV_CAP_ARAVIS = 2100 // Aravis GigE SDK
129128
};
130129

131130
/** @brief start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*)

‎modules/videoio/misc/gen_dict.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"const_ignore_list": [
33
"CV_CAP_OPENNI",
4+
"CV_CAP_OPENNI2",
45
"CV_CAP_PROP_OPENNI_",
56
"CV_CAP_INTELPERC",
67
"CV_CAP_PROP_INTELPERC_",
@@ -20,6 +21,7 @@
2021
"CV_CAP_UNICAP",
2122
"CV_CAP_DSHOW",
2223
"CV_CAP_PVAPI",
24+
"CV_CAP_ARAVIS",
2325
"CV_CAP_PROP_DC1394_OFF",
2426
"CV_CAP_PROP_DC1394_MODE_MANUAL",
2527
"CV_CAP_PROP_DC1394_MODE_AUTO",

‎modules/videoio/src/cap.cpp

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@
6060
#pragma warning(disable: 4748)
6161
#endif
6262

63+
using namespace cv;
64+
6365
namespace cv
6466
{
6567

@@ -178,27 +180,28 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
178180
if (pref) break;
179181

180182
#ifdef HAVE_MSMF
181-
case CV_CAP_MSMF:
183+
case CAP_MSMF:
182184
TRY_OPEN(capture, cvCreateCameraCapture_MSMF(index))
183185
if (pref) break;
184186
#endif
185-
case CV_CAP_VFW:
187+
case CAP_VFW: // or CAP_V4L or CAP_V4L2
186188
#ifdef HAVE_VFW
187189
TRY_OPEN(capture, cvCreateCameraCapture_VFW(index))
188190
#endif
189191

190192
#if defined HAVE_LIBV4L || defined HAVE_CAMV4L || defined HAVE_CAMV4L2 || defined HAVE_VIDEOIO
191193
TRY_OPEN(capture, cvCreateCameraCapture_V4L(index))
192194
#endif
193-
if (pref) break; // CV_CAP_VFW
194195

195196
#ifdef HAVE_GSTREAMER
196197
TRY_OPEN(capture, cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_V4L2, reinterpret_cast<char *>(index)))
197198

198199
TRY_OPEN(capture, cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_V4L, reinterpret_cast<char *>(index)))
199200
#endif
200201

201-
case CV_CAP_FIREWIRE:
202+
if (pref) break; // CAP_VFW or CAP_V4L or CAP_V4L2
203+
204+
case CAP_FIREWIRE:
202205
#ifdef HAVE_DC1394_2
203206
TRY_OPEN(capture, cvCreateCameraCapture_DC1394_2(index))
204207
#endif
@@ -216,64 +219,64 @@ CV_IMPL CvCapture * cvCreateCameraCapture (int index)
216219
TRY_OPEN(capture, cvCreateCapture_GStreamer(CV_CAP_GSTREAMER_1394, 0))
217220
#endif
218221

219-
if (pref) break; // CV_CAP_FIREWIRE
222+
if (pref) break; // CAP_FIREWIRE
220223

221224
#ifdef HAVE_MIL
222-
case CV_CAP_MIL:
225+
case CAP_MIL:
223226
TRY_OPEN(capture, cvCreateCameraCapture_MIL(index))
224227
if (pref) break;
225228
#endif
226229

227230
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
228-
case CV_CAP_QT:
231+
case CAP_QT:
229232
TRY_OPEN(capture, cvCreateCameraCapture_QT(index))
230233
if (pref) break;
231234
#endif
232235

233236
#ifdef HAVE_UNICAP
234-
case CV_CAP_UNICAP:
237+
case CAP_UNICAP:
235238
TRY_OPEN(capture, cvCreateCameraCapture_Unicap(index))
236239
if (pref) break;
237240
#endif
238241

239242
#ifdef HAVE_PVAPI
240-
case CV_CAP_PVAPI:
243+
case CAP_PVAPI:
241244
TRY_OPEN(capture, cvCreateCameraCapture_PvAPI(index))
242245
if (pref) break;
243246
#endif
244247

245248
#ifdef HAVE_OPENNI
246-
case CV_CAP_OPENNI:
249+
case CAP_OPENNI:
247250
TRY_OPEN(capture, cvCreateCameraCapture_OpenNI(index))
248251
if (pref) break;
249252
#endif
250253

251254
#ifdef HAVE_OPENNI2
252-
case CV_CAP_OPENNI2:
255+
case CAP_OPENNI2:
253256
TRY_OPEN(capture, cvCreateCameraCapture_OpenNI2(index))
254257
if (pref) break;
255258
#endif
256259

257260
#ifdef HAVE_XIMEA
258-
case CV_CAP_XIAPI:
261+
case CAP_XIAPI:
259262
TRY_OPEN(capture, cvCreateCameraCapture_XIMEA(index))
260263
if (pref) break;
261264
#endif
262265

263266
#ifdef HAVE_AVFOUNDATION
264-
case CV_CAP_AVFOUNDATION:
267+
case CAP_AVFOUNDATION:
265268
TRY_OPEN(capture, cvCreateCameraCapture_AVFoundation(index))
266269
if (pref) break;
267270
#endif
268271

269272
#ifdef HAVE_GIGE_API
270-
case CV_CAP_GIGANETIX:
273+
case CAP_GIGANETIX:
271274
TRY_OPEN(capture, cvCreateCameraCapture_Giganetix(index))
272-
if (pref) break; // CV_CAP_GIGANETIX
275+
if (pref) break; // CAP_GIGANETIX
273276
#endif
274277

275278
#ifdef HAVE_ARAVIS_API
276-
case CV_CAP_ARAVIS:
279+
case CAP_ARAVIS:
277280
TRY_OPEN(capture, cvCreateCameraCapture_Aravis(index))
278281
if (pref) break;
279282
#endif
@@ -297,12 +300,12 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
297300
if (apiPreference) break;
298301

299302
#ifdef HAVE_FFMPEG
300-
case CV_CAP_FFMPEG:
303+
case CAP_FFMPEG:
301304
TRY_OPEN(result, cvCreateFileCapture_FFMPEG_proxy (filename))
302305
if (apiPreference) break;
303306
#endif
304307

305-
case CV_CAP_VFW:
308+
case CAP_VFW:
306309
#ifdef HAVE_VFW
307310
TRY_OPEN(result, cvCreateFileCapture_VFW (filename))
308311
#endif
@@ -312,7 +315,7 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
312315
#endif
313316
if (apiPreference) break;
314317

315-
case CV_CAP_MSMF:
318+
case CAP_MSMF:
316319
#ifdef HAVE_MSMF
317320
TRY_OPEN(result, cvCreateFileCapture_MSMF (filename))
318321
#endif
@@ -323,36 +326,36 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
323326
if (apiPreference) break;
324327

325328
#ifdef HAVE_GSTREAMER
326-
case CV_CAP_GSTREAMER:
329+
case CAP_GSTREAMER:
327330
TRY_OPEN(result, cvCreateCapture_GStreamer (CV_CAP_GSTREAMER_FILE, filename))
328331
if (apiPreference) break;
329332
#endif
330333

331334
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
332-
case CV_CAP_QT:
335+
case CAP_QT:
333336
TRY_OPEN(result, cvCreateFileCapture_QT (filename))
334337
if (apiPreference) break;
335338
#endif
336339

337340
#ifdef HAVE_AVFOUNDATION
338-
case CV_CAP_AVFOUNDATION:
341+
case CAP_AVFOUNDATION:
339342
TRY_OPEN(result, cvCreateFileCapture_AVFoundation (filename))
340343
if (apiPreference) break;
341344
#endif
342345

343346
#ifdef HAVE_OPENNI
344-
case CV_CAP_OPENNI:
347+
case CAP_OPENNI:
345348
TRY_OPEN(result, cvCreateFileCapture_OpenNI (filename))
346349
if (apiPreference) break;
347350
#endif
348351

349352
#ifdef HAVE_OPENNI2
350-
case CV_CAP_OPENNI2:
353+
case CAP_OPENNI2:
351354
TRY_OPEN(result, cvCreateFileCapture_OpenNI2 (filename))
352355
if (apiPreference) break;
353356
#endif
354357

355-
case CV_CAP_IMAGES:
358+
case CAP_IMAGES:
356359
TRY_OPEN(result, cvCreateFileCapture_Images (filename))
357360
}
358361

@@ -361,7 +364,7 @@ CV_IMPL CvCapture * cvCreateFileCaptureWithPreference (const char * filename, in
361364

362365
CV_IMPL CvCapture * cvCreateFileCapture (const char * filename)
363366
{
364-
return cvCreateFileCaptureWithPreference(filename, CV_CAP_ANY);
367+
return cvCreateFileCaptureWithPreference(filename, CAP_ANY);
365368
}
366369

367370
/**
@@ -383,40 +386,40 @@ static CvVideoWriter* cvCreateVideoWriterWithPreference(const char* filename, in
383386
{
384387
default:
385388
//exit if the specified API is unavaliable
386-
if (apiPreference != CV_CAP_ANY) break;
389+
if (apiPreference != CAP_ANY) break;
387390
#ifdef HAVE_FFMPEG
388-
case CV_CAP_FFMPEG:
391+
case CAP_FFMPEG:
389392
TRY_OPEN(result, cvCreateVideoWriter_FFMPEG_proxy (filename, fourcc, fps, frameSize, is_color))
390-
if (apiPreference != CV_CAP_ANY) break;
393+
if (apiPreference != CAP_ANY) break;
391394
#endif
392395
#ifdef HAVE_VFW
393-
case CV_CAP_VFW:
396+
case CAP_VFW:
394397
TRY_OPEN(result, cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, is_color))
395-
if (apiPreference != CV_CAP_ANY) break;
398+
if (apiPreference != CAP_ANY) break;
396399
#endif
397400
#ifdef HAVE_MSMF
398-
case CV_CAP_MSMF:
401+
case CAP_MSMF:
399402
TRY_OPEN(result, cvCreateVideoWriter_MSMF(filename, fourcc, fps, frameSize, is_color))
400-
if (apiPreference != CV_CAP_ANY) break;
403+
if (apiPreference != CAP_ANY) break;
401404
#endif
402405
#ifdef HAVE_AVFOUNDATION
403-
case CV_CAP_AVFOUNDATION:
406+
case CAP_AVFOUNDATION:
404407
TRY_OPEN(result, cvCreateVideoWriter_AVFoundation(filename, fourcc, fps, frameSize, is_color))
405-
if (apiPreference != CV_CAP_ANY) break;
408+
if (apiPreference != CAP_ANY) break;
406409
#endif
407410
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
408-
case(CV_CAP_QT):
411+
case(CAP_QT):
409412
TRY_OPEN(result, cvCreateVideoWriter_QT(filename, fourcc, fps, frameSize, is_color))
410-
if (apiPreference != CV_CAP_ANY) break;
413+
if (apiPreference != CAP_ANY) break;
411414
#endif
412415
#ifdef HAVE_GSTREAMER
413-
case CV_CAP_GSTREAMER:
416+
case CAP_GSTREAMER:
414417
TRY_OPEN(result, cvCreateVideoWriter_GStreamer (filename, fourcc, fps, frameSize, is_color))
415-
if (apiPreference != CV_CAP_ANY) break;
418+
if (apiPreference != CAP_ANY) break;
416419
#endif
417-
case CV_CAP_IMAGES:
420+
case CAP_IMAGES:
418421
TRY_OPEN(result, cvCreateVideoWriter_Images(filename))
419-
if (apiPreference != CV_CAP_ANY) break;
422+
if (apiPreference != CAP_ANY) break;
420423
}
421424

422425
return result;
@@ -425,7 +428,7 @@ static CvVideoWriter* cvCreateVideoWriterWithPreference(const char* filename, in
425428
CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,
426429
double fps, CvSize frameSize, int is_color )
427430
{
428-
return cvCreateVideoWriterWithPreference(filename, CV_CAP_ANY, fourcc, fps, frameSize, is_color);
431+
return cvCreateVideoWriterWithPreference(filename, CAP_ANY, fourcc, fps, frameSize, is_color);
429432
}
430433

431434
CV_IMPL int cvWriteFrame( CvVideoWriter* writer, const IplImage* image )
@@ -450,16 +453,16 @@ static Ptr<IVideoCapture> IVideoCapture_create(int index)
450453
int domains[] =
451454
{
452455
#ifdef HAVE_DSHOW
453-
CV_CAP_DSHOW,
456+
CAP_DSHOW,
454457
#endif
455458
#ifdef HAVE_INTELPERC
456-
CV_CAP_INTELPERC,
459+
CAP_INTELPERC,
457460
#endif
458461
#ifdef WINRT_VIDEO
459462
CAP_WINRT,
460463
#endif
461464
#ifdef HAVE_GPHOTO2
462-
CV_CAP_GPHOTO2,
465+
CAP_GPHOTO2,
463466
#endif
464467
-1, -1
465468
};
@@ -486,14 +489,14 @@ static Ptr<IVideoCapture> IVideoCapture_create(int index)
486489
switch (domains[i])
487490
{
488491
#ifdef HAVE_DSHOW
489-
case CV_CAP_DSHOW:
492+
case CAP_DSHOW:
490493
capture = makePtr<VideoCapture_DShow>(index);
491-
break; // CV_CAP_DSHOW
494+
break; // CAP_DSHOW
492495
#endif
493496
#ifdef HAVE_INTELPERC
494-
case CV_CAP_INTELPERC:
497+
case CAP_INTELPERC:
495498
capture = makePtr<VideoCapture_IntelPerC>();
496-
break; // CV_CAP_INTEL_PERC
499+
break; // CAP_INTEL_PERC
497500
#endif
498501
#ifdef WINRT_VIDEO
499502
case CAP_WINRT:
@@ -503,7 +506,7 @@ static Ptr<IVideoCapture> IVideoCapture_create(int index)
503506
break; // CAP_WINRT
504507
#endif
505508
#ifdef HAVE_GPHOTO2
506-
case CV_CAP_GPHOTO2:
509+
case CAP_GPHOTO2:
507510
capture = createGPhoto2Capture(index);
508511
break;
509512
#endif
@@ -522,9 +525,9 @@ static Ptr<IVideoCapture> IVideoCapture_create(const String& filename)
522525
{
523526
int domains[] =
524527
{
525-
CV_CAP_ANY,
528+
CAP_ANY,
526529
#ifdef HAVE_GPHOTO2
527-
CV_CAP_GPHOTO2,
530+
CAP_GPHOTO2,
528531
#endif
529532
#ifdef HAVE_MFX
530533
CAP_INTEL_MFX,
@@ -539,11 +542,11 @@ static Ptr<IVideoCapture> IVideoCapture_create(const String& filename)
539542

540543
switch (domains[i])
541544
{
542-
case CV_CAP_ANY:
545+
case CAP_ANY:
543546
capture = createMotionJpegCapture(filename);
544547
break;
545548
#ifdef HAVE_GPHOTO2
546-
case CV_CAP_GPHOTO2:
549+
case CAP_GPHOTO2:
547550
capture = createGPhoto2Capture(filename);
548551
break;
549552
#endif
@@ -575,7 +578,7 @@ static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int apiPref
575578
}
576579
#endif
577580

578-
if( (apiPreference == CAP_OCV_MJPEG || apiPreference == CAP_ANY)
581+
if( (apiPreference == CAP_OPENCV_MJPEG || apiPreference == CAP_ANY)
579582
&& _fourcc == CV_FOURCC('M', 'J', 'P', 'G') )
580583
iwriter = createMotionJpegWriter(filename, fps, frameSize, isColor);
581584

‎modules/videoio/src/cap_aravis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class CvCaptureCAM_Aravis : public CvCapture
109109
virtual IplImage* retrieveFrame(int);
110110
virtual int getCaptureDomain()
111111
{
112-
return CV_CAP_ARAVIS;
112+
return cv::CAP_ARAVIS;
113113
}
114114

115115
protected:

‎modules/videoio/src/precomp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ struct CvCapture
9090
virtual bool setProperty(int, double) { return 0; }
9191
virtual bool grabFrame() { return true; }
9292
virtual IplImage* retrieveFrame(int) { return 0; }
93-
virtual int getCaptureDomain() { return CV_CAP_ANY; } // Return the type of the capture object: CV_CAP_VFW, etc...
93+
virtual int getCaptureDomain() { return cv::CAP_ANY; } // Return the type of the capture object: CAP_VFW, etc...
9494
};
9595

9696
/*************************** CvVideoWriter structure ****************************/

0 commit comments

Comments
 (0)