Andy Bauer
4fdd32b596
bump version to 1.28.106
2015-08-29 07:53:08 -05:00
Isaac Connor
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
Isaac Connor
6093587ff2
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
...
1038 fixing state mgmt 1030 is active fix
2015-08-27 09:08:50 -04:00
Pliable Pixels
b18ffdc13e
States table updated to unique Name column
2015-08-26 11:20:22 -04:00
Pliable Pixels
82fe6c8f0e
States table now uses a unique Name column
2015-08-26 11:19:58 -04:00
Andrew Bauer
f5f7363d35
add RTSPDescribe column to Monitors table
2015-08-21 10:32:04 -05:00
Robin Daermann
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
Robin Daermann
fbcd6f365b
Change database schema (add 'Blacken' zone type) and bump version to 1.28.105
2015-08-20 16:17:08 +02:00
Andrew Bauer
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
Andrew Bauer
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
Linwood-F
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
Robin Daermann
55eee8d6a4
Added SQL changes to zm_create.sql.in
...
Bumped version to 1.28.103 as requested
2015-08-17 15:05:17 +02:00
Robin Daermann
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
Robin Daermann
0547a66870
Bump version to 1.28.102
2015-08-17 13:40:30 +02:00
Andrew Bauer
3489d0d734
add Exif column to sql database
2015-08-16 17:43:45 -05:00
Andrew Bauer
461f81089b
change table name from monitors to users
2015-08-15 15:42:00 -05:00
Andrew Bauer
36c7d7f9c2
Add Group Edit permission to the default admin account
2015-08-15 14:58:41 -05:00
Andrew Bauer
c828a3df33
typo
2015-08-15 12:13:35 -05:00
Andrew Bauer
936aa00a5e
add sql bits
2015-08-15 12:00:48 -05:00
Robin Daermann
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
Emmanuel Papin
2ccb378e2d
Fix a typo error in sql file
2015-07-24 00:25:57 +02:00
Emmanuel Papin
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
Emmanuel Papin
d2a3655d51
Fix a typo error in db/zm_create.sql.in
2015-07-22 22:15:34 +02:00
Emmanuel Papin
d0d72672a7
Fix sql files
2015-07-22 21:49:06 +02:00
Emmanuel Papin
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
Emmanuel Papin
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
Isaac Connor
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
Isaac Connor
bd84830433
fix comment
2015-07-14 16:10:09 -04:00
Isaac Connor
2819585cdb
move add ServerId to Monitors to zm_update-1.28.100.sql
2015-07-14 16:09:01 -04:00
Isaac Connor
bc0090f6f7
fix PRIMARY KEY update on States
2015-07-07 15:46:44 -04:00
Isaac Connor
1328ba456a
fix drop primary key line.
2015-07-07 09:43:56 -04:00
Isaac Connor
6d33da6245
Add ServerId to Monitors
2015-07-02 14:17:49 -04:00
Andrew Bauer
a738011c04
Update zm_update-1.28.99.sql
...
typo
2015-06-30 10:33:09 -05:00
Andy Bauer
1aebbec4e8
Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States
...
Conflicts:
db/zm_create.sql.in
db/zm_update-1.28.99.sql
2015-06-27 16:32:32 -05:00
Isaac Connor
09b052010e
remove extra comma
2015-06-26 10:57:44 -04:00
Isaac Connor
2fba839e8b
Add Servers Table and add Id PRIMARY KEY to States
2015-06-26 10:17:07 -04:00
Pliable Pixels
754091b55d
Added isRunning column
2015-06-21 09:30:23 -04:00
Pliable Pixels
d2472f177d
Added isRunning column
2015-06-21 09:30:14 -04:00
Pliable Pixels
b41538fe65
Added definition for Foscam FI8918W
2015-06-19 15:51:07 -04:00
Pliable Pixels
67f1914e26
Added definition for Foscam FI8918W
2015-06-19 15:48:03 -04:00
Pliable Pixels
be4a434dbd
Added 9831W to update script
2015-06-19 13:57:19 -04:00
Pliable Pixels
35e8a9d89b
Added 9831W to PTZ protocol DB
2015-06-19 13:06:00 -04:00
Andrew Bauer
30765fdedf
hide USE_DEEP_STORAGE
2015-04-12 12:20:20 -05:00
Andrew Bauer
e17bad3061
add onvif ptz control into update script
2015-02-21 11:33:49 -06:00
Andy Bauer
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
Isaac Connor
ed61d2b925
alter the type of Device in the Monitors table to tinytext, which matches the MonitorPresets table, and increases the length to 255
2014-12-10 16:56:22 -05:00
Isaac Connor
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
jmcastro2014
af57c177d7
Update zm_create.sql.in
...
Add Control 3S N5071 Dome Ptz Camera
2014-11-12 08:47:35 -03:00
Isaac Connor
85529efffc
check for existence of the columns beefore trying to add them
2014-10-22 10:31:23 -04:00
Andrew Bauer
71b56a163d
Zoneminder 1.28.0 Release
2014-10-18 15:23:13 -05:00
Jan M. Hochstein
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
Isaac Connor
d1b1c35e48
these fields need to be able to be nul
2014-09-08 17:10:49 -04:00
Isaac Connor
2b4fb7af26
drop not nuls from new V4L fields
2014-08-27 09:42:06 -04:00
Andrew Bauer
254dffa633
Move ONVIF control script & add dB entry
2014-08-03 15:52:59 -05: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
0d229182f7
add the db updates for the V4L changes
2014-07-24 14:38:51 -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
Isaac Connor
5c27ba8b1f
I don't know why this never has the right # of coumns, so let's be specific
2014-07-09 11:44:07 -04:00
Isaac Connor
90b06060af
fix missing ExtendAlarmFrames column when add Default ZonePreset
2014-06-26 11:17:09 -04:00
Isaac Connor
b48d06b279
change commands to handle if db already has the User and Pass fields
2014-06-13 16:09:01 -04: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
Kfir Itzhak
bad679e026
Merge pull request #426 from m-bene/extendPreclusive
...
Add new colum ExtendAlarmFrames to db/zm_create.sql.in
2014-05-08 05:41:58 +03:00
m-bene
79a13cf750
adjust inserts to ZonePresets
2014-05-08 03:49:48 +02:00
m-bene
aae6dbed13
Add new colums to zm_create.sql.in
2014-05-08 02:53:44 +02:00
m-bene
a6a9d9f270
add Options field to zm_create.sql.in
2014-05-08 02:30:54 +02:00
m-bene
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
m-bene
9fb794f4d0
add option field zo monitors
2014-04-25 13:23:06 +02: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
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
m-bene
da8ac0726d
make db update safe to run multiple times
2014-03-20 22:02:58 +01:00
m-bene
9ce51755ff
add ExtendAlarmFrames Fields to Zones and ZonePresets
2014-03-20 10:26:48 +01:00
Isaac Connor
0cd3e33fb1
add db inserts to add WanscamPT controls
2014-03-19 12:20:19 -04:00
Andrew Bauer
5dbe34d96d
This commit adds to the bottom of the presets list the default zone preset value which would come with the original fresh install.
2014-02-26 08:07:30 -06:00
Andrew Bauer
e8be3cb571
Merge remote branch 'nagyrobi/patch-8' into nagyrobi
2014-02-26 07:57:42 -06:00
Andrew Bauer
c3200dfec7
Update zm_create.sql.in
...
Enable delete filter by default. Increase limit to 100 events.
2014-02-20 14:10:54 -06:00
Andrew Bauer
563c526d98
Update zm_update-1.27.0.sql
2014-02-01 12:56:18 -06:00
Andrew Bauer
5978f69af4
Rename zm_update-1.26.6.sql to zm_update-1.27.0.sql
...
Renamed to reflect 1.27 release
2014-02-01 12:56:01 -06:00
Andrew Bauer
ed40ee4d11
Update zm_create.sql.in
...
Fix typo created during a manual merge
2014-01-17 09:54:37 -06:00
Andrew Bauer
b2b9f3f466
Merge branch 'master' of https://github.com/Tim-Craig/ZoneMinder into Tim-Craig-master
...
Conflicts:
db/zm_create.sql.in
2014-01-17 09:50:05 -06:00
Andrew Bauer
532d1ba413
Update zm_create.sql.in
...
Don't explicitly set the Id number of each ptz control. The auto increment flag has previously been turned on so mysql will insert the proper value for us when we create a new record. This will make the list of ptz controls easier to manager as the list gets bigger.
2014-01-17 08:42:26 -06:00
Andrew Bauer
c2a0c5917d
Update zm_create.sql.in
...
Changed the CaSe on a few INSERT INTO statements for consistency.
2014-01-17 08:38:54 -06:00
Andrew Bauer
10ebb7442c
Update zm_create.sql.in
...
When creating a new dB, we should drop the Logs table if it already exists, just like we do with the other tables.
2014-01-17 08:35:37 -06:00
tim
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
Kfir Itzhak
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
Kfir Itzhak
a962815624
Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one
2014-01-05 08:59:09 +02:00
Isaac Connor
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
Andrew Bauer
2f3934c20e
Merge pull request #289 from dmak/foscam
...
Foscam IP cameras control script
2014-01-01 07:30:46 -08:00
Dmitry Katsubo
b370f98004
Improved the script using advise from http://stackoverflow.com/a/16405301/267197 so that re-running the script does not crash reinstall.
2013-12-30 15:32:20 +01:00
Dmitry Katsubo
3fb76eaf35
Initial version of control file for Foscam IP cameras.
...
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
2013-12-29 22:24:35 +01: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
Scott Robinson
f2d9deaed6
Update test.monitor.sql
...
testing travis build
2013-12-24 11:07:27 +00:00
Andrew Bauer
6d093c0407
Merge pull request #276 from knnniggett/foreign
...
Disables non-POSIX warning when using gnu wildcard
2013-12-23 14:49:19 -08:00
Edward Barnard
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
Andy Bauer
283091a88e
Disables non-POSIX warning when using gnu wildcard
2013-12-19 14:10:22 -06: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
Andrew Bauer
e68fd9db91
Automatically grab all sql scripts in the db subfolder
2013-12-14 09:45:18 -06:00
Andrew Bauer
8265eb98dc
Add reference to zm_update-1.26.5.sql in Makefile.am
2013-12-13 18:51:39 -06: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
Isaac Connor
0c18f11764
add inital table definition for Storage
2013-12-13 13:07:18 -05:00
Kfir Itzhak
c08e4de42e
Added the database update file for 1.26.5 with includes the AlarmRefBlendPerc option
2013-11-07 16:29:02 +02:00
Kfir Itzhak
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
Kfir Itzhak
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
Kfir Itzhak
9d5ac7ae8c
Fix cmake installing wrong files in an out-of-source build
2013-11-04 09:56:40 +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
Andrew Bauer
e04cc4d026
Create pkgdatadir in make
2013-10-07 08:28:19 -05:00
Isaac Connor
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
mastertheknife
48f11a8064
Add cmake to zoneminder
2013-09-28 12:59:50 +03:00
Kyle Johnson
598e830659
SQL syntax error in travis test monitor
2013-09-27 15:56:06 -04:00
Kyle Johnson
2c64c5d2be
SQL syntax error in travis test monitor
2013-09-27 15:43:05 -04:00
Kyle Johnson
70841d32ab
Use only the needed fields for the travis test cam
2013-09-27 15:31:07 -04:00
Kyle Johnson
de59dd8f10
Proper number of columns 1.26.3 for travis
2013-09-27 14:25:03 -04:00
Kyle Johnson
a5e526d788
Assign a monitor ID of 500 to the test monitor for the travis builds
2013-09-27 13:58:47 -04:00
Kyle Johnson
3119ab7672
Added steps to install ZM binaries, insert a monitor and start ZM
2013-09-27 09:47:58 -04:00
Serguei S. Dukachev
67595c1c84
Error correction
...
Table "Users":
ERROR 1366 (HY000) at line 523: Incorrect integer value: '' for column 'Id' at row 1
Table "MonitorPresets":
ERROR 1366 (HY000) at line 550: Incorrect integer value: '' for column 'Id' at row 1
...and many others like this
Incorrect 'channel' field type in table "MonitorPresets":
ERROR 1366 (HY000) at line 550: Incorrect integer value: 'simple' for column 'Channel' at row 1
...and many others like this
"DefaultValue" field is very small in table "Config":
ERROR 1406 (22001) at line 743: Data too long for column 'DefaultValue' at row 1
Some 'INSERT INTO MonitorPresets' querys are wrong.
"Message" field is very small in table "Logs":
Can't write log entry 'insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( 1379059494.570980, 'web_php', 30387, -3, 'FAT', 'SQL-ERR \'Incorrect decimal value: \'\' for column \'MaxFPS\' at row 1\', statement was \'insert into Monitors set LinkedMonitors = \'\', Name = \'test\', Type = \'Remote\', Function = \'Monitor\', Enabled = \'1\', RefBlendPerc = \'12\', MaxFPS = \'\', AlarmMaxFPS = \'\', Device = \'/dev/video0\', Channel = \'0\', Format = \'255\', Palette = \'0\', LabelFormat = \'%N - %d/%m/%y %H:%M:%S\', LabelX = \'0\', LabelY = \'0\', ImageBufferCount = \'50\', WarmupCount = \'25\', PreEventCount = \'25\', PostEventCount = \'25\', StreamReplayBuffer = \'1000\', AlarmFrameCount = \'1\', EventPrefix = \'Event-\', SectionLength = \'600\', FrameSkip = \'0\', FPSReportInterval = \'1000\', DefaultView = \'Events\', DefaultRate = \'100\', DefaultScale = \'100\', WebColour = \'red\', SignalCheckColour = \'#0000c0\', Protocol = \'http\', Method = \'simple\', Host = \'192.168.3.225\', Port = \'80\', Path = \'\', Colours = \'3\', Width = \'320\', Height = \'240\', Orientation = \'0\', Deinterlacing = \'0\', Sequence = 1\'', 'includes/database.php', 78 )': Data too long for column 'Message' at row 1
2013-09-13 01:34:00 -07:00
Andy Bauer
0dd98ccdd1
Merge pull request #119 from knnniggett/zmupdate_zm.1.26.3
...
Update zmupdate.pl.in for 1.26.3 release
2013-09-10 11:16:10 -07:00
Andy Bauer
1d664f22ac
exclude zm_update-1.26.3.sql since it has already been added
2013-09-10 13:14:16 -05:00
Andy Bauer
0bf9aacab2
Update zmupdate.pl.in for 1.26.3 release
2013-09-10 12:46:33 -05:00
Kyle Johnson
57ce1bed8d
Adding the db/zm_update file so that the upgrade script works
2013-09-10 13:42:56 -04:00
Kyle Johnson
6c134f9b4b
Merge pull request #116 from knnniggett/zmupdate_newrelease
...
Add 1.26.1 and 1.26.2 releases to zmupdate
2013-09-07 19:07:37 -07:00
Knniggett
d4179035de
Modify zmupdate for 1.26.1 and 1.26.2 releases
2013-09-07 15:08:09 -05:00
Isaac Connor
0a9e63ca2c
remove autogenerated files
2013-09-06 14:40:55 -04:00
Kyle Johnson
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
Andy
e18c08356e
Fixed typo
...
line 614 was missing a trailing semicolon
2013-08-27 18:35:27 -05:00
Knniggett
bac2d89a8d
Add PTZ control files and camera presets for specific ptz cameras
2013-08-25 18:52:09 -05:00
Knniggett
2263793b49
Adds PTZ controls & camera presets for specific cameras. (NOTE TO SELF: remove ~ files)
2013-08-22 13:14:28 -05:00
Andy
29ec57f64e
Update Makefile.am
...
zm_update-1.26.0.sql was not being copied with the rest of the sql scripts during install.
2013-08-18 16:58:15 -05:00
nagyrobi
205c297196
Update zm_create.sql.in
...
On a fresh ZoneMinder install, there's a default zone preset active which works pretty well.
If the user goes to the zone settings and plays around with the selectable presets, he looses the default setting forever, if didn't take notes by hand on a piece of paper.
This commit simply adds to the top of the presets list the default value which comes with the original fresh install.
2013-08-15 17:12:09 +02:00
Kyle Johnson
0a79e4a975
1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38
2013-08-15 09:08:51 -04:00
Kyle Johnson
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
Kyle Johnson
cb97c43ce7
Renamed db update file to match standard.
2013-08-13 11:12:02 -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
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
Isaac Connor
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -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
Kyle Johnson
bb19e80fa8
Support for control when monitor source is ffmpeg. This should fix #16 .
...
Some IP cameras need the source set to ffmpeg even though they are remote
cameras. These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
Isaac Connor
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
Isaac Connor
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
Isaac Connor
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
Isaac Connor
0da26d4f75
add a Controls preset for Airlink SkyIPCam 7xx cameras
2013-05-09 09:14:01 -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
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01: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
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
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
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
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
2ab2631ef1
Regenerated
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3363 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:14:53 +00:00
stan
58c77d2b40
Updates for version 1.24.4
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3358 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:19:12 +00:00