mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,574 Commits 6 Branches 126 Tags 3 GiB
2f0de3aa2c
Commit Graph

152 Commits

Author SHA1 Message Date
kalistratovag
65e0387aa5 Implementing parallel mjpeg encoder. 
Fixed errors in parallel_for based on pthreads

Fixing compiler errore & removing whitespaces

Fixing prallel_for_pthreads error and warnings on win
 2015-06-30 13:57:37 +03:00
Dikay900
902e381264 fix one dict parameter in ffmpeg implementation (introduced while porting) 2015-06-20 10:17:34 +02:00
Vadim Pisarevsky
e055128d0d Merge pull request #4099 from sash-kan:fix.2822 2015-06-17 11:58:40 +00:00
Alexander Alekhin
3f2666778a videoio: fix some issues in ffmpeg error processing 2015-06-09 16:30:57 +03:00
Alexander Alekhin
959d575292 videoio: update ffmpeg backend 
- fix compilation for old libraries
- update codec/tag selection logic
- add documentation note about MP4 container tags
 2015-06-09 16:30:57 +03:00
alexander barakin (aka sash-kan)
0d821f04fd fix icvCloseCAM_V4L wrong order of code blocks 
this patch fixes bug http://code.opencv.org/issues/2822 .
based on disussion (in russian):
http://ru.stackoverflow.com/a/428398/178576

Signed-off-by: alexander barakin (aka sash-kan) <alex@barak.in>
 2015-06-06 14:41:00 +03:00
Maksim Shabunin
39fdcf4df3 Merge pull request #4083 from mshabunin:java-engine 2015-06-03 17:17:36 +00:00
Alexander Alekhin
1f3043f618 videoio: VideoWriter H264/.mp4 support via ffmpeg/libav 2015-06-03 18:35:12 +03:00
Maksim Shabunin
caffbaafbe Updated Manager for Android 2015-06-02 17:33:04 +03:00
Vadim Pisarevsky
535dc1e874 Merge pull request #3998 from msandler:master 2015-05-29 21:38:09 +00:00
Vadim Pisarevsky
f7ad192842 Merge pull request #4063 from Dikay900:2_4_to_master 2015-05-28 14:49:13 +00:00
Philipp Hasper
9aaa27d46b Adding missing docs for VideoWriter::release 2015-05-27 07:55:41 +02:00
Andrew Senin
eb40dde688 Fixing XIMEA parameters mapping (issue #4176) 
Conflicts:
	modules/highgui/src/cap_ximea.cpp
 2015-05-26 18:08:29 +02:00
StevenPuttemans
83723c15be added extra BUFFERSIZE doc and getter 
Conflicts:
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/highgui/src/cap_dc1394_v2.cpp
 2015-05-26 18:08:25 +02:00
StevenPuttemans
8454a8f2d1 adding extra buffer parameter 
Conflicts:
	modules/highgui/include/opencv2/highgui/highgui_c.h
	modules/highgui/src/cap_dc1394_v2.cpp

fix typo
 2015-05-26 18:08:22 +02:00
Ilya Lavrenov
efa2baed83 TCP instead of UDP 
Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp
 2015-05-24 14:06:30 +02:00
jormansa
3c2e12a744 bug fixed 
Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp
 2015-05-24 13:31:07 +02:00
Martijn Liem
7e6947a940 Bugfix for bug #3767 
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.

Conflicts:
	modules/highgui/src/cap_dshow.cpp
 2015-05-24 11:55:46 +02:00
Dikay900
7ca0557b40 typos in comments 2015-05-23 17:36:45 +02:00
Ehren Metcalfe
e9bc9c47c2 Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389) 
Conflicts:
	modules/highgui/src/cap_ios_abstract_camera.mm
 2015-05-23 17:36:42 +02:00
Vadim Pisarevsky
f5be8f6c77 Merge pull request #4047 from MSOpenTech:videoio-refactor-contrib 2015-05-23 09:02:11 +00:00
Maxim Kostin
4418ee6c77 Refactored internal helpers. Simplified structure. Updated comments. Updates #41 
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-05-22 15:41:50 +03:00
Piotr Dobrowolski
6d0407b65e VideoCapture with digital camera and gPhoto2 library 2015-05-21 00:41:39 +02:00
Vadim Pisarevsky
8b791477df Merge pull request #3971 from Dikay900:2_4_to_master_3 2015-05-17 00:28:30 +00:00
Vadim Pisarevsky
eb41a574b7 Merge pull request #4005 from MSOpenTech:videoio-contrib 2015-05-16 18:08:28 +00:00
Maxim Kostin
55f78f8a83 Added configuration changes enabling videoio WinRT support. 
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-05-15 16:29:06 +03:00
Maxim Kostin
d08cb6b357 Added WinRT support for videoio. 
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-05-15 16:28:47 +03:00
Maxim Kostin
d40eefd5a4 Moved old WinRT related wrappers from highgui to videoio fixing long broken logic. 
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
 2015-05-15 16:28:25 +03:00
