5ba13f1a76
ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected
...
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
2015-11-04 16:24:39 +11:00
51914994f7
Migrating from av_free/av_freep to av_frame_free using libavcodec version
...
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
2015-11-04 15:30:14 +11:00
bc5ef6c599
Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version
...
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
2015-11-04 12:46:26 +11:00
0ff7a4e616
Replace deprecated FFmpeg API
...
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
2015-11-03 11:58:23 +11:00
17e65d12b4
fixed SaveJPEGs are not working
...
which is caused in errors introduced when merging with master
2015-10-31 21:27:23 -07:00
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
650d93435e
Remove syslog.h
2015-10-30 21:42:58 +11:00
6e2e33cf89
Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
2015-10-30 19:05:40 +10:00
d45cf9607b
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-10-28 08:12:46 +11:00
44cda8032b
Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall
2015-10-24 20:07:42 -04:00
ac8d9fe76a
Merge pull request #1118 from liucougar/fix_crash_in_ubuntu1404
...
feature-h264-videostorage - Fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc…
2015-10-23 22:24:26 +11:00
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
fee883f61a
fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
...
when libx264 is not installed
2015-10-22 22:52:41 -07:00
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
ac8bfc71dc
fix specifying ServerId
2015-10-02 18:22:48 +00:00
6ff4e333b4
Merge branch 'fix_warnings' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-10-02 15:34:05 +00:00
7b253bcd7e
Debug line
2015-10-02 15:28:51 +00:00
24b79e81bc
add include for basename on freebsd
2015-10-02 11:00:42 -04:00
8125ef0334
change types and move things around to remove compile warnings
2015-10-02 09:49:09 -04:00
e4b0e74f69
merge master
2015-09-24 10:01:27 -04:00
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
4a978034ad
Merge pull request #1056 from ZoneMinder/fix_privacy_mask_segfaults
...
Fix sgfault caused by the privacy mask stuff
2015-09-16 10:46:45 -05:00
b8f2b1e0a0
Merge branch 'mmap_fd_gt_3' into multi-server
2015-09-16 11:01:06 -04:00
d991912ce4
Merge branch 'fix_privacy_mask_segfaults' into multi-server
2015-09-16 11:00:57 -04:00
e70d49b033
Merge branch 'fix_privacy_mask_segfaults' into mmap_fd_gt_3
2015-09-16 10:58:57 -04:00
6e12febf3d
initialize privacy_bitmask and check it before deletep[] to prevent segfault
2015-09-16 10:51:27 -04:00
0571ca3025
quick fix for #1055 : make sure our mmap fd is > 2
2015-09-16 09:11:22 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
09e5463a81
test for value in server_id before atoi
2015-08-27 11:16:58 -04:00
bca9a19488
tabs to spaces
2015-08-27 11:14:00 -04:00
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
d1343df920
Change colour of privacy zones from black to dark grey
2015-08-26 07:45:45 +02:00
2aca87654a
Remove unneccessary parameter in constructor
2015-08-26 07:44:50 +02:00
14feffc455
strip the path from the filename
2015-08-21 18:28:50 -05:00
22dc049bf4
remove Info statement used for testing
2015-08-21 10:34:23 -05:00
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
acacd247c8
Really blacken all pixel colours
2015-08-20 17:17:58 +02:00
fc50b38331
collect variable name
2015-08-20 16:02:29 +02:00
52be185fc9
Support blacken zones in all colour depths
2015-08-20 15:58:13 +02:00
6fc4525784
Blacken Zones are now correctly displayed
2015-08-20 15:01:07 +02:00
8f9ed96585
First try to implement blacken areas for monitors
2015-08-20 14:20:41 +02:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -05:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3b9bb6053c
Add clarifying comment
2015-08-17 22:10:39 -04:00
9351e1b9d9
Incorporate exif switch
2015-08-17 22:07:41 -04:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
89e13c1cc0
leave 1 char at end for \0
2015-08-14 16:10:44 -04:00
5b0288e5f5
use frame_type instead of score in conditional
2015-08-14 07:03:08 -05:00
19174adfa1
add frame_type to debug message
2015-08-13 20:47:14 -05:00
14dabb095c
set scroe to zero if less than zero
2015-08-13 18:06:20 -05:00
95087beeb9
use return value of stat instead of just checking errno. This has the added benefit of catching other errors when stating
2015-08-12 11:00:41 -04:00
3368d4f474
Removed untranslated "Font size" from language files, corrected white
...
space and make font size a const int
2015-08-10 15:35:19 +02:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
6aca6c8d26
Demote user auth info message to debug
2015-08-09 12:16:01 -04:00
5a0d0ca5a3
Made large font selectable by a constant
2015-08-06 17:42:52 +02:00
c733fec476
First (working) steps for adding large timestamp to images
2015-08-06 14:43:10 +02:00
d9ee08a27b
Merge pull request #983 from Linwood-F/982-demote-terminating-logger-msg-to-debug
...
Change from info to debug
2015-08-04 10:12:08 -04:00
a36bee3767
Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning
...
Remove shared data warning for purpose query only
2015-08-04 10:09:59 -04:00
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
2538514d18
Change from info to debug
2015-08-03 18:39:14 -04:00
46b9bd5d1c
change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined.
2015-07-31 10:29:53 -04:00
f7cfa1ecd4
Fix analysis sample rate calculation
2015-07-28 23:07:02 +02:00
4dc0028e11
Clean up videostore code and remove lots of unused code
2015-07-28 21:41:10 +10:00
1e60fccd81
Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
...
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
2015-07-28 21:39:47 +10:00
f09a551d6a
Merge branch 'master' into feature-h264-videostorage
2015-07-28 21:06:52 +10:00
93990b253f
Use a dedicated pre event buffer if analysis_fps is set
2015-07-27 16:24:32 +02:00
18758826c7
Do not call time() function when it is not necessary
2015-07-25 13:46:11 +02:00
0bff99f5c7
Improve string conversion and use unsigned type for analysis_update_delay
2015-07-25 13:38:50 +02:00
3e5f6c65d3
Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height
2015-07-24 13:30:58 -04:00
965425c395
Remove extraneous file
2015-07-23 19:37:23 -04:00
72a92ee9d5
Add exif to jpg images saved
2015-07-23 19:34:39 -04:00
9e16c8a066
Improve log message and logic in UpdateAdaptiveSkip()
2015-07-24 01:01:51 +02:00
3b2378c21d
Add a new warning in GetAnalysisRate function
2015-07-24 00:26:53 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
9f1d91b655
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-20 16:28:59 -04:00
dfd3d2c4cd
use std::string to build sql for loading monitors. ALso use new ZmDbFetch functions
2015-07-20 16:28:21 -04:00
633a6e2df9
use zmDbFetchOne more
2015-07-16 16:53:30 -04:00
60410c98d6
use new db functions in zm_config.cpp
2015-07-16 16:44:09 -04:00
5a363273a2
Merge branch 'master' into multi-server
...
Conflicts:
distros/ubuntu1504/changelog
2015-07-16 16:37:44 -04:00
48fa0c3d42
add some utility db functions
2015-07-16 13:04:28 -04:00
4ed248e5a5
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:05:21 -04:00
50b333fb28
Add SERVER_NAME and SERVER_ID loading to config
2015-07-16 10:04:56 -04:00
3481368574
given SERVER_NAME populate SERVER_ID and vice versa
2015-07-15 16:44:16 -04:00
a9035221cb
Merge pull request #934 from ZoneMinder/fix_utf
...
fix utf8 ' characters
2015-07-15 10:30:28 -05:00
33a9fc6175
fix utf8 ' characters
2015-07-15 10:37:08 -04:00
602f703df8
roudn up when calculating buffer size for scaled image. Fixes #932
2015-07-15 10:22:57 -04:00
bce968ebd8
Merge pull request #923 from ZoneMinder/zm_buffer_improvements
...
Introduce a read_into function in the Buffer.
2015-07-13 18:51:38 -05:00
8b2f67c456
don't include .cpp in man
2015-07-13 11:30:32 -04:00
561bf43721
fix pod2man generation for out-of-source builds
2015-07-09 19:33:06 -05:00
994de4ae0a
Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available.
2015-07-06 15:57:06 -04:00
39d152656a
Merge pull request #920 from ZoneMinder/zms_no_crash
...
Zms no crash
2015-07-04 06:58:32 +10:00
58448adb51
Merge pull request #896 from knnniggett/pod2man
...
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
3c5a9b796b
Merge branch 'master' into zms_no_crash
2015-07-03 11:34:42 -04:00
956e2936a3
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-06-25 16:26:49 -04:00
2030b5e6ef
Merge pull request #870 from ZoneMinder/better_http_reading
...
alter the logic of ReadData. New behaviour is documented.
2015-06-23 08:16:44 -05:00
c3fa7ea940
Merge pull request #867 from ZoneMinder/analysis_image_optimisation
...
analysis optimisations
2015-06-23 08:13:34 -05:00
ec6c6b3ace
typo fix
2015-06-22 09:26:17 -04:00
fa835359a1
Add install target for C binary man pages
2015-06-20 17:33:13 -05:00
4deb0d53c8
Add pod documentation to C binaries
2015-06-20 17:11:20 -05:00
846bea2aa6
Merge pull request #866 from ZoneMinder/no_death_on_db_disconnect_in_logger
...
Don't die if db goes away during logging
2015-06-11 15:17:50 +02:00
249b9e2952
Merge pull request #875 from ZoneMinder/add_version_to_startup_log
...
Add version to the startup log line
2015-06-11 15:12:00 +02:00
9b06b1399c
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
src/zm_ffmpeg_camera.cpp
web/skins/classic/views/event.php
web/skins/classic/views/monitor.php
web/skins/classic/views/timeline.php
2015-06-10 23:09:30 +10:00
c391325457
Merge pull request #858 from manupap1/fix_avcodec_warnings
...
Fix detection of deprecated libav / ffmpeg functions
2015-06-08 10:26:35 -04:00
a534e66437
Add version to the startup log line
2015-06-08 10:24:40 -04:00
95d7a3ff94
alter the logic of ReadData. New behaviour is documented. This solves unneccessary disconnects for me.
2015-06-04 11:33:03 -04:00
0308baabb3
This change uses a member Image instead of constantly allocation a new Image.
...
This saves all the initialisation and the lines of debug.
Also in GetImage we potentially remove and entire copy if no scaling or timestamping is being done.
2015-06-03 15:10:52 -04:00
b91d1c7b0c
Don't die if db goes away during logging
2015-06-03 14:57:19 -04:00
7811354d92
Move iostream inclusion in zm.h and declare explicitely the namespace for cout
2015-05-29 23:22:20 +02:00
818a5256e4
Readd checking of micro version in zm_mpeg.cpp to fix compilation issue
2015-05-29 19:23:00 +02:00
f6d69e02b5
Mention original source for check functions
2015-05-29 17:45:35 +02:00
a36b4aa65d
Implement version check for ffmpeg and libav (address issue #580 )
2015-05-29 17:38:02 +02:00
45b5fd3945
Merge pull request #801 from knnniggett/nph-zms
...
link zms to nph-zms, rather than build identical
2015-05-21 13:15:38 -04:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
5ded77f8de
Merge pull request #825 from rwg0/688-fix-fast-forward
...
Fix fast forward/reverse in event playback (#688 )
2015-05-09 19:39:23 -05:00
79398a2bec
Merge pull request #821 from onlyjob/PBP
...
beautifying *.pm
2015-05-08 08:56:01 -04:00
ea795c4040
Fix to compile on 32bit kFreeBSD
2015-04-24 13:55:10 -04:00
422020a3b2
Fix fast forward/reverse in event playback not being fast if effectivefps < maxfps
2015-04-22 22:11:33 +01:00
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
d5e403b7e0
Merge pull request #775 from ZoneMinder/freebsd_fixes
...
Freebsd fixes
2015-04-17 15:21:42 -05:00
0c0a23bf86
Merge pull request #778 from onlyjob/build-hurd
...
build: add PATH_MAX definitions (needed on GNU Hurd)
2015-04-16 01:00:00 -04:00
0a2f1cd2b6
build: add PATH_MAX definitions (needed on GNU Hurd)
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-16 11:25:04 +10:00
fc64e3f01b
Merge pull request #772 from balr0g/linked-cameras-trigger-on-new-events
...
Don't trigger linked cameras on new events
2015-04-15 20:23:54 -05:00
e4cf323949
Merge pull request #800 from Sune1337/pthread_join
...
* use pthread_join instead of pthread_tryjoin_np
2015-04-12 11:51:50 -05:00
4cb8cf8681
remove commented commands
2015-04-12 11:48:49 -05:00
3a3f186e74
update working_directory
2015-04-12 11:48:18 -05:00
8f337999d4
remove nph-zms target
2015-04-12 11:47:28 -05:00
3108fd2109
link nph-zms rather than build
2015-04-12 11:00:43 -05:00
124ba1c2a8
Merge pull request #796 from ZoneMinder/zm_image_cleanups
...
one small fix for a log line where the 4th parameter wasn't included. T...
2015-04-10 12:38:35 -05:00
065a372678
one small fix for a log line where the 4th parameter wasn't included. The rest are very small optimisations.
2015-04-10 13:26:17 -04:00
5779b2e20f
* use pthread_join instead of pthread_tryjoin_np
2015-04-08 22:15:54 +02:00
549d7fd426
include libv4l1-videodev headers
2015-04-03 18:24:51 -05:00
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
21915eb92c
Merge branch 'master' into freebsd_fixes
2015-03-31 11:06:53 -04:00
6bbe42c5eb
build: fix FTBFS with format-hardening
...
~~~~
x86_64-linux-gnu-g++ -DHAVE_CONFIG_H -I. -I.. -I/usr/include -I/usr/include -I/usr/include -D__STDC_CONSTANT_MACROS -Wall -finline-functions -fomit-frame-pointer -I/usr/include -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -D__STDC_CONSTANT_MACROS -D__STDC_CONSTANT_MACROS -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -MT zm_mpeg.o -MD -MP -MF .deps/zm_mpeg.Tpo -c -o zm_mpeg.o zm_mpeg.cpp
zm_mpeg.cpp: In member function ‘void VideoStream::SetupFormat()’:
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
snprintf( s->filename, sizeof(s->filename), filename );
^
zm_mpeg.cpp:112:56: error: format not a string literal and no format arguments [-Werror=format-security]
~~~~
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-03-30 15:27:37 +11:00
ed28eebba4
This is already included in zm_signal.h
2015-03-27 15:16:15 -04:00
0aa20ed6e8
Remove pict from writeAudioFramePacket as not used
2015-03-22 21:03:25 +11:00
b587222ce5
bring recent improvements in ffmpeg capture function into captureandrecord
2015-03-22 21:02:02 +11:00
b3313edde0
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
...
Conflicts:
web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
2e10263b64
Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1
2015-03-04 16:34:31 -05:00
084e2a8b8f
when auth is needed, try command again before dying.
2015-03-02 10:47:52 -05:00
3c5b1fd07f
fix extra slash when adding trackurl to controlurl
2015-02-26 10:22:21 -05:00
c7dc157f4d
FreeBSD fix
2015-02-24 09:22:55 -05:00
52938920de
backtrace is in execinfo on FreeBSD
2015-02-24 09:22:39 -05:00
3cc4c2e24d
fixes to get pid on FreeBSD
2015-02-24 09:22:08 -05:00
0bea381510
sendfile tricks
2015-02-24 09:20:55 -05:00
4394bb0a9a
Make zms not crash when zmc is not running.
2015-02-22 16:58:15 -05:00
550d517701
sigh... fix the image to capture_image
2015-02-22 16:36:01 -05:00
2f3104aada
fix debug line
2015-02-22 16:29:36 -05:00
3e33bc2627
This is actually from freebsd... but it's just a more informative error message
2015-02-22 15:01:32 -05:00
0355191c6c
Merge pull request #687 from knnniggett/rtsp-content-base
...
process RTSP DESCRIBE response header
2015-02-21 17:44:49 -05:00
5994811f88
Allow zm to build w/o ffmpeg
2015-02-21 11:02:38 -06:00
6c65c89643
Merge pull request #711 from SteveGilvarry/720_avformat_free_context_version_check
...
Fixes #710 Added libavformat version check around free context functions
2015-02-18 07:26:18 -06:00
83cc398a24
Added libavformat version check around free context functions
2015-02-18 23:25:31 +11:00
e807560d86
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-17 11:47:30 -05:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
4439187f19
Better debug output, handle ENOTTY in STANDARD ENUMERATION
2015-02-10 11:53:50 -05:00
e713aa44f4
small improvements:
...
First is some more debugging lines useful for figuring out why automatica palette selection didn't work.
The other is a comment about how the code will segfault if there are more than 64 formats. Currently there are not.
Lastly witch a variable from int to unsigned int. There is no way for it to go negative and logically should always be positive, so by making it an unsigned in we don't have to cast it later.
2015-02-10 11:11:54 -05:00
4613fd46a4
fix a reorder warning
2015-02-05 11:03:26 -05:00
92b3cdbadb
Merge pull request #691 from ZoneMinder/rtsp_auth_fixes
...
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
2015-02-04 13:46:37 -06:00
65701f0956
add missing +
2015-02-04 14:22:53 -05:00
4c7e8592d0
fix content-type parsing when there are options on it
2015-02-04 13:53:42 -05:00
b22608fb07
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
...
Digest Auth worked for the RTSP stream, but not http.
This adds quotes around the cnonce value, which matches what curl and wget do and adds the algorithm line which also matches what curl and wget do. With these two changes the auth is accepted.
2015-02-04 13:50:19 -05:00
1abe35c576
change Debug level of this line to something higher
2015-02-03 14:33:23 -05:00
d2865f625b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-02 19:06:57 -05:00
82af43f5fb
process RTSP DESCRIBE response header
2015-01-31 08:31:27 -06:00
c2d429aae0
Add some comments, change log level of some debug lines. Don't die on a timeout.
2015-01-30 09:44:10 -05:00
7e685bb04a
Merge pull request #675 from ZoneMinder/small_performance_improvement
...
small performance improvement when streaming.
2015-01-29 16:27:34 -05:00
da54867ea2
better log message, trivial
2015-01-29 16:21:43 -05:00
9d636ad128
fix zms crash due to buffer_copy_size never being initialized
2015-01-29 15:32:50 -05:00
321196e206
fix to reset timeout flag upon receiving something
2015-01-28 14:04:31 -05:00
b97f2fa4f6
Send an RTCP RR packet when we get a timeout to see if we are really dead.
2015-01-28 12:36:11 -05:00
56c82cfbb5
Save 1 or more calls to time(NULL)
2015-01-28 12:33:05 -05:00
facda38871
add corresponding free
2015-01-13 19:52:15 -05:00
509de3ec27
need to cast malloc, get rid of perl code, only swap_path checks if we are going to use it
2015-01-13 15:16:38 -05:00
ba425edd0f
Convert from event_directory to event file as per Video branch
2015-01-12 20:42:17 +10:00
f1fa8a3d92
fix typo
2015-01-08 12:48:19 -06:00
53244aff0d
Don't fail if an unexpected rtp packet type is received
2015-01-07 16:01:38 -06:00
1adb147899
add version command line argument to zmstreamer. Also add -h for consistency with other programs
2015-01-06 20:59:03 -05:00
258c97f75f
add version command line argument to zmf
2015-01-06 20:54:49 -05:00
85e51528a6
add version command line argument to zma
2015-01-06 20:52:18 -05:00
6f42f1c6d8
add version command line argument to zmc
2015-01-06 20:49:33 -05:00
25bfedc9d6
Clean up comments and add av_free_packet
2015-01-06 15:15:14 +10:00
56b1a50b2b
revert
2015-01-03 14:07:18 -05:00
af570259d1
got these swapped, should be the other way around
2015-01-03 13:59:23 -05:00
14c65aefd2
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
...
Conflicts:
src/zm_comms.cpp
2015-01-03 13:56:40 -05:00
e02da8833a
ifdef's for BSD
2015-01-02 17:08:51 -05:00
92e6d940bc
ifdef's for BSD and cleanup
2015-01-02 17:07:49 -05:00
1137c3907e
ifdef's for BSD
2015-01-02 17:06:16 -05:00
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
70c63bd394
Merge branch 'master' into storageareas
...
Conflicts:
db/zm_create.sql.in
distros/debian/control
distros/ubuntu1204/changelog
src/CMakeLists.txt
src/zm_config_defines.h
src/zm_monitor.h
2014-11-19 14:11:39 -05: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
SteveGilvarry
Dmitry Smirnov
Heng Liu
Isaac Connor
inflex
baffo32
Steve Gilvarry
Isaac Connor
Andrew Bauer
Robin Daermann
Andrew Bauer
Linwood-F
Emmanuel Papin
Rick Sayre
Isaac Connor
rwg0
Isaac Connor
Sune1337
balr0g
m-bene
Sune1337
Kyle Johnson
root
Kyle Johnson
Kfir Itzhak
Will W
aztazt
Anton Khirnov
Kevin Dalley
Peter Howard
Peter Howard
Ed Barnard
Edward Barnard