e460c6f448
BSD uses some different includes, these are from FreeBSD ports
2015-01-01 17:18:12 -05:00
b79c2c1604
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
web/skins/classic/views/timeline.php
Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
cc305ec8b6
Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
2014-12-25 07:58:01 +10:00
53c7e02d78
Update VideoStoreData memory size comment
2014-12-25 05:52:34 +11:00
d6e8c66057
Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
2014-12-25 05:45:50 +11:00
26d7fd87e2
Whitespace fix zm_camera.h
2014-12-19 07:27:25 +11:00
f076104c94
Fix whitespace
2014-12-19 07:19:08 +11:00
62b75808b3
Output to stderror when zmu can't read zm.conf
2014-12-10 17:54:09 -06:00
48f4d7eb93
Merge branch 'master' into BSD_device
2014-12-08 16:53:39 -05:00
97ee989a94
Parse multiple streams in RTP-Info
2014-12-02 19:33:05 -06:00
33ff712f2c
Resolve post merge build issues with braces
2014-12-02 22:36:32 +11:00
add8f76553
Merge branch 'feature-h264-videostorage' into Video-Highlander-Branch
2014-12-02 22:20:51 +11:00
4a492ce088
Fix some issues from the merge conflict
2014-12-02 21:49:50 +11:00
bf33eab17c
Merge branch 'video' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/zm_event.cpp
web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
cc85424999
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg_camera.cpp
2014-12-02 20:18:24 +11:00
a6a779978a
move seq and rtpTime declarations outside conditional
2014-12-01 17:21:49 -06:00
0099b54248
Make lack of RTP-Info non-fatal
2014-12-01 17:15:08 -06:00
4a248cc3aa
add rtsp mediatype of application
2014-12-01 17:05:10 -06:00
32e818e860
Check for RTSP timeout in PLAY command response
2014-12-01 16:58:42 -06:00
02cdc37e3c
Merge pull request #607 from manupap1/memory_fix_leaks
...
Fix some memory leaks in zma
2014-11-29 10:18:17 -05:00
51aa4e67ea
Merge pull request #608 from knnniggett/RTSP_mUrl
...
echo the URL to the RTSP device during the OPTIONS directive
2014-11-29 10:14:26 -05:00
e4fa475d87
Merge pull request #588 from ZoneMinder/digest_auth
...
Digest auth
2014-11-29 08:32:08 -06:00
1cff253dde
echo the URL to the RTSP device during the OPTIONS directive
2014-11-29 08:13:06 -06:00
346015f472
Fix some indentations in zm_monitor.h
2014-11-29 14:39:57 +01:00
c313e2e389
Fix a memory leak in Monitor::Analyse()
2014-11-29 06:06:10 +01:00
73b25a1de0
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches
2014-11-29 03:39:05 +01:00
41edb4d958
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks
2014-11-29 03:38:45 +01:00
e6d47781d3
add Digest Authentication handling for simple http method.
2014-11-28 15:56:58 -05:00
69090563d5
Merge branch 'master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-11-28 14:23:05 -05:00
87c741b165
Merge pull request #574 from manupap1/rtsp_fix
...
Fix memory leaks with rtsp and a bug
2014-11-26 15:13:39 -05:00
51703f5c37
Merge pull request #575 from manupap1/memory_fix
...
Close logger and database on exit
2014-11-26 15:08:21 -05:00
00287ab5dd
more debug output when buffer is undersized.
2014-11-25 14:51:20 -05:00
d8351eb1e3
mp4 changes
2014-11-25 20:28:18 +11:00
9eda71570a
merge the rest of my Digest-AUth fixes: This should solve #399
2014-11-20 10:44:31 -05:00
0b5a0df7dc
implement http_Digest Auth, and improve it for rtsp
...
Conflicts:
src/zm_remote_camera_http.cpp
src/zm_rtsp.cpp
2014-11-20 10:33:58 -05:00
81f4c2aa10
Revert memory leak patch in Monitor class (break analysis)
2014-11-20 00:33:22 +01:00
790005c155
Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
2014-11-19 12:42:05 -05:00
3d9a0f4729
Fix memory leaks in zmLoadConfig
2014-11-15 13:32:43 +01:00
b2d3daaa65
Fix a mismatch free in zmc binary
2014-11-15 13:10:19 +01:00
9eee62c6d2
Fix memory leaks in Image class
2014-11-15 12:58:08 +01:00
658b9abea9
Fix memory leaks in Monitor class
2014-11-15 12:57:10 +01:00
d2e849104c
Fix memory leaks with rtsp and a bug
2014-11-14 22:31:03 +01:00
a1aaeb7905
Merge branch 'master' into memory_fix
2014-11-14 22:24:33 +01:00
b4732e4750
Close logger and database on exit
2014-11-14 22:17:44 +01:00
f05699a005
Fix a bug when closing RTSP session over TCP
2014-11-14 11:17:27 +01:00
3a9f814303
Merge pull request #572 from ZoneMinder/buffer_cleanup
...
remove the case for level >= 2. Since level is a bool, this code can ne...
2014-11-13 15:47:37 -06:00
a00f719f12
Merge pull request #531 from SteveGilvarry/ffmpeg-stability-fixes
...
351-Rebase Attempt for ffmpeg stability fixes
2014-11-13 15:18:13 -06:00
9016e30f92
BSD uses /dev/bktr0 instead of /dev/video. This is actually pulled FreeBSD ports.
2014-11-13 14:47:07 -05:00
72f34203a0
remove the case for level >= 2. Since level is a bool, this code can never execute. Also, there are no calls to tidy in the current code with values other than 0 or 1, so it's safe to do. Also it removes an error message when using clang++
2014-11-13 14:41:49 -05:00
8d71d4de03
Swap to mp4 container
2014-11-09 18:15:43 +11:00
1d6dffde47
Merge pull request #560 from manupap1/rtsp_fix
...
Send keepalive messages if the rtsp server supports this feature
2014-11-08 14:53:45 -05:00
b4a8ba8e8e
Merge pull request #561 from manupap1/rtsp_fix2
...
Use our own SSRC when sending packets on the RTP control stream
2014-11-08 14:52:36 -05:00
3e8d49d88d
add comment to improve understanding
2014-11-08 14:50:44 -05:00
dd59a05165
Resolve SegFault on videostore
2014-11-08 13:06:23 +11:00
336c69e3c0
Use our own SSRC when sending packets on the control stream
2014-11-07 19:38:11 +01:00
ea8b93be84
Use our own SSRC when sending packets on the control stream
2014-11-07 19:15:42 +01:00
ee7d6a6254
Send keepalive messages if the rtsp server supports this feature
2014-11-07 17:39:50 +01:00
23ee96c966
Merge pull request #556 from ZoneMinder/add_join
...
Add a stringVector join function for future use
2014-11-06 08:33:28 -06:00
e764938a0d
Fixed bug in rtsp streaming caused by a bad string concatenation
2014-11-06 10:16:28 +01:00
a88ce80716
Add a stringVector join function for future use
2014-11-05 14:01:48 -05:00
fefc17b0fc
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.
2014-11-05 19:08:57 +01:00
2712da614e
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-11-05 19:51:15 +11:00
57e5b4fee8
Fix segfault on zmu -l due to not connectig to the shared mem
2014-10-23 09:00:53 -04:00
0e4156c095
Add CaptureAndRecord to vlc, still need to make it record
2014-10-23 19:56:35 +11:00
ee90541370
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-10-18 15:02:43 +11:00
8a33f78243
bugfix; coredump if no codec name was specified in url.
2014-10-15 14:35:01 -04:00
2a71973307
make zm compile using libav on ubunut 14.04
2014-10-15 13:23:29 -04:00
32f05ada86
add digest auth file for cmake
...
Conflicts:
src/CMakeLists.txt
2014-10-13 16:51:21 +11:00
7f530bcc2a
Removed duplicate code and brackets
2014-10-12 22:12:54 +11:00
4245928b35
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
web/skins/classic/js/skin.js
2014-10-12 20:10:36 +11:00
6cb96f1316
Put opts back in
2014-10-12 16:47:27 +11:00
7534557533
- join reconnect thread when finished to clean up thread resources.
...
- don't spawn a new thread for every attempt to open a stream while reconnecting.
2014-10-12 16:31:27 +11:00
a865a555f2
Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists.
2014-10-12 16:31:27 +11:00
f32b1276df
Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined.
2014-10-12 16:23:58 +11:00
83d2a494c3
Process should exit if ReopenFfmpeg function fails to create a worker thread.
2014-10-12 16:23:58 +11:00
7de59df080
removed use of av_err2str. someone could not compile when using that macro.
2014-10-12 16:23:58 +11:00
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
ebf466c2df
- Timeout when opening stream after 10 seconds
...
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
2014-10-12 16:23:58 +11:00
0bb2d9f81d
Merge pull request #407 from m-bene/rtspDigest
...
Rtsp digest
2014-10-11 17:39:57 -05:00
9ef9b17c6b
fixes ftbs with no ffmpeg support
2014-10-11 17:14:09 -05:00
549360cabd
Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements
...
Conflicts:
src/zm_ffmpeg.h
src/zm_mpeg.cpp
2014-10-11 15:38:38 -05:00
c9e04e48bb
Am remarking out some Debugs that would only be useful to someone debugging image code. Of no use to end users and get called so much that must cause a performance problem, especially when debug logging is actually turned on
2014-09-18 15:44:53 -04:00
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
8891639767
fix another segfault
2014-09-08 16:46:41 -04:00
9a3b685016
fixes for vl_multi_buffer parsing when column is NULL
...
fix in debug output for local cameras causing a segfault
2014-09-08 15:20:35 -04:00
6aa1798293
fix segfault for local cameras... strangely enough, in C you should treat an integer as a pointer to string
2014-09-07 17:18:29 -04:00
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
5a7c989ccd
remove some crap that I pushed
2014-08-21 11:52:35 -04:00
c6d19b3ecf
whitespace issue
2014-08-21 11:14:38 -04:00
3d8ad2c906
fall back to Config table setting for v4l MultiBUgger and captures per frame.
2014-08-21 09:59:08 -04:00
92d110859d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-08-19 09:12:45 -04:00
5bc7242582
spaces vs tabs are important in rules, debian is more picky than ubuntu
...
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
6d92299d46
Merge pull request #440 from kylejohnson/master
...
Cleaning up the Contribution section of the README
2014-08-12 11:13:46 -04:00
cca01dc357
connect to the monitor, because instantiating the object no longer does that
2014-07-30 14:20:48 -04:00
2087780ec1
tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set
2014-07-29 14:43:13 -04:00
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
99a3684fb5
change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi
2014-07-14 12:53:48 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
9163536219
Merge pull request #358 from knnniggett/prevbutton
...
Fix prev button while in gapless mode. All buttons tested and working.
2014-07-04 10:33:05 -05:00
e6931b95a1
Putting placeholder in for CaptureAndRecord function
2014-06-30 21:56:13 +10:00
557de3efac
Add CaptureandRecord from zm_camera.h
2014-06-30 21:25:49 +10:00
8c81c8df9c
Option handled added in master, removing duplicate declaration
2014-06-29 08:50:17 +10:00
17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
6e22278f74
password might be null when auth_relay is none.
2014-06-27 12:47:56 -04:00
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
8f4fb8bb64
fix mysql_escape_String call. Must use strlen, not sizeof
2014-06-26 14:44:37 -04:00
20bccdf431
use the size of the username and password when calling mysql_escape_string
2014-06-25 16:23:10 -04:00
0592276f53
fix mysql_escape_string calls after referring to docs
2014-06-24 11:22:08 -04:00
229cfcaa5b
Find the last occurrence of '@' in the host string. Fixes #443
2014-06-23 14:22:27 -04:00
a9cd6caeaf
Minor corrections to cURL code
2014-06-06 09:35:02 +03:00
5217bb668a
Merge remote branch 'origin/master' into video
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2014-06-06 09:25:05 +03:00
0898df6535
Fix minor bug
2014-06-06 09:01:03 +03:00
93aed26a00
escape username and password inside zm_user
...
by rogerroger288
2014-06-05 15:18:02 -04:00
189f6cba54
Add zm_videostore.cpp to CMakeLists.txt
2014-05-30 13:31:49 +10:00
e45635ed57
Updates to make gcc happy
2014-05-30 02:05:20 +10:00
5051c26d31
Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)
2014-05-30 02:05:20 +10:00
33090f2264
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/zm_config_defines.h
src/zm_ffmpeg.h
web/index.php
2014-05-30 01:55:24 +10:00
df3ab025f8
Imported missing files from master to feature-h264-videostorage
2014-05-30 01:47:52 +10:00
5fea101294
Merge pull request #421 from m-bene/ffmpegoptions
...
Add optional options field for ffmpeg and VLC source types
2014-05-18 18:07:42 +03:00
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
1b4f9c082c
change check for av_dict_set success
2014-05-15 16:01:29 +02:00
6016206f98
modify debug message
2014-05-15 15:42:27 +02:00
5cb7cd916f
add quotes to option debug/warn messages
2014-05-15 15:13:39 +02:00
c1557a99e5
add debug and warn messages
2014-05-15 15:06:01 +02:00
00aad4a128
frame_count should be an integer so don't use NULL
2014-05-05 13:06:58 -04:00
8333e909ed
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:29:55 -04:00
a8929914bb
add a NULL test for frame_coutn before calling atoi.
2014-05-05 11:29:09 -04:00
ae0ee9b3b3
testing/fixing
2014-05-05 15:54:13 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
4de46c7988
Fix wrong values used for type boolean
2014-05-05 09:26:32 +03:00
e916ce22d9
Update zm_jpeg.cpp
...
Change 0 to FALSE in order to avoid compiling error on Debian Wheezy:
[ 31%] Building CXX object src/CMakeFiles/zm.dir/zm_image.cpp.o
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::WriteJpeg(const char*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:863:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::EncodeJpeg(JOCTET*, int*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:1096:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
make[2]: *** [src/CMakeFiles/zm.dir/zm_image.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zm.dir/all] Error 2
make: *** [all] Error 2
2014-05-04 02:35:17 +02:00
20528e610f
fix digest auth for RTSP using HTTP tunnel
2014-04-30 15:33:29 +02:00
e25420efaa
add digest auth file for cmake
2014-04-29 17:31:06 +02:00
2ccd3492bf
parse 401 response for RTP_RTSP_HTTP
2014-04-29 00:42:38 +02:00
3595777d79
add RTSP digest authentication
2014-04-28 23:37:31 +02:00
48b361b1eb
- Arrays should be deleted using "delete[]" and not "delete"
2014-04-28 17:20:37 +02:00
a4f597696a
- render video using double buffers
...
this is to deliver frames more accurately to the client
2014-04-26 18:25:48 +02:00
448d287240
- use _AVCODECID_NONE instead of CODEC_ID_NONE
2014-04-25 23:22:53 +02:00
3155d621d0
- Removed an unreferenced variable
...
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
2014-04-25 22:57:29 +02:00
4767326484
A variable was referenced as a pointer when it was not.
2014-04-25 22:27:56 +02:00
04b8ecf0a7
Support streaming with zms (using ffmpeg) better
...
* ZoneMinder compiles with ffmpeg 0.5..master
* Make VideoStream class able to stream through ffmpeg better.
* Ability to use fixed quality instead of fixed bitrate (by specifying bitrate 0...100)
* Format url parameter supports <format>/<encoder> syntax
Details:
- Redefine av_err2str to a to avoid compiler warning on newer g++'s
- When using rtp format; if ffmpeg does not have a default codec, use CODEC_ID_MPEG4. (because this is what the default is as of 2.2 when this code was written)
- Specify ofc->packet_size if rtp format is requested
- Video generated in a thread to guarantee a constant fps.
- Move _AVCODECID definition into zm_ffmpeg.h (and use instead of (AV)CodecID
- Call avformat_network_init because ffmpeg warns about it beeing required soon.
- increase VideoStream::video_outbuf_size to 4MiB to be able to encode larger pictures
2014-04-25 22:12:58 +02:00
3eee90f811
Fix wrong no signal color bug introduced in zm v1.26. Thanks to forum user jcrews for spotting this
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21876
2014-04-23 13:27:43 +03:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
0dbcc836b4
Merge pull request #325 from elenril/master
...
Support building with new libavcodec versions.
2014-04-19 00:08:39 +03:00
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
a8a0bf922f
Move initializer for last_motion_score to avoid compiler warning "...zones will be initialized after ... last_motion_score ... when initialized here"
2014-04-10 15:53:28 +02:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
b126ca3e01
modify play button
2014-03-30 11:18:14 -05:00
3f7f398210
rework prev and next buttons
2014-03-28 17:18:34 -05:00
d60b4a2eee
Merge pull request #352 from m-bene/CurlHeaderCase
...
make curl header check case insensitive
2014-03-25 17:23:56 -05:00
264b98548f
Fix prev button while in gapless mode. All buttons tested and working.
2014-03-25 17:12:26 -05:00
d2be7d4cd8
Update zm_event.cpp
...
Commit 79af2adaa0
2014-03-25 07:01:40 -05:00
32941cfef7
make curl header check case insensitive
2014-03-23 07:06:54 +01:00
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
69f6af93d1
Patch for Debian bug 736516 - FTBFS on powerpc arch.
2014-03-16 10:51:54 -05:00
11fde73be1
This fixes a compile issue on i386 plaforms with the PIC compiler flag set
2014-03-15 11:38:10 -05:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
296aa2517b
Support building with new libavcodec versions.
...
CODEC_ID_* has been replaced with AV_CODEC_ID_* upstream.
2014-02-06 08:39:47 +01:00
f5eedb2bfc
Merge pull request #302 from pjhacnau/master
...
Additional compile guards to allow compilation on non-x86 archs
2014-02-01 14:02:47 -08:00
af7a49d8d0
Change comments for many Camera subclasses so that comments match the subclass.
2014-01-27 16:52:46 -08:00
9a31bbb4d0
zm_signal.cpp needed extra compile guards too. Confirmed building on non-x86 (ia64 for convenience)
2014-01-23 16:09:42 +11:00
5786af0d4e
Added missing x86 compile guards to zm_image.cpp. This should allow ZoneMinder to at least build again on non-x86 architectures.
2014-01-23 14:49:46 +11:00
784f9d925c
Remove src/zm_config_defines.h from repository as its not needed, its generated by zmconfgen.pl and will cause conflicts when doing an out-of-source build
2014-01-12 13:27:59 +02:00
a74b22a5ed
Merge pull request #297 from ZoneMinder/curl
...
Add cURL source type
2014-01-11 06:04:03 -08:00
3ded7276e1
Attempt to fix zmu "Error, failed to enumerate standard X: Success"
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21803
2014-01-10 13:40:52 +02:00
936198de85
Fix typo
2014-01-10 09:27:55 +02:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
21f7ec12eb
Added useful string functions that will be used later on for rtsp digest authentication
2014-01-08 15:57:17 +02:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
e202cdb6d0
Fixed digest authentication and minor changes
2014-01-05 10:15:28 +02:00
f9c8b4760b
Merge remote branch 'origin/master' into video
2014-01-05 09:02:11 +02:00
f39667c0cd
Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259 , closes #285
2014-01-01 18:19:42 +02:00
0ff77d835b
Improved error handling and other minor changes
2013-12-31 15:50:06 +02:00
f33d27b9c1
Remove unnessecary SPS & PPS writing code
2013-12-30 17:02:04 +02:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
20bd6671be
Correctly write SPS & PPS from x264 encoder headers
2013-12-25 08:55:30 +02:00
1bfd38c964
Added the ability to override preset, tune, profile and few other improvements
2013-12-25 08:49:27 +02:00
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
40b0f5d091
Merge pull request #1 from ZoneMinder/libvlc-improvements
...
Add header file checks for vlc/vlc.h
2013-12-21 17:07:57 -08:00
6c94308ba0
Fix bug in frame difference checker.
2013-12-22 01:06:12 +00:00
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
283f71625b
Fix serve memory leak
2013-12-20 04:02:19 +02:00
aa6380c4bd
Might now build with autotools.
2013-12-19 23:15:16 +00:00
3e2647782d
Better error handling
2013-12-19 23:10:45 +00:00
f4d72752a8
Check for frame differences as libvlc provides frames at a constant 15fps even if they are duplicates
2013-12-19 23:02:21 +00:00
e4a16ee57c
All colourspaces now working
2013-12-19 21:51:39 +00:00
c25011e781
Fix seemingly random lockup.
2013-12-19 21:51:39 +00:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
e9044b436d
Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
2013-12-19 19:21:30 +02:00
aa1e6a4f83
Add zm_video.h to autotools
2013-12-19 19:00:04 +02:00
6165b91690
Add zm_video.cpp to autotools
2013-12-19 18:57:23 +02:00
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
45ad839f96
Merge pull request #259 from ebarnard/rtsp-fix
...
Regression: Fix RTSP decoding errors in 1.26.4 fixes #221
2013-12-13 10:12:50 -08:00
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
c630174868
Adds support for h264 cameras that fail to set m bit for end of fragmented frames.
2013-12-07 11:21:10 +00:00
9a06ec51c6
Save a couple of cpu cycles.
2013-12-02 15:37:26 +00:00
5d9dcba2d8
Adds support more H264 NAL types and tidies function
2013-11-30 22:00:52 +00:00
21946b5854
H264 SPS and PPS frames are now handled correctly
2013-11-30 21:59:04 +00:00
80d172efa1
The last packet of a fragmented mpeg4 frame is no longer rejected.
2013-11-29 16:15:56 +00:00
3665c3ee3a
Fixed bug in mpeg4 depacketizer and RTCP implementation.
2013-11-28 23:07:46 +00:00
560d9bd809
RtpSource can now distinguish between payload types and handles some properly.
2013-11-28 21:32:06 +00:00
d50169c383
Added SWScale wrapper class and FFMPEG PixelFormat match function
2013-11-26 16:34:26 +02:00
88f2bc6b63
Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess
2013-11-24 15:37:47 +02:00
eff58367b4
IPv6 improvements
2013-11-22 15:30:05 +02:00
6a23a051c6
Merge pull request #252 from guotie/master
...
ipv6 support to http remote camera code
2013-11-19 06:27:20 -08:00
bed30d32b6
Remove round() mess
2013-11-15 11:41:26 +02:00
fe829e7a4b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-11-06 16:58:23 -05:00
891757da74
Merge pull request #232 from josephevans/master
...
Cast content_length to signed int for error-check comparison
2013-11-04 11:59:44 -08:00
f6bf3743f7
very sub-optimisation, removing duplicate comparisons
2013-11-04 10:50:40 -05:00
c1970a51e3
Fix few errors and syntax errors regarding curl
2013-11-04 17:10:07 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
4e1d23669f
Revert content_length to be int
2013-11-04 10:54:39 +02:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
833705b613
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
2013-11-03 10:26:04 +02:00
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
550040474f
Cast content_length to signed int for error-check comparison, preventing segfault when attempting to read buffer.
2013-11-01 14:11:48 -07:00
3c59961846
Merge branch 'cmake-outofsource'
2013-11-01 14:01:42 +02:00
21ae767aa7
Merge branch 'rotatefix'
2013-11-01 13:34:21 +02:00
069552321f
Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation
2013-11-01 13:31:37 +02:00
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
36d94d160f
Change zm_monitor.h mem_size from long to unsigned long. Fixes #226 .
2013-10-30 09:18:13 -04:00
2c04690865
Allow larger shared memory sizes. Fixes #226
2013-10-30 08:39:24 -04:00
79c7a1b255
Apply INSERTs in Event::AddFrames in batches to avoid excessive query length
2013-10-26 18:41:12 -07:00
17f2736860
Merge pull request #218 from ZoneMinder/ffmpegfixes
...
ffmpeg detection improvements
2013-10-19 13:06:03 -07:00
557c0a3d30
Update zm_remote_camera_http.cpp
2013-10-11 14:31:37 +08:00
042e50eecc
Update zm_remote_camera_http.cpp
2013-10-11 14:28:43 +08:00
e0728f7dc1
Update zm_remote_camera.cpp
2013-10-11 14:26:48 +08:00
e35c541715
Update zm_remote_camera.h
2013-10-11 14:24:23 +08:00
421d67e379
Improvements to zm_ffmpeg.h
2013-10-10 07:16:11 +03:00
8cecadadc2
Fix rotation bug caused by commit 5a9364703c
2013-10-10 06:55:45 +03:00
79af2adaa0
When loading a new event, always set the current frame id to the first frame rather than the last
2013-10-09 07:32:27 -05:00
70fb31c2e3
Changed debug levels to 4-6
2013-10-07 14:40:38 -05:00
32bd588a1c
Change frameserver warnings to debug level 2
2013-10-07 13:57:14 -05:00
25297bde73
Push the debugging in zm_signal further down
2013-10-07 11:27:53 +03:00
2cb65c6430
Always print cr2 and ip as long if siginfo and ucontext are available
2013-10-07 11:07:41 +03:00
1d7f664627
1) Removed the use of deprecated and undocumented sigcontext (Replaced by siginfo and ucontext)
...
2) Removed the checks for sigcontext, strsignal and siginfo.h
3) Added debugging code to the die handler
4) Using SA_RESTART in the hup and reload handlers to prevent certain functions returning EINTR
5) Added SIGINT and SIGQUIT to the term handler
2013-10-07 10:37:58 +03:00
e4b1be73ef
Used indent -linux on src/zm_signal.cpp to convert all spaces to tabs
2013-10-07 02:57:01 +03:00
cd154e86f2
Remove accidently committed planned crash code in src/zmc.cpp
2013-10-07 02:44:56 +03:00
0bb2ee7efc
More signal improvements:
...
1) Cleaner code
2) Fixed the path displayed in the addr2line line
3) Improved dependency checking for backtrace
4) Few more improvements
2013-10-07 02:37:50 +03:00
b5c536b134
Signal and backtrace improvements
2013-10-06 18:26:33 +03:00
a9e886aea2
Fix small zipped images bug introduced by commit e12a9dc408
2013-10-06 06:35:56 +03:00
96902c216d
Fix comparison sign warning introduced in pull request #174 commit 33b6e5c
2013-10-05 16:42:13 +03:00
e12a9dc408
Fixed compilation failure when zlib is not available
2013-10-04 23:20:39 +03:00
d4654f63ae
merge modern into feature-h264-videostorage
2013-10-04 10:52:53 +13:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
02e1a5eea6
Merge pull request #174 from POKKAHOH/rtsp-updates
...
More RTSP support, decoding fragmented NAL, understand sprop-parametr-sets
* Can now view more RTSP streams (including newer Axis cameras)
* Decode fragmented NAL
* Understand sprop-parametr-sets
* Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
* Remove #else errors for avutils/ffmpeg
2013-10-03 05:08:07 -07:00
b0a014928e
remove #else errors for avutils/ffmpeg
2013-10-01 16:05:49 +04:00
9dc19fa32b
Actually store video_data in the correct memory location
2013-09-29 12:55:42 +13:00
9c168a9af5
Check if videoing for bulk frame adding too
2013-09-29 10:10:16 +13:00
8da327e9a3
Keep last keyframe so that as soon as the video starts to record, it has a keyframe to use rather than waiting
2013-09-28 23:26:28 +12:00
35468a5b9c
Tidy up starting and stopping of recording
2013-09-28 23:22:58 +12:00
938f81c753
Add snapshot.jpg to event directory if we are doing a video recording
2013-09-28 23:17:22 +12:00
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
65afc830b1
Save a snapshot image alongside the h264 video for thumbnail and poster use
2013-09-28 18:50:54 +12:00
25ff325118
Comment missed in determining stream header.
...
Property 'title' and 'comment' not supported.
2013-09-27 16:51:33 +04:00
33b6e5cd03
Now can recive RTSP stream.
...
Decode fragmented NAL
Understand sprop-parametr-sets
Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
2013-09-27 15:08:11 +04:00
1251918cff
once more
2013-09-25 15:01:00 +00:00
a6ae54eed1
Add a #ifdef to include libavcodec/opt.h only for older ffmpeg's which have it
2013-09-25 14:05:38 +00:00
9e7cd026eb
Enable record support for non-h.264 camera's
2013-09-25 13:58:53 +00:00
26e75df32e
Minor patches to support older ffmpeg under distro's like Ubuntu 12.04
2013-09-25 11:28:38 +00:00
dddec742e0
Fixed zm_logger not including zm_config.h first.
2013-09-25 09:00:52 +03:00
e8d20faec8
Proper checking for sys/syscall.h
2013-09-25 07:11:59 +03:00
f2225f23cd
Update zm_thread.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:07:36 -03:00
aeed1d4043
Update zm_timer.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:03:36 -03:00
aef9ab2f00
Removed NumCoords entirely from zm_zone.cpp
2013-09-24 07:41:37 +03:00
ac7f7f08a7
Fix some compilation warnings
2013-09-24 07:31:02 +03:00
c526fcedd7
Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
2013-09-24 07:15:37 +03:00
3dfff0b3ac
Merge branch 'master' into feature-h264-videostorage
2013-09-22 10:44:38 +12:00
a7c4d3f3e9
Accidental copy of old logic. Fixed
2013-09-22 10:40:54 +12:00
6a7b38dac6
update changes
2013-09-19 21:55:56 +12:00
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
42e37e7e25
Add video playback to events. Very crude at this stage but it works
2013-09-14 04:50:51 +12:00
5e0c0ffc27
Merge upstream master to branch to keep up to date
2013-09-14 01:10:09 +12:00
774a84d487
Updated event processing to actually add frames into the DB. Use MP4 container
2013-09-14 00:50:54 +12:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
2b568906e5
Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs
2013-09-10 18:37:56 +03:00
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
c61029f780
First iteration of h264 saving in the capture daemon.
...
To use, enable use_mkv_storage in the paths section of the ZM config (be sure to import the new SQL config)
Must have the latest FFMPEG compiled from git with x264 linked in
2013-09-06 15:07:46 +12:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
3764000f81
Fix "Can't stat : No such file or directory" message
...
Many zoneminder systems have a "Can't stat : No such file or directory" in their logs each time zmfix is run. The problem was traced back to the sql query, which looked for a ControlDevice field that was not null. However, the ControlDevice field is empty, rather than null, when there is no control device.
2013-08-30 14:30:47 -05:00
4e9698ae13
Fix for Issue #88 - ZMS crashing
...
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 07:22:41 -05:00
35c36bd769
Merge pull request #80 from knnniggett/corruptjpeg
...
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-20 06:24:20 -07:00
de9b1af1a1
Merge pull request #79 from knnniggett/frameserver
...
Added frameserver patch from Zoneminder Wiki
Changes the socket reader in zmf from a single read, to a loop read.
Incomplete reads would be reported even though the image writer wrote
the whole image to the socket. The problem was when the read went to
read the image frame from the socket, all the data had not yet been written
to the socket by the writer, so the reader thought there was a problem.
The loop reads from the socket until a full image frame is read, or there is
an error.
Originally at http://www.zoneminder.com/wiki/index.php/1.24.2_Patches
2013-08-20 06:23:34 -07:00
860c331d58
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-18 15:01:46 -05:00
31daa32194
Added frameserver patch from Zoneminder Wiki
2013-08-18 13:28:55 -05:00
0a911d9d27
The .deps directory shouldn't have been included. Removing it.
...
.deps is generated during configure (or is it make?). Fixes #52
2013-08-15 12:44:10 -04:00
Isaac Connor
SteveGilvarry
Andrew Bauer
Isaac Connor
Andrew Bauer
Emmanuel Papin
m-bene
Sune1337
Sune1337
Kyle Johnson
root
stevegilvarry
Kyle Johnson
Kfir Itzhak
Will W
aztazt
Anton Khirnov
Kevin Dalley
Peter Howard
Peter Howard
Ed Barnard
Edward Barnard
David Nesting
Joe Evans
guotie
Chris Wiggins
Isaac Connor
POKKAHOH
Chetan Chauhan
Raul Almeida
Isaac Connor
Andrew Bauer