Vadim Pisarevsky
cc086b9452 Merge pull request #3979 from ruslo:fix.cxx11 2015-05-15 12:32:46 +00:00
msandler
8e82bed459 updated cap_libv4l.cpp to support CV_CAP_PROP_POS_MSEC, CV_CAP_PROP_POS_FRAMES and CV_CAP_PROP_FPS 2015-05-11 03:25:48 -07:00
Vincent Rabaud
f052b0bc4d get code to compile on Ubuntu Saucy 
A define was forgotten for the codecs and there was a typo for
another.
 2015-05-07 11:38:59 +00:00
Ruslan Baratov
f148eaace9 Fix errors while compiling with c++11 flag 
Fix errors in file cap_avfoundation.mm.
Compiled with Xcode 6.2, iOS SDK 8.2

Example:

cap_avfoundation.mm:543:54: error: cannot initialize a parameter of
type 'AVCaptureFocusMode' with an rvalue of type 'int'
    if ([mCaptureDevice isFocusModeSupported:(int)value]){
                                             ^~~~~~~~~~
 2015-05-01 21:29:20 +02:00
AfterEight
f39d351d04 Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value) 
Conflicts:
	modules/highgui/src/cap_ximea.cpp
 2015-04-28 18:07:39 +02:00
Roman Donchenko
5455e38e15 cap_msmf.hpp: fix a warning about nNull being unused 
The two functions featuring nNull are not particularly needed, so
I simply removed them.

Conflicts:
	modules/highgui/src/cap_msmf.hpp
 2015-04-25 18:54:54 +02:00
Vadim Pisarevsky
d825b7ee9a fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream 2015-04-23 14:40:44 +03:00
Vadim Pisarevsky
dcf177e372 Merge pull request #3952 from vpisarev:fix_libav_case 2015-04-23 06:25:25 +00:00
Vadim Pisarevsky
30912b49f3 fixed compile warnings; hopefully fixed test failures 2015-04-23 00:39:44 +03:00
Vadim Pisarevsky
2b2e3ee93c make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10) 2015-04-22 21:57:29 +03:00
kalistratovag
08925330e0 mjpec_decoder initialize m_movi_start variable 2015-04-22 19:49:11 +03:00
Philipp Hasper
0b20ce696a Fixed markdown: **Note** -> @note 2015-04-22 08:08:10 +02:00
Nisarg Thakkar
0fd1203b3b Fixed Doc Errors Bug#4282 2015-04-21 10:37:50 +05:30
kalistratovag
740ae3581c Initial commit of avi mjpeg decoder 
std::streams removed

debug code removed

whitespaces removed

stdint.h added and trailing whitespaces removed

trailing whitespaces removed

warnings on windows fix

warnings on windows fix pt 2

Refactoring performed: AviMjpegStream class introduced. CAP_PROP_FRAME_WIDTH and CAP_PROP_FRAME_HEIGHT properties support added.

Windows warnings & uninitialized variable fix

Windows warning fix

Win32 warning fix
 2015-04-10 14:16:43 +03:00
Andrew Senin
58f20a3b7f Ximea camera fix (see issue #4235) 2015-04-03 22:49:50 +03:00
Vadim Pisarevsky
559dfa297d Merge pull request #3813 from hahne:iss1915 2015-04-03 10:16:30 +00:00
Vadim Pisarevsky
602d2c33c0 added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder 2015-03-27 15:15:59 +03:00
Vadim Pisarevsky
8d1232cc7a fixed warnings; transpose qtab to make it compatible with neon branch 2015-03-26 15:59:49 +03:00
Vadim Pisarevsky
3df6b6fdcf added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG" 2015-03-26 00:39:29 +03:00
Vadim Pisarevsky
903f10c237 Merge pull request #3804 from polarfuchs99:master 2015-03-17 11:12:49 +00:00
Roman Donchenko
34ad2e0fa4 Fix a memory leak in CvCapture_FFMPEG::close 
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.

(cherry picked from commit 77578d415f)

Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp
 2015-03-10 12:48:46 +03:00
hahne
1af4521239 fix for issue 1915 2015-03-09 16:19:47 +01:00