manupap1
a1aaeb7905
Merge branch 'master' into memory_fix
2014-11-14 22:24:33 +01:00
manupap1
b4732e4750
Close logger and database on exit
2014-11-14 22:17:44 +01:00
manupap1
f05699a005
Fix a bug when closing RTSP session over TCP
2014-11-14 11:17:27 +01:00
Andrew Bauer
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
Andrew Bauer
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
Isaac Connor
9016e30f92
BSD uses /dev/bktr0 instead of /dev/video. This is actually pulled FreeBSD ports.
2014-11-13 14:47:07 -05:00
Isaac Connor
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
SteveGilvarry
8d71d4de03
Swap to mp4 container
2014-11-09 18:15:43 +11:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
3e8d49d88d
add comment to improve understanding
2014-11-08 14:50:44 -05:00
SteveGilvarry
dd59a05165
Resolve SegFault on videostore
2014-11-08 13:06:23 +11:00
manupap1
336c69e3c0
Use our own SSRC when sending packets on the control stream
2014-11-07 19:38:11 +01:00
manupap1
ea8b93be84
Use our own SSRC when sending packets on the control stream
2014-11-07 19:15:42 +01:00
manupap1
ee7d6a6254
Send keepalive messages if the rtsp server supports this feature
2014-11-07 17:39:50 +01:00
Andrew Bauer
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
manupap1
e764938a0d
Fixed bug in rtsp streaming caused by a bad string concatenation
2014-11-06 10:16:28 +01:00
Isaac Connor
a88ce80716
Add a stringVector join function for future use
2014-11-05 14:01:48 -05:00
manupap1
fefc17b0fc
Fixed bug in rtsp streaming caused by a signed - unsigned conversion.
2014-11-05 19:08:57 +01:00
SteveGilvarry
2712da614e
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-11-05 19:51:15 +11:00
Isaac Connor
57e5b4fee8
Fix segfault on zmu -l due to not connectig to the shared mem
2014-10-23 09:00:53 -04:00
SteveGilvarry
0e4156c095
Add CaptureAndRecord to vlc, still need to make it record
2014-10-23 19:56:35 +11:00
SteveGilvarry
ee90541370
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2014-10-18 15:02:43 +11:00
Isaac Connor
8a33f78243
bugfix; coredump if no codec name was specified in url.
2014-10-15 14:35:01 -04:00
Isaac Connor
2a71973307
make zm compile using libav on ubunut 14.04
2014-10-15 13:23:29 -04:00
m-bene
32f05ada86
add digest auth file for cmake
...
Conflicts:
src/CMakeLists.txt
2014-10-13 16:51:21 +11:00
SteveGilvarry
7f530bcc2a
Removed duplicate code and brackets
2014-10-12 22:12:54 +11:00
SteveGilvarry
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
SteveGilvarry
6cb96f1316
Put opts back in
2014-10-12 16:47:27 +11:00
Sune1337
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
Sune1337
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
Sune1337
f32b1276df
Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined.
2014-10-12 16:23:58 +11:00
Sune1337
83d2a494c3
Process should exit if ReopenFfmpeg function fails to create a worker thread.
2014-10-12 16:23:58 +11:00
Sune1337
7de59df080
removed use of av_err2str. someone could not compile when using that macro.
2014-10-12 16:23:58 +11:00
Sune1337
a307b8a1e3
Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file.
2014-10-12 16:23:58 +11:00
Sune1337
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
Andrew Bauer
0bb2d9f81d
Merge pull request #407 from m-bene/rtspDigest
...
Rtsp digest
2014-10-11 17:39:57 -05:00
Andrew Bauer
9ef9b17c6b
fixes ftbs with no ffmpeg support
2014-10-11 17:14:09 -05:00
Andy Bauer
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
Isaac Connor
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
Isaac Connor
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
Isaac Connor
8891639767
fix another segfault
2014-09-08 16:46:41 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
Isaac Connor
5a7c989ccd
remove some crap that I pushed
2014-08-21 11:52:35 -04:00
Isaac Connor
c6d19b3ecf
whitespace issue
2014-08-21 11:14:38 -04:00
Isaac Connor
3d8ad2c906
fall back to Config table setting for v4l MultiBUgger and captures per frame.
2014-08-21 09:59:08 -04:00
Isaac Connor
92d110859d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-08-19 09:12:45 -04:00
Isaac Connor
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
Kyle Johnson
6d92299d46
Merge pull request #440 from kylejohnson/master
...
Cleaning up the Contribution section of the README
2014-08-12 11:13:46 -04:00
root
cca01dc357
connect to the monitor, because instantiating the object no longer does that
2014-07-30 14:20:48 -04:00
Isaac Connor
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
Isaac Connor
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
Isaac Connor
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
Isaac Connor
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
Isaac Connor
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
Isaac Connor
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
Isaac Connor
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
Andrew Bauer
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
stevegilvarry
e6931b95a1
Putting placeholder in for CaptureAndRecord function
2014-06-30 21:56:13 +10:00
stevegilvarry
557de3efac
Add CaptureandRecord from zm_camera.h
2014-06-30 21:25:49 +10:00
stevegilvarry
8c81c8df9c
Option handled added in master, removing duplicate declaration
2014-06-29 08:50:17 +10:00
stevegilvarry
17d7404c93
Merging master again
2014-06-28 22:50:28 +10:00
Isaac Connor
6e22278f74
password might be null when auth_relay is none.
2014-06-27 12:47:56 -04:00
Isaac Connor
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
Isaac Connor
8f4fb8bb64
fix mysql_escape_String call. Must use strlen, not sizeof
2014-06-26 14:44:37 -04:00
Isaac Connor
20bccdf431
use the size of the username and password when calling mysql_escape_string
2014-06-25 16:23:10 -04:00
Isaac Connor
0592276f53
fix mysql_escape_string calls after referring to docs
2014-06-24 11:22:08 -04:00
Kyle Johnson
229cfcaa5b
Find the last occurrence of '@' in the host string. Fixes #443
2014-06-23 14:22:27 -04:00
Kfir Itzhak
a9cd6caeaf
Minor corrections to cURL code
2014-06-06 09:35:02 +03:00
Kfir Itzhak
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
Kfir Itzhak
0898df6535
Fix minor bug
2014-06-06 09:01:03 +03:00
Isaac Connor
93aed26a00
escape username and password inside zm_user
...
by rogerroger288
2014-06-05 15:18:02 -04:00
stevegilvarry
189f6cba54
Add zm_videostore.cpp to CMakeLists.txt
2014-05-30 13:31:49 +10:00
Will W
e45635ed57
Updates to make gcc happy
2014-05-30 02:05:20 +10:00
Will W
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
stevegilvarry
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
stevegilvarry
df3ab025f8
Imported missing files from master to feature-h264-videostorage
2014-05-30 01:47:52 +10:00
Kfir Itzhak
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
m-bene
a81b9b8ce2
change examples for options
2014-05-17 21:48:08 +02:00
m-bene
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
m-bene
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
m-bene
1b4f9c082c
change check for av_dict_set success
2014-05-15 16:01:29 +02:00
m-bene
6016206f98
modify debug message
2014-05-15 15:42:27 +02:00
m-bene
5cb7cd916f
add quotes to option debug/warn messages
2014-05-15 15:13:39 +02:00
m-bene
c1557a99e5
add debug and warn messages
2014-05-15 15:06:01 +02:00
Isaac Connor
00aad4a128
frame_count should be an integer so don't use NULL
2014-05-05 13:06:58 -04:00
Isaac Connor
8333e909ed
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-05-05 11:29:55 -04:00
Isaac Connor
a8929914bb
add a NULL test for frame_coutn before calling atoi.
2014-05-05 11:29:09 -04:00
m-bene
ae0ee9b3b3
testing/fixing
2014-05-05 15:54:13 +02:00
m-bene
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
Kfir Itzhak
4de46c7988
Fix wrong values used for type boolean
2014-05-05 09:26:32 +03:00
aztazt
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
m-bene
20528e610f
fix digest auth for RTSP using HTTP tunnel
2014-04-30 15:33:29 +02:00
m-bene
e25420efaa
add digest auth file for cmake
2014-04-29 17:31:06 +02:00
m-bene
2ccd3492bf
parse 401 response for RTP_RTSP_HTTP
2014-04-29 00:42:38 +02:00
m-bene
3595777d79
add RTSP digest authentication
2014-04-28 23:37:31 +02:00
Sune1337
48b361b1eb
- Arrays should be deleted using "delete[]" and not "delete"
2014-04-28 17:20:37 +02:00
Sune1337
a4f597696a
- render video using double buffers
...
this is to deliver frames more accurately to the client
2014-04-26 18:25:48 +02:00
Sune1337
448d287240
- use _AVCODECID_NONE instead of CODEC_ID_NONE
2014-04-25 23:22:53 +02:00
Sune1337
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
Sune1337
4767326484
A variable was referenced as a pointer when it was not.
2014-04-25 22:27:56 +02:00
Sune1337
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
Kfir Itzhak
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
Kfir Itzhak
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
Kfir Itzhak
0dbcc836b4
Merge pull request #325 from elenril/master
...
Support building with new libavcodec versions.
2014-04-19 00:08:39 +03:00
Kfir Itzhak
0d7c52dc1f
Merge remote branch 'origin/master' into video
...
Conflicts:
src/CMakeLists.txt
src/zm_monitor.cpp
2014-04-17 13:26:00 +03:00
Sune1337
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
Sune1337
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
Andrew Bauer
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
Andrew Bauer
b126ca3e01
modify play button
2014-03-30 11:18:14 -05:00
Andrew Bauer
3f7f398210
rework prev and next buttons
2014-03-28 17:18:34 -05:00
Andrew Bauer
d60b4a2eee
Merge pull request #352 from m-bene/CurlHeaderCase
...
make curl header check case insensitive
2014-03-25 17:23:56 -05:00
Andrew Bauer
264b98548f
Fix prev button while in gapless mode. All buttons tested and working.
2014-03-25 17:12:26 -05:00
Andrew Bauer
d2be7d4cd8
Update zm_event.cpp
...
Commit 79af2adaa0
attempted to fix the Prev button when in Gapless Mode, but it caused issues when rewinding. Rolling back.
2014-03-25 07:01:40 -05:00
m-bene
32941cfef7
make curl header check case insensitive
2014-03-23 07:06:54 +01:00
m-bene
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
Andrew Bauer
69f6af93d1
Patch for Debian bug 736516 - FTBFS on powerpc arch.
2014-03-16 10:51:54 -05:00
Andrew Bauer
11fde73be1
This fixes a compile issue on i386 plaforms with the PIC compiler flag set
2014-03-15 11:38:10 -05:00
m-bene
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
Anton Khirnov
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
Andrew Bauer
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
Kevin Dalley
af7a49d8d0
Change comments for many Camera subclasses so that comments match the subclass.
2014-01-27 16:52:46 -08:00
Peter Howard
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
Peter Howard
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
Kfir Itzhak
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
Kfir Itzhak
a74b22a5ed
Merge pull request #297 from ZoneMinder/curl
...
Add cURL source type
2014-01-11 06:04:03 -08:00
Kfir Itzhak
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
Kfir Itzhak
936198de85
Fix typo
2014-01-10 09:27:55 +02:00
Kfir Itzhak
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
Kfir Itzhak
21f7ec12eb
Added useful string functions that will be used later on for rtsp digest authentication
2014-01-08 15:57:17 +02:00
Kfir Itzhak
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
Kfir Itzhak
e202cdb6d0
Fixed digest authentication and minor changes
2014-01-05 10:15:28 +02:00
Kfir Itzhak
f9c8b4760b
Merge remote branch 'origin/master' into video
2014-01-05 09:02:11 +02:00
Kfir Itzhak
f39667c0cd
Fix ZM not compiling with ZM_NO_FFMPEG=ON since #259 , closes #285
2014-01-01 18:19:42 +02:00
Kfir Itzhak
0ff77d835b
Improved error handling and other minor changes
2013-12-31 15:50:06 +02:00
Kfir Itzhak
f33d27b9c1
Remove unnessecary SPS & PPS writing code
2013-12-30 17:02:04 +02:00
Kfir Itzhak
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
Kfir Itzhak
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
Kfir Itzhak
e652441996
Merge remote-tracking branch 'origin/master' into video
...
Conflicts:
configure.ac
src/CMakeLists.txt
2013-12-26 21:03:45 +02:00
Kfir Itzhak
20bd6671be
Correctly write SPS & PPS from x264 encoder headers
2013-12-25 08:55:30 +02:00
Kfir Itzhak
1bfd38c964
Added the ability to override preset, tune, profile and few other improvements
2013-12-25 08:49:27 +02:00
Kfir Itzhak
89cfb96855
Merge pull request #277 from ebarnard/libvlc
...
Add libVLC source type
2013-12-22 13:01:19 -08:00
Kfir Itzhak
e9bb632a78
Remove zmfix
2013-12-22 16:08:17 +02:00
Kfir Itzhak
8ae387e376
Few minor code improvements
2013-12-22 15:19:55 +02:00
Ed Barnard
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
Edward Barnard
6c94308ba0
Fix bug in frame difference checker.
2013-12-22 01:06:12 +00:00
Kfir Itzhak
dce1cbf0ce
Add header file checks for vlc/vlc.h
2013-12-21 06:47:12 +02:00
Kfir Itzhak
283f71625b
Fix serve memory leak
2013-12-20 04:02:19 +02:00
Edward Barnard
aa6380c4bd
Might now build with autotools.
2013-12-19 23:15:16 +00:00
Edward Barnard
3e2647782d
Better error handling
2013-12-19 23:10:45 +00:00
Edward Barnard
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
Edward Barnard
e4a16ee57c
All colourspaces now working
2013-12-19 21:51:39 +00:00
Edward Barnard
c25011e781
Fix seemingly random lockup.
2013-12-19 21:51:39 +00:00
Edward Barnard
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
Kfir Itzhak
e9044b436d
Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
2013-12-19 19:21:30 +02:00
Kfir Itzhak
aa1e6a4f83
Add zm_video.h to autotools
2013-12-19 19:00:04 +02:00
Kfir Itzhak
6165b91690
Add zm_video.cpp to autotools
2013-12-19 18:57:23 +02:00
Kfir Itzhak
2b79ff2cbd
Initial commit for saving events as videos :)
2013-12-19 18:38:07 +02:00
Isaac Connor
48a6dcf5ce
Change COnfig from using the subroutine symbol table to just using a global hash
2013-12-16 16:32:02 -05:00
Isaac Connor
e5ca01b8b1
More rough-in
2013-12-16 10:49:51 -05:00
Isaac Connor
433370c9e3
Merge branch 'master' into storageareas
...
Conflicts:
distros/ubuntu1204/changelog
src/zm_monitor.h
2013-12-15 15:16:14 -05:00
Isaac Connor
8bd8e326bc
add storage
2013-12-13 13:45:00 -05:00
Isaac Connor
1e6a5884e2
rough in making the Monitor know about the storage
2013-12-13 13:39:39 -05:00
Isaac Connor
a02744bf2a
rough in the storage object
2013-12-13 13:27:07 -05:00
Kyle Johnson
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
Kyle Johnson
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
Kfir Itzhak
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
Edward Barnard
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
Edward Barnard
9a06ec51c6
Save a couple of cpu cycles.
2013-12-02 15:37:26 +00:00
Edward Barnard
5d9dcba2d8
Adds support more H264 NAL types and tidies function
2013-11-30 22:00:52 +00:00
Edward Barnard
21946b5854
H264 SPS and PPS frames are now handled correctly
2013-11-30 21:59:04 +00:00
Edward Barnard
80d172efa1
The last packet of a fragmented mpeg4 frame is no longer rejected.
2013-11-29 16:15:56 +00:00
Edward Barnard
3665c3ee3a
Fixed bug in mpeg4 depacketizer and RTCP implementation.
2013-11-28 23:07:46 +00:00
Edward Barnard
560d9bd809
RtpSource can now distinguish between payload types and handles some properly.
2013-11-28 21:32:06 +00:00
Kfir Itzhak
d50169c383
Added SWScale wrapper class and FFMPEG PixelFormat match function
2013-11-26 16:34:26 +02:00
Kfir Itzhak
88f2bc6b63
Fix zmc crashing on shutdown (for remote http cameras) caused by content_length sign mess
2013-11-24 15:37:47 +02:00
Kfir Itzhak
eff58367b4
IPv6 improvements
2013-11-22 15:30:05 +02:00
Kfir Itzhak
6a23a051c6
Merge pull request #252 from guotie/master
...
ipv6 support to http remote camera code
2013-11-19 06:27:20 -08:00
Kfir Itzhak
bed30d32b6
Remove round() mess
2013-11-15 11:41:26 +02:00
Isaac Connor
fe829e7a4b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2013-11-06 16:58:23 -05:00
Kfir Itzhak
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
Isaac Connor
f6bf3743f7
very sub-optimisation, removing duplicate comparisons
2013-11-04 10:50:40 -05:00
Kfir Itzhak
c1970a51e3
Fix few errors and syntax errors regarding curl
2013-11-04 17:10:07 +02:00
Kfir Itzhak
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
Kfir Itzhak
4e1d23669f
Revert content_length to be int
2013-11-04 10:54:39 +02:00
Kfir Itzhak
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
Kfir Itzhak
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
David Nesting
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
Joe Evans
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
Kfir Itzhak
3c59961846
Merge branch 'cmake-outofsource'
2013-11-01 14:01:42 +02:00
Kfir Itzhak
21ae767aa7
Merge branch 'rotatefix'
2013-11-01 13:34:21 +02:00
Kfir Itzhak
069552321f
Fix zmc crashing when four field deinterlacing is enabled together with left or right rotation
2013-11-01 13:31:37 +02:00
Kfir Itzhak
c2bd7c97ec
First attempt at enabling out-of-source building for zm with cmake
2013-10-31 18:10:00 +02:00
Kyle Johnson
36d94d160f
Change zm_monitor.h mem_size from long to unsigned long. Fixes #226 .
2013-10-30 09:18:13 -04:00
Kyle Johnson
2c04690865
Allow larger shared memory sizes. Fixes #226
2013-10-30 08:39:24 -04:00
David Nesting
79c7a1b255
Apply INSERTs in Event::AddFrames in batches to avoid excessive query length
2013-10-26 18:41:12 -07:00
Kfir Itzhak
17f2736860
Merge pull request #218 from ZoneMinder/ffmpegfixes
...
ffmpeg detection improvements
2013-10-19 13:06:03 -07:00
guotie
557c0a3d30
Update zm_remote_camera_http.cpp
2013-10-11 14:31:37 +08:00
guotie
042e50eecc
Update zm_remote_camera_http.cpp
2013-10-11 14:28:43 +08:00
guotie
e0728f7dc1
Update zm_remote_camera.cpp
2013-10-11 14:26:48 +08:00
guotie
e35c541715
Update zm_remote_camera.h
2013-10-11 14:24:23 +08:00
Kfir Itzhak
421d67e379
Improvements to zm_ffmpeg.h
2013-10-10 07:16:11 +03:00
Kfir Itzhak
8cecadadc2
Fix rotation bug caused by commit 5a9364703c
2013-10-10 06:55:45 +03:00
Andrew Bauer
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
Andrew Bauer
70fb31c2e3
Changed debug levels to 4-6
2013-10-07 14:40:38 -05:00
Andrew Bauer
32bd588a1c
Change frameserver warnings to debug level 2
2013-10-07 13:57:14 -05:00
Kfir Itzhak
25297bde73
Push the debugging in zm_signal further down
2013-10-07 11:27:53 +03:00
Kfir Itzhak
2cb65c6430
Always print cr2 and ip as long if siginfo and ucontext are available
2013-10-07 11:07:41 +03:00
Kfir Itzhak
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
Kfir Itzhak
e4b1be73ef
Used indent -linux on src/zm_signal.cpp to convert all spaces to tabs
2013-10-07 02:57:01 +03:00
Kfir Itzhak
cd154e86f2
Remove accidently committed planned crash code in src/zmc.cpp
2013-10-07 02:44:56 +03:00
Kfir Itzhak
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
Kfir Itzhak
b5c536b134
Signal and backtrace improvements
2013-10-06 18:26:33 +03:00
mastertheknife
a9e886aea2
Fix small zipped images bug introduced by commit e12a9dc408
2013-10-06 06:35:56 +03:00
Kfir Itzhak
96902c216d
Fix comparison sign warning introduced in pull request #174 commit 33b6e5c
2013-10-05 16:42:13 +03:00
mastertheknife
e12a9dc408
Fixed compilation failure when zlib is not available
2013-10-04 23:20:39 +03:00
Chris Wiggins
d4654f63ae
merge modern into feature-h264-videostorage
2013-10-04 10:52:53 +13:00
Isaac Connor
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
Kyle Johnson
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
POKKAHOH
b0a014928e
remove #else errors for avutils/ffmpeg
2013-10-01 16:05:49 +04:00
Chris Wiggins
9dc19fa32b
Actually store video_data in the correct memory location
2013-09-29 12:55:42 +13:00
Chris Wiggins
9c168a9af5
Check if videoing for bulk frame adding too
2013-09-29 10:10:16 +13:00
Chris Wiggins
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
Chris Wiggins
35468a5b9c
Tidy up starting and stopping of recording
2013-09-28 23:22:58 +12:00
Chris Wiggins
938f81c753
Add snapshot.jpg to event directory if we are doing a video recording
2013-09-28 23:17:22 +12:00
mastertheknife
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
Chris Wiggins
65afc830b1
Save a snapshot image alongside the h264 video for thumbnail and poster use
2013-09-28 18:50:54 +12:00
POKKAHOH
25ff325118
Comment missed in determining stream header.
...
Property 'title' and 'comment' not supported.
2013-09-27 16:51:33 +04:00
POKKAHOH
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
Chetan Chauhan
1251918cff
once more
2013-09-25 15:01:00 +00:00
Chetan Chauhan
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
Chetan Chauhan
9e7cd026eb
Enable record support for non-h.264 camera's
2013-09-25 13:58:53 +00:00
Chetan Chauhan
26e75df32e
Minor patches to support older ffmpeg under distro's like Ubuntu 12.04
2013-09-25 11:28:38 +00:00
mastertheknife
dddec742e0
Fixed zm_logger not including zm_config.h first.
2013-09-25 09:00:52 +03:00
mastertheknife
e8d20faec8
Proper checking for sys/syscall.h
2013-09-25 07:11:59 +03:00
Raul Almeida
f2225f23cd
Update zm_thread.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:07:36 -03:00
Raul Almeida
aeed1d4043
Update zm_timer.h
...
As proposed on https://github.com/ZoneMinder/ZoneMinder/issues/170
2013-09-24 17:03:36 -03:00
mastertheknife
aef9ab2f00
Removed NumCoords entirely from zm_zone.cpp
2013-09-24 07:41:37 +03:00
mastertheknife
ac7f7f08a7
Fix some compilation warnings
2013-09-24 07:31:02 +03:00
mastertheknife
c526fcedd7
Fix an issue created by commit 2b568906e5: Log flooded with image dimensions differ errors
2013-09-24 07:15:37 +03:00
Chris Wiggins
3dfff0b3ac
Merge branch 'master' into feature-h264-videostorage
2013-09-22 10:44:38 +12:00
Chris Wiggins
a7c4d3f3e9
Accidental copy of old logic. Fixed
2013-09-22 10:40:54 +12:00
Chris Wiggins
6a7b38dac6
update changes
2013-09-19 21:55:56 +12:00
Isaac Connor
b08a8252c4
Merge branch 'dukess-master' into v1.26.4-beta
...
Conflicts:
scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
mastertheknife
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
mastertheknife
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
Chris Wiggins
42e37e7e25
Add video playback to events. Very crude at this stage but it works
2013-09-14 04:50:51 +12:00
Chris Wiggins
5e0c0ffc27
Merge upstream master to branch to keep up to date
2013-09-14 01:10:09 +12:00
Chris Wiggins
774a84d487
Updated event processing to actually add frames into the DB. Use MP4 container
2013-09-14 00:50:54 +12:00
Isaac Connor
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
mastertheknife
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
Isaac Connor
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
Chris Wiggins
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
Kyle Johnson
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
Andy
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
Andy
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
Kyle Johnson
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
Kyle Johnson
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
Knniggett
860c331d58
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-18 15:01:46 -05:00
Andrew Bauer
31daa32194
Added frameserver patch from Zoneminder Wiki
2013-08-18 13:28:55 -05:00
Kyle Johnson
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
Kyle Johnson
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
Kyle Johnson
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
Kyle Johnson
c3f468eb8c
Fixing zm_image_analyser.h:13:25: fatal error: zm_detector.h: No such file or directory
2013-08-13 09:53:31 -04:00
Kyle Johnson
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
Isaac Connor
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
Isaac Connor
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
Isaac Connor
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
Isaac Connor
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
Isaac Connor
044af38cdb
match up #if's regarding gnutls-openssl
2013-04-29 16:44:37 -04:00
Isaac Connor
ce61512a0d
gnutls changes from ubuntu package
2013-04-29 15:32:55 -04:00
Isaac Connor
36f25c7ffb
add -fno-inline from ubuntu package
2013-04-29 15:31:55 -04:00
Isaac Connor
1c3f6a9637
fix typos
2013-04-29 13:45:27 -04:00
Isaac Connor
0967797933
add unistd.h to fix compile
2013-04-29 13:44:21 -04:00
Isaac Connor
6db183a5ba
add mathetmatics.h to fix compile
2013-04-29 13:43:48 -04:00
Isaac Connor
bd5e2da5c7
fix for kernel3.5
2013-04-29 13:29:51 -04:00
Isaac Connor
84370b7fd8
add unistd.h include to fix compile
2013-04-29 12:51:46 -04:00
nextime
8bf1824159
Ok, this time it will work?
2013-04-27 02:17:11 +02:00
nextime
7cb43d0efc
Fix a wrong macro..
2013-04-27 01:10:51 +02:00
nextime
6af58aca09
Fix CodecID changes in recent libav libraries
2013-04-27 00:59:34 +02:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Kfir Itzhak
0ef29743f2
Merged the deinterlacing code, although only four field is optimized so far, and is still not working perfectly.
...
1) Fixed compile errors that may occur when compiling with gcc 4.7 or newer.
2) Modified the check for libavcodec to work correctly with the latest versions of ffmpeg.
2012-07-17 12:23:13 +03:00
Kfir Itzhak
ed2e3a8ce0
Fixed few compiler errors (unknown registers and such) and modified zm_create.sql to include the new field.
2012-07-17 10:36:21 +03:00
Kfir Itzhak
0fe55a18bf
Something useable :)
...
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
2012-07-15 17:30:37 +03:00
Kfir Itzhak
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
Kfir Itzhak
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
Kfir Itzhak
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
stan
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
stan
f9022778f7
Fixed template instantiation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3661 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:45:54 +00:00
stan
8dd2bbfc17
Support gnutls md5 generation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3660 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:00:20 +00:00
Kfir Itzhak
e413042cdb
Fixed a longtime bug in my version that caused distorted analysis images in some setups.
2012-04-01 13:03:18 +03:00
Kfir Itzhak
9dbf00ebd7
A big performance improvement for SSE2 delta (32bit RGB only). Should be useful on processors without SSSE3, such as many AMD processors.
2012-03-22 08:41:17 +02:00
Kfir Itzhak
0932f50d80
1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
...
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +02:00
Kfir Itzhak
40a8dd9b63
Automatic capture palette selection now displays the selected capture palette in the log (only for zmc).
2012-03-07 15:02:27 +02:00
Kfir Itzhak
2dfdc8129c
Few small fixes:
...
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
2012-03-07 14:33:09 +02:00
Kfir Itzhak
8d304972f1
Fix compile error caused by the previous commit.
2012-02-09 13:10:48 +02:00
Kfir Itzhak
115db01f8c
Few changes:
...
1) Fixed buffer overflow occurring if JPEG quality is set to 100.
2) Changed linked monitors alarm behaviour again.
3) Fixed extremely poor blend performance on some processors such as the Intel Atom.
4) Added optional profiling code for Blend() and Delta().
2012-02-09 12:23:45 +02:00
Kfir Itzhak
1f072b1a62
Fixed few zma issues related to signal checking and linked monitors.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
2135e58c41
Fixed zma crashes caused by flaky signal and few bugs in mocord mode.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
fc1807f433
Fixed possible small stack corruption.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
8e9ccfe1ec
Removed the now unused SSE2 AlarmedPixels code.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
d7e9c6ad5c
Analysis image finally working!
2012-02-01 07:33:21 +02:00
Kfir Itzhak
af821828b8
Changed a few warnings
2012-02-01 07:33:21 +02:00
Kfir Itzhak
e217e99562
1) Fixed wrong alarm colour in analysis images.
...
2) Added GCC's target attribute to remove the need for -msse2.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
28e06e935b
1) Fixed blob motion detection issues.
...
2) Some more progress towards getting analysis images working.
3) Fixed possible log corruption because of ssedetect().
2012-02-01 07:33:21 +02:00
Kfir Itzhak
b3a1dcf032
Fixed SSSE3 detection and changed few text strings.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
de015761c1
Fix different palettes warning showing up when using automatic palette selection.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
41ad83a7d3
Added updated configure and src/zm_config_defines.h
2012-02-01 07:33:21 +02:00
Kfir Itzhak
b51bce05e8
Rebased to SVN revision 3487
2012-02-01 07:33:21 +02:00
Kfir Itzhak
b4921c4403
1) Made 24bit the default target colorspace.
...
2) Changed crop info's layout.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
66f5d7c2f1
Added #defines to control the inclusion of the SSE code.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
349e18b543
Few text corrections.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
ca57ae6438
1) Fixed and refinished the JPEG and MJPEG capture palettes support.
...
2) Added the SSE2 alarmedpixels code, although its unused at the moment.
3) Small changes in libjpeg interaction.
4) Small other changes.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
7e0206bbcc
Disable zm_event.cpp deleting the diagnostic images every second
2012-02-01 07:33:21 +02:00
Kfir Itzhak
066fe89718
Added automatic capture palette selection.
2012-02-01 07:33:21 +02:00
Kfir Itzhak
bdf0687550
1) Added support for JPEG and MJPEG capture palettes - needs to be tested
...
2) Allow the blend percent to be zero, to disable blending
2012-02-01 07:33:20 +02:00
Kfir Itzhak
46aa1bb1d8
Fixed bug in linked monitor loading code which should fix the crash of a monitor linked to a disabled monitor.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
442b9e5ba2
1) Reloaded zm_event.cpp to hopefully fix its issues once and for all.
...
2) Added backup code in case sendfile() fails.
3) Fixed a bug that allowed to link a monitor to itself, which can cause alarm lasting forever once triggered.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
bc255d1b06
1) Replaced the blend and delta algorithms with newer versions that use 1 less register and 1 less instruction per iteration.
...
2) Fixed small bug in rgb_convert
2012-02-01 07:33:20 +02:00
Kfir Itzhak
de2df49d64
1) Added support for the new formats to the mpeg code.
...
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
11029d57b6
Small code fixes
2012-02-01 07:33:20 +02:00
Kfir Itzhak
eab09844de
1) Some more work on the overlay function.
...
2) Got rid of some compiler warning messages.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
2fd6e99ec5
1) Rebased to 1.24.4
...
2) Reverted to stock zmdc.pl.in and zmwatch.pl.in because the bugs are fixed
3) Updated configure and Makefile files
2012-02-01 07:33:20 +02:00
Kfir Itzhak
eeaed7ccd3
Some small changes
...
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
1afe0bbf42
1) Added back the colour SSE2 delta algorithms
...
2) Modified SSE algorithms to use one less register
3) Fixed AlarmedPixels motion detection
2012-02-01 07:33:20 +02:00
Kfir Itzhak
642a1bfdb2
1) RTSP support for direct capture and target colorspace.
...
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
ea3a1a9072
1) Removed the mmap file removal at shutdown.
...
2) ZoneMinder should now compile cleanly wihout swscale
3) Fixed multiple monitors capturing from the same device and channel.
Current code allows for multiple monitors sharing the same device, each on a different channel
Or, multiple monitors sharing the same device, all on the same channel.
In both cases, capture method, width, height and palette must be identical on all monitors.
However, target colorspace can be different because each monitor handles the format conversion separately.
2012-02-01 07:33:20 +02:00
Kfir Itzhak
37cc9199b2
1) Changed ZM static colours to RGB order instead of HTML(BGR) order
...
2) Allow ZM to compile without swscale - hopefully
3) Saved few cpu cycles during image blending
4) Fixed wrong zone colours showing up
5) Unrelated fix: Allow ZM to be compiled with the latest ffmpeg revisions
2012-02-01 07:33:20 +02:00
Kfir Itzhak
f2aaeb78e0
1) Completed ffmpeg code
...
2) Minor changes to zm_local_camera.cpp
2012-02-01 07:33:20 +02:00
Kfir Itzhak
33119c6dc5
1) Added image size requirements to ensure proper alignment
...
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
2012-02-01 07:33:20 +02:00
Kfir Itzhak
c3ecdd00e0
1) Relocated conversion functions and tables to zm_image.cpp
...
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
2012-02-01 07:33:20 +02:00
Kfir Itzhak
4a59761bcc
Getting closer and closer everyday.
...
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
2012-02-01 07:33:20 +02:00
Kfir Itzhak
5c418133bf
Lots accomplished!
...
1) Delta and blend SSE and standard alogirthms inside
2) Changed event streaming to use sendfile() syscall if available
3) Direct memory capture (Less memcpys required)
4) Added macros for BGR24 and RGB32(and its variants) formats
5) Modified Monitors database table to add a target colorspace option
6) Changed most image buffer allocations to be on 16 byte boundary, work still in progress
7) Added Target colorspace instead of the old colours selection. this one also visible to local cameras
8) Replacing Y deltas option with ZM_CPU_EXTENSIONS
9) Added SSE detection code
10) Changed some code to make linking success with inlining enabled.
11) Some other changes and work still in progress for some listed above
2012-02-01 07:33:20 +02:00
stan
4e0d775e5b
Added in additional headers to provide missing defines on some distros.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3514 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-09-08 15:39:58 +00:00
stan
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
stan
3aa6c13c64
Added auto reconnect option to database
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3499 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 13:31:04 +00:00
stan
7a08ab3c24
Added in some includes that are required on some systems.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3489 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:31:06 +00:00
stan
4891781523
Fixed issue with single image capture from cameras that don't provide content length
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3484 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-27 16:08:48 +00:00
stan
2c87c43978
Use dedicated DB connection for logging, with auto reconnect set up.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3474 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-28 11:07:35 +00:00
stan
02831ddcb1
Removed support for old locations of ffmpeg headers
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3468 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-24 16:05:06 +00:00
stan
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
stan
154880ac15
Now detects camera restarts and disconnections properly.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3342 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-16 22:53:31 +00:00
stan
b3b715e022
Fixes to work with latest ffmpeg
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3338 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-15 20:38:51 +00:00
stan
a90ae4f19f
Added additional info to exceptional polygon message
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3328 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-04-26 15:48:21 +00:00
stan
0ff4e53832
Allow FPS reporting to be disabled by setting valure to zero
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:23:10 +00:00
jaidhar
e3f8bdb6cd
XML (eyeZm) plugin: Now renamed plugin to eyeZm, along with all database variables. Note that this must still reside in the skins/xml path until iPhone apps can be moved over at a later point in time
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3306 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-19 20:25:54 +00:00
stan
278b78f012
Added missing V4L1 conditional
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3304 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-17 09:31:33 +00:00
stan
8048c1c355
Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan
beffdab035
Improved fast image blending somewhat and changed image class to use generic typedefs rather than libjpeg ones.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3301 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 11:18:41 +00:00
stan
39b5400046
Tidied up memory freeing a bit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3297 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 17:54:45 +00:00
stan
1ef02ac35a
Tidied up disposal of ffmpeg structures.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3296 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 17:51:08 +00:00
stan
e91795a619
Removed netpbm options
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3295 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-11 14:50:04 +00:00
stan
162b1b2feb
Fixed bug in signal checking - http://www.zoneminder.com/forums/viewtopic.php?t=17158
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3287 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:34:26 +00:00
stan
f813ff1691
Cleaned up some deprecated ffmpeg calls.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3273 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 13:21:24 +00:00
stan
d67d19dc4f
Removed dependency on DB existing for config generation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3245 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:36 +00:00
stan
e11a5700c7
Removed -frepo line
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3244 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-21 23:53:07 +00:00
stan
df0d6919c9
Added v4l2 interlacing control
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3230 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:49:42 +00:00
stan
aa4a97d0da
Fixed incorrect monitor type when loading individual ffmpeg monitors. Not used anywhere currently so no impact.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3225 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:18:46 +00:00
stan
46358c84e9
Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan
dc9e2755b0
Added sample apache config file.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
stan
061a324a36
Fixed issue with image scaling etc when streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3213 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-13 22:30:22 +00:00
jaidhar
069136fe53
Added vlog function to view log output, ability to redirect XML logging to it's own file
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
jaidhar
c7b3d04eed
Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
jaidhar
e57c1b0331
XML Plugin: More config options added, stability fixes to H264 streaming
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
jaidhar
78caa0adb0
XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +00:00
stan
46d777398e
Updated to use fixed buffer sizes rather than relying on o/s defined.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:22:35 +00:00
stan
ca4358bfd6
Initial libgcrypt to remove warning in zms and zmu
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:11:06 +00:00
jaidhar
2d7979ac93
XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
jaidhar
733eef46bd
XML Plugin: Adding zmstreamer to application source
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3183 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-09 20:48:34 +00:00
stan
2effcc506b
Reworked to handle signal lost events better and to prevent untimed events.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3172 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:43:33 +00:00
stan
3dccc2ee32
Regenerated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3164 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:04:10 +00:00
stan
825eda95a6
Regenerated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:56:23 +00:00
stan
257f975558
Commented out some unnecessary debug
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3156 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 10:03:58 +00:00
stan
9472311a38
Fixed some size_t compiler warnings.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3148 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-13 15:50:06 +00:00
stan
52b83eb813
Fixed issue with signal loss detection and timestamp label.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3143 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-08 22:42:54 +00:00
stan
36dddf22cc
Updated to include standard type definitions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3088 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-07-04 18:09:44 +00:00
stan
b079f1e1c6
Updated to use standard types.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3087 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-07-04 18:00:35 +00:00
stan
cd16c91ccd
Tweaked zone image dumping.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:43 +00:00
stan
60f0136ed3
Merged in image root changes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:16:40 +00:00
stan
2b375ef264
Changes to querying and probing.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3037 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:30 +00:00
stan
72416fc24b
Now checks to see if user is in group as well as owner
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3036 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 17:38:13 +00:00
stan
5ae6123ba3
Updated deprecated ffmpeg functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3018 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-15 17:05:53 +00:00
stan
2c9eeef178
Updated JPEG memory functions to not conflict with new libjpeg8 functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3012 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-01-20 14:43:54 +00:00
stan
f0e7aaf6db
Made mapped memory files not hidden
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 18:37:24 +00:00
stan
77fb484226
Fixed some ssize_t format specifiers.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2996 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 01:29:11 +00:00
stan
00f7799685
Fixed some non-64 bit safe printf specifiers.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2995 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:45:36 +00:00
stan
e9d3076785
Removed obsolete commented out line.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2994 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:45:00 +00:00
stan
075257be52
Added stdio.h for vsnprintf if not present
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2993 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:40:45 +00:00
stan
e30ae4fa0e
Only send http Keep-alive header for http 1.0
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2992 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:40:04 +00:00
stan
30c3c88c55
Remove MS_INVALIDATE from closing msync as not required.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2991 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:31:00 +00:00
stan
a786dfeb66
Debug tidying and renaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2976 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 13:10:14 +00:00
stan
10b01a5062
Added Panic level for debug with stack dump.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2975 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 10:01:46 +00:00
stan
2066ad472b
Fixied size_t format specifier for 64 bit systems
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2943 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-07-01 12:32:28 +00:00
stan
2c43bde47c
Corrected some format specifiers to account for different size of size_t types on 64 bit systems
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2942 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-07-01 12:28:40 +00:00
stan
8cad0dbd6a
Updated.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan
174c82a452
Remove error message if terminated and can't send.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2916 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-09 14:15:02 +00:00
stan
11a1cc2d41
Now supports custom perl install path
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
stan
5842ec5bfc
Added detection for thread death.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2907 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-03 08:10:28 +00:00
stan
c95ff6b6ba
Added change running flag to started, and added running to just mean when thread func is going.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2906 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-03 08:10:02 +00:00
stan
3c10237833
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-28 08:47:59 +00:00
stan
034f37cf4b
Applied contributed patch.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2890 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:03:46 +00:00
stan
ad77dc2e56
Applied patch to restore camera settings at startup.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2870 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-13 10:43:49 +00:00
stan
a02eba25ff
Minor mpeg format and config changes.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2868 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 15:24:39 +00:00
stan
820dce5e42
Updated for decimal frame rates.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2867 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 13:47:19 +00:00
stan
ca858a8562
Applied patch from 'mitch' to improve error detection when streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2864 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 09:47:37 +00:00
stan
17386aa49f
Changed case of session cookie header.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2850 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:20:02 +00:00
stan
4c8352153d
Removed srand call and improved error message.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2849 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:19:36 +00:00
stan
18f196dbcd
Added srand initialisation.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2848 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:18:57 +00:00
stan
72f908c4e7
Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:10:54 +00:00
stan
fa5db09a73
FIxed issues with negative FPS affecting streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 19:39:23 +00:00
stan
cf30933bb4
Conditional compilation for recent V4L2 addition
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2834 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 14:09:53 +00:00
stan
afe253b71a
Added V4L2 query
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2827 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 12:57:34 +00:00
stan
41c2889df2
Added query capabilities for V4L2 cameras
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2824 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 15:27:15 +00:00
stan
e4d00ba189
RTSP fixes and tweaks
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2815 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-27 09:27:24 +00:00
stan
75c654e654
Downgraded to support autoconf 2.59
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan
20580582b3
Minor header file reorg
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2811 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:56:30 +00:00
stan
c65b50e312
Minor header sort out and libz no longer mandatory.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2809 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-20 12:39:29 +00:00
stan
f29e7b7436
Commented out recent redundant pix_format definitions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2808 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-20 11:33:05 +00:00
stan
3069dc2402
Final timestamp update
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan
429884741a
Updated for timestamps
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan
73ad3a7097
Changed types/order of stream status structs to work on 64 bit systems.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 14:34:09 +00:00
stan
b89b1cfc7c
Fixed non-standard for webcam properly
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2785 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-20 18:15:16 +00:00
stan
61089eeeb1
Added authentication hashed logins.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
stan
ee972ac78a
Fixed issue with event section lengths being ignored on alarm and rationalised debug.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2778 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 22:05:32 +00:00
stan
28692c1b28
Fixed greyscale issue and don't do format conversion if not required.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2777 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 12:30:43 +00:00
stan
ff2ac65117
Improved confusing error message.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2776 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 12:30:17 +00:00
stan
3a86651627
Reworked multi-buffering etc for V4L multi-sources.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:23:27 +00:00
stan
4a17169acd
Removed Bandwidth header.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2774 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:22:51 +00:00
stan
bf0d393e1f
Added double include wrapper.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2773 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:22:02 +00:00
stan
e64312e48c
Corrected so mapped memory files are removed by package script.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2771 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:32:03 +00:00
stan
9c518efb3d
Stopped memory file getting deleted unless zmc restarts. Better overrun detection.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2770 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:29:51 +00:00
stan
092f8cdbff
Made backtracing more helpful.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2769 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:27:03 +00:00
stan
b1b4c8e42d
Fixed issue with extra debug not working for components.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2768 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:26:41 +00:00
stan
9690eb66fe
Removed from svn.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2767 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:26:18 +00:00
stan
5506400519
Applied YUV patch from forum.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2766 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:33:36 +00:00
stan
e0ea59eec5
Fixed RTSP authentication.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2765 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:21:50 +00:00
stan
3b64c91b57
Don't fail to compile if ffmpeg compiled with swscale, though won't work.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2764 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:18:37 +00:00
stan
d980c3996d
Cosmetic
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2763 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:18:03 +00:00
stan
bfc329b96a
Changed memcpy to memove where overlaps might occur.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2762 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-16 18:17:19 +00:00
stan
1195e8e27c
More multi-cam tweaks.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2757 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 22:26:28 +00:00
stan
98b648bfc1
Fixes to multiple cameras on one device.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2756 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:33:05 +00:00
stan
d92c781026
Removed mapped memory file on shutdown.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2755 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:32:00 +00:00
stan
a941e28b37
Updated for latest ffmpeg.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2750 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 14:54:09 +00:00
stan
541d4e20e5
Updated for latest ffmpeg
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2748 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-09 14:42:08 +00:00
stan
d9542aba28
Removed unecessary Info line.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2747 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-08 17:46:00 +00:00
stan
885c090f12
Removed or conditionally commented out V4L2 pix formats that are nopt in older kernels
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2740 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-04 15:02:47 +00:00
stan
cd269623c1
Allow sources with no video standard defined.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2739 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-04 14:44:30 +00:00
stan
cd7087aeed
Removed optmisation to let browser scale zoomed in images as breaks FF3
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2738 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-04 14:38:05 +00:00
stan
c753214450
Added some conditional compilation around ffmpeg stuff.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2733 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 15:02:33 +00:00
stan
4b9d30ca75
Cleaned up multi-camera setup
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2729 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 12:50:37 +00:00
stan
0f5ee9580f
Conditional compilation for V4L2 stuff.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2728 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:28:03 +00:00
stan
f0c76828c0
Removed compiler warning
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2727 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:27:35 +00:00
stan
e14efbd493
Updated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
stan
dde584a12a
Restructured camera capture methods somewhat and revamped V4L stuff a bit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 09:48:06 +00:00
stan
21d8d74a28
V4L2 updates
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
stan
bb872feab4
Added result error checking to frame streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2718 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:37:39 +00:00
stan
23d82a7e03
Added FFMPEG camera type
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
stan
0fcda558dd
Updated new RTSP SDP parsing methods.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2715 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:00:31 +00:00
stan
d43d2289ed
Changes from updated build tools.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
stan
f7ebe7a05e
Updates for changed SDP parsing method.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2713 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-16 12:18:50 +00:00
stan
549aa39cbb
Updated autoconf/make files
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
viseon
f2ad7cc770
Add offset to replay_rate to make it unsigned
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:56:15 +00:00
stan
bcb7166b75
Better handling of RTP stream and thread death.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2704 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:14:37 +00:00
stan
c83d340ad8
COntrol stream replay rate now two bytes long
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2703 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:14:20 +00:00
stan
5bd99df2cf
Added symbolic level to hex dump
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2699 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 21:00:26 +00:00
stan
37516f9c95
Added extra byte intolength calculation to avoid infinite loop
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2698 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 20:59:57 +00:00
stan
4a57d09d64
Added checks for return status on read and write functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2697 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 20:55:58 +00:00
stan
e33fc4cd60
Added proper check for http methods.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2695 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 19:05:35 +00:00
stan
fe1c1f3beb
Moved some initialisations
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2691 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:13:45 +00:00
stan
842398a32f
Added checks to return status of some functions.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2690 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:13:26 +00:00
stan
55ce645728
Added VARPLAY command to event stream.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2688 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:18:08 +00:00
stan
6d78b17d90
Added CMD_VARPLAY to stream commands
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:47 +00:00
stan
5360eb7e52
Added zm_config_defines.h to svn
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2683 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 12:23:34 +00:00
stan
7d96edeacd
Added .in files to svn
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 12:14:50 +00:00
stan
e60149ce36
Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-29 23:08:21 +00:00
stan
94912ddae1
Ensure that all events has at least some regular frames to start with.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2674 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 12:52:09 +00:00
stan
9ecb501906
Cleaner shutdown for RTP streams
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2670 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-22 13:10:12 +00:00
stan
3aedc486b7
Updated for latest ffmpeg
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2667 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-16 16:11:49 +00:00
stan
a91d2a0697
Rationalised and renamed buffer class.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2657 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 09:15:23 +00:00
stan
0afd77907e
Fixed various issues with RTSP streaming.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2656 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 08:29:03 +00:00
stan
779737fcde
Corrected notes update problem.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2655 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 08:28:50 +00:00
stan
bef8c7bc16
Dropped level of some debug.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2654 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 08:28:02 +00:00
stan
fff2e022ff
Improvements.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2653 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 08:27:39 +00:00
stan
c0fb4fef7a
Fixed multiplier on float version of select timeout.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2652 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-09 08:27:10 +00:00
stan
d5b92e88d6
Fixed buffer bug in RTP over HTTP
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2650 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-07 09:01:16 +00:00
stan
0606700091
Updated to continuously update Notes
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2645 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:07:43 +00:00
stan
435c469d4b
Added DUMP_CORES option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2639 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 11:43:43 +00:00
stan
d15e05e016
Cosmetic cr/lfs on debug,
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2634 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 08:15:50 +00:00
stan
506815599b
Addressed issues with event start and end times. Now includes the time from first to last frame.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2631 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:45:59 +00:00
stan
c207e7720f
Changed force close events to more general setting allowing long events to be closed after alarm.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2630 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-25 11:18:55 +00:00
stan
53631ac3fe
Modified ffmpeg logging
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2629 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-25 11:16:59 +00:00
stan
e30da16498
Fixed threads for 64 bit.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2625 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 15:35:27 +00:00
stan
a79594387c
Fixed various mapped memory errors.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2624 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 15:31:20 +00:00
stan
24ec7eed9e
Fixed type in RTP method checking
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2615 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-08-11 11:53:43 +00:00
stan
e6041e24a7
Uppdated copyright headers
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:33:23 +00:00
stan
0e88a85980
Updated propeties
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2610 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:23:20 +00:00