Commit Graph

4012 Commits

Author SHA1 Message Date
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
Isaac Connor 6f87d3fc5f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-05-05 11:17:00 -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
Kfir Itzhak f32b099f5e Merge pull request #418 from aztazt/patch-1
Update zm_jpeg.cpp to use correct values for libjpeg's boolean type
2014-05-05 09:17:57 +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
Kyle Johnson cec66de647 Merge pull request #416 from kylejohnson/master
Added an FAQ for AlarmCheckMethod
2014-05-02 08:37:52 -04:00
Kyle Johnson 312f378d08 Formatting and spell check on the FAQ 2014-05-02 08:31:26 -04:00
Kyle Johnson 435eac5e7e Expanded upon the AlarmCheckMethod FAQ 2014-05-02 08:28:38 -04:00
Kyle Johnson 5fb17ecfb6 Change one of the FAQs from h1 to h2 2014-05-02 08:16:27 -04:00
Kyle Johnson 26ba50f8ac Added an FAQ for AlarmCheckMethod 2014-05-02 08:14:57 -04:00
m-bene b197f985e0 make expiry date relative (~10years) 2014-05-01 09:53:45 +02:00
m-bene ed7ca66045 make skin selection cookie persistent 2014-05-01 09:37:39 +02:00
Isaac Connor 6d58f6591b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-04-30 10:10:49 -04:00
Isaac Connor 1d9d84cc49 max executable 2014-04-30 10:10:34 -04:00
Isaac Connor 8da9383d5d use PDO style 2014-04-30 10:09:27 -04:00
Isaac Connor e94fca2778 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-04-30 10:01:29 -04:00
Isaac Connor b3226223f8 remove uses of dbEscape 2014-04-30 10:01:10 -04:00
Kyle Johnson 20e4570216 Merge pull request #413 from kylejohnson/master
Added a doc for contributing to the project
2014-04-30 09:52:16 -04:00
Kyle Johnson cb2a9af647 Added a doc for contributing to the project 2014-04-30 13:48:03 +00:00
m-bene 20528e610f fix digest auth for RTSP using HTTP tunnel 2014-04-30 15:33:29 +02:00
Kyle Johnson 931385fdee Merge pull request #409 from ZoneMinder/api_cmake
Add the web/api folder to cmake
2014-04-30 09:19:02 -04:00
Kyle Johnson 016b5e3677 Merge pull request #411 from martin67/patch-1
Don't open /dev/ttyS0 by default in zmtrigger.pl.in
2014-04-30 09:17:03 -04:00
Martin Hagelin a148e04ea2 Update zmtrigger.pl.in
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder. 

Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.

This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02:00
Kfir Itzhak ec5784abe2 Fix wrong install path for core.php and database.php 2014-04-30 12:25:42 +03:00
Kfir Itzhak afd4e451fd Add the web/api folder to cmake 2014-04-30 12:16:46 +03:00
Kyle Johnson 0e2a164c08 Merge pull request #408 from kylejohnson/master
Move API to under web dir
2014-04-29 23:31:37 -04:00
Kyle Johnson ab884aa41b Added a README to the docs dir 2014-04-30 03:30:31 +00:00
Kyle Johnson dd854828f0 Change one of the FAQs from h1 to h2 2014-04-30 03:29:11 +00:00
Kyle Johnson ef19d8cf18 Added another issue to the FAQ (can't see Zones) 2014-04-30 03:24:48 +00:00
Kyle Johnson 4d2f270041 Added FAQ to docs 2014-04-30 03:11:20 +00:00
Kyle Johnson 40e929e7a6 Changed the API readme to be ZoneMinder-relevant 2014-04-29 20:49:54 +00:00
Kyle Johnson f1f3de6d7d Moved the api to underneath the web directory 2014-04-29 20:41:04 +00: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
Kyle Johnson c48fb0124d Merge pull request #405 from m-bene/fixDevices
remove call of undefined "fixDevices" function.  Fixes #401
2014-04-26 00:53:02 -04:00
m-bene 28f62c4f8f remove call of undefined "fixDevices" function 2014-04-26 04:23:36 +02:00
m-bene 2881e6b643 focus popup windows 2014-04-26 04:07:33 +02:00
Kyle Johnson 1e13211f02 Merge pull request #403 from kylejohnson/api
RESTful API in CakePHP, and docs
2014-04-25 18:24:10 -04: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
Kyle Johnson e18c4b593d Added api doc for adding a zone 2014-04-25 19:52:08 +00:00
Kyle Johnson 0d906d4ec9 Added api doc for adding a monitor 2014-04-25 19:29:57 +00:00