Commit Graph

1934 Commits

Author SHA1 Message Date
Isaac Connor b8c7b6ae77 Merge branch 'storageareas' into record_audio 2016-09-23 11:34:15 -04:00
Isaac Connor 782f9395ae turn down the debugging 2016-09-23 09:51:03 -04:00
Isaac Connor a5b7b6e74f move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video 2016-09-22 10:43:20 -04:00
Isaac Connor 95bbaf42b6 change the version test to include ffmpeg 56.60.100 for av_packet_unref 2016-09-21 16:03:24 -04:00
Isaac Connor 984394f920 packet needs to be both unref'd and freed when we use av_malloc to allocate a packet 2016-09-21 16:02:51 -04:00
Isaac Connor 32d145cf2e free writejpg_ccinfo structs as well 2016-09-21 16:02:14 -04:00
Isaac Connor 5722f3af2f fix audio_stream to audio_st 2016-09-21 14:01:32 -04:00
Isaac Connor 4b5af390fd merge 2016-09-21 12:44:27 -04:00
Isaac Connor 249d3cadc5 fix for video on stream 1 2016-09-21 12:17:09 -04:00
Isaac Connor 1310aee1cc handle video stream at index 1 without audio 2016-09-21 12:12:40 -04:00
Isaac Connor 6292ce3748 undo stupid thing 2016-09-21 12:07:58 -04:00
Isaac Connor 2f248cd4b1 log time bases on videostore instantiation instead of every packet 2016-09-21 11:58:59 -04:00
Isaac Connor f5405a4131 clearer debug output 2016-09-21 11:57:42 -04:00
Isaac Connor ae63861cd1 better codec_tag setting 2016-09-21 11:57:30 -04:00
Isaac Connor 8b13401250 more debugging 2016-09-21 11:37:59 -04:00
Isaac Connor a8c4fdd616 more debug 2016-09-21 10:58:02 -04:00
Isaac Connor e1a29f47b9 more debug 2016-09-21 10:57:21 -04:00
Isaac Connor 4359c65601 better debugging of timebase 2016-09-21 10:56:09 -04:00
Isaac Connor e0b0b42966 fixup dts calcs 2016-09-21 10:29:49 -04:00
Isaac Connor 01d4ca96c7 av_unref_packet should be av_packet_unref 2016-09-21 10:15:23 -04:00
Isaac Connor 288b03290c remark out some debugging 2016-09-21 09:05:55 -04:00
Isaac Connor 19a60b01da maybe fixes, maybe big memleaks 2016-09-20 16:59:43 -04:00
Isaac Connor 4750c016c4 define a zm version of av_frame_alloc to clean up code 2016-09-20 14:05:28 -04:00
Isaac Connor 97053df0b1 define a zm version of av_frame_alloc to clean up code 2016-09-20 14:05:25 -04:00
Isaac Connor d26f3c9a6c define a zm version of av_frame_alloc to clean up code 2016-09-20 14:05:16 -04:00
Isaac Connor 0614af4f51 work on audio encoding 2016-09-20 10:10:02 -04:00
Isaac Connor ae80fd4d2d put startTime init back where it belongs 2016-09-19 21:33:20 -04:00
Isaac Connor 61df6e9d75 Work on aac encoding 2016-09-16 15:54:13 -04:00
Isaac Connor d4645cd94a we should be queueing packets regardless of recording state 2016-09-16 11:03:16 -04:00
Isaac Connor fbc0729c83 code cleanup, more use of av_strerr to give better error logs. 2016-09-16 10:14:58 -04:00
Isaac Connor 05f061b84b Merge ../ZoneMinder.master into packetqueue 2016-09-16 09:58:04 -04:00
Isaac Connor bd076fed69 Merge branch 'storageareas' into packetqueue 2016-09-16 09:56:41 -04:00
Isaac Connor 81c0b28786 fix call to setStartTime 2016-09-15 11:43:08 -04:00
Isaac Connor 06c73954d6 move set|getStartTime functions down to where they need to be. 2016-09-15 11:42:51 -04:00
Isaac Connor 8f33ed6ca6 introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started. 2016-09-15 11:16:05 -04:00
Isaac Connor 85b2ba73ab change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH 2016-09-14 09:31:57 -04:00
Isaac Connor 07c12d0fae insert NULLs for StorageId when creating event if no Storage Area is defined for the monitor 2016-09-14 09:16:17 -04:00
Isaac Connor ef8d8bd1e5 try inserting NUll for StorageId when creating event 2016-09-14 09:02:32 -04:00
Isaac Connor f82cd461b2 more debug 2016-09-13 12:01:02 -04:00
Isaac Connor a6b23f50d5 Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 10:21:14 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor 59b28e8346 deprecate the z_frame_rate stuff which is deprecated in ffmpeg 2016-09-13 10:15:47 -04:00
Isaac Connor 88d86afd85 Merge ../ZoneMinder.master into storageareas 2016-09-13 10:02:53 -04:00
Isaac Connor 2bc5742aec Merge branch 'feature-h264-videostorage' into storageareas 2016-09-13 09:53:39 -04:00
Isaac Connor 39e06b929f add braces and only call closeEvent if there is an event 2016-09-13 09:36:45 -04:00
Steve Gilvarry fc060135fe Move our recording flag deeper into closeevent 2016-09-13 22:58:38 +10:00
Isaac Connor d0fb2acfaa rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments 2016-09-12 21:35:14 -04:00
Isaac Connor 6366d137bc add more debug code 2016-09-12 21:34:18 -04:00
Isaac Connor 4ee1f38dd0 move storing packet to videostore up before decoding. move packet allocation inside the while that it needs to be in. 2016-09-09 14:38:16 -04:00
Isaac Connor 15569d4f33 whitespace, commenting, cleanup some Type castings, init zones[i] to null, because it might not get assigned a Zone object. 2016-09-09 10:07:13 -04:00
Isaac Connor 4cfd5cfbb9 deprecate safepkt, not sure why it was needed 2016-09-09 10:05:54 -04:00
Isaac Connor caaaffbb5d change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:29 -04:00
Isaac Connor c6607ea5fe change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue 2016-09-09 10:05:24 -04:00
Isaac Connor 5e7404d448 define zm_av_unref_packet 2016-09-09 10:04:54 -04:00
Isaac Connor 8148e35ec6 rework to dynamically allocate packet instead of putting it on the stack. Plus packet freeing cleanups 2016-09-09 10:04:42 -04:00
Isaac Connor 3a06ba7a65 Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later. 2016-09-09 09:15:04 -04:00
Isaac Connor 6e9cb06290 Merge branch 'storageareas' into packetqueue 2016-09-08 09:40:52 -04:00
Isaac Connor f67a58723c Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:40:05 -04:00
Steve Gilvarry 34a85ba3f1 Moron forgot a file 2016-09-08 23:39:04 +10:00
Isaac Connor 7a62d84bd2 Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:23:31 -04:00
Steve Gilvarry 33baa3b302 Free Audio and pickup unconverted video codec context. 2016-09-06 23:25:59 +10:00
Steve Gilvarry e40acc301d Add mAudioCodecContext and mAudioCodec and turn existing into video
versions. Check if audio stream available and check audio stream codec
same as video is being checked now. Was Seg faulting if no audio stream.
2016-09-06 01:27:57 +10:00
Isaac Connor dfb06fd548 Merge pull request #1607 from mattdurant/fix_issue_1460
Fix issue #1460
2016-09-01 14:02:13 -04:00
Isaac Connor 586eab25e6 Merge branch 'fix_issue_1460' of https://github.com/mattdurant/ZoneMinder into merge_1607 2016-09-01 10:25:00 -04:00
Isaac Connor 9262487a77 deprecate wasRecording 2016-09-01 10:10:16 -04:00
Isaac Connor f723e29b33 stash refactor in zm_remote_camera_rtsp 2016-09-01 10:10:03 -04:00
Matt Durant 350352d956 Added check for SINGLE_IMAGE if ReadData() detects the socket closed by remote side to return 0 instead of -1. 2016-08-31 20:56:30 -05:00
Matt Durant 0950ecbcb9 Replaced loops to create color tables during initialization with statically declared arrays. 2016-08-31 19:36:14 -05:00
Isaac Connor 17e7f0ecfb Merge branch 'monitor_packetqueue' into packetqueue 2016-08-31 16:59:43 -04:00
Isaac Connor d5f60ad3f8 merge pertinent restructuring and packet queue worko 2016-08-31 16:58:59 -04:00
Isaac Connor 9d19e2587c fix should only write out the queue if we are starting a new event 2016-08-31 16:58:41 -04:00
Isaac Connor df6844a8d2 change return code for when writing an audio packet when no audio otuput stream. -1 causes bad things to happen 2016-08-31 16:47:51 -04:00
Isaac Connor 8bb956c3b1 re-organize to remove code duplication and make logic clearer 2016-08-31 16:47:15 -04:00
Isaac Connor 9153d2a986 when the audio stream is not aac, don't save it. 2016-08-31 15:59:05 -04:00
Isaac Connor a1941c5a65 variable renaming to be more readable. Don't save anythign except AAC. 2016-08-31 15:46:19 -04:00
Isaac Connor a51944b2c5 cleanup, remove separate audio and video queues 2016-08-31 15:38:44 -04:00
Isaac Connor 4dce24a276 write out queued packets when instantiating videostore 2016-08-31 15:38:24 -04:00
Isaac Connor 824d7c5b43 Merge ../ZoneMinder.Steve into packetqueue 2016-08-31 11:58:22 -04:00
Isaac Connor 55c6e5a6db cleanup putting packetqueue in the monitor. It should be in the camera 2016-08-31 11:47:42 -04:00
Steve Gilvarry d1bcb14629 Right direction 2016-09-01 00:00:10 +10:00
Isaac Connor 81dd65352d better debugging and testing for different aspect ratios 2016-08-29 21:54:32 -04:00
Isaac Connor 19d46c2d09 Merge branch 'master' into storageareas 2016-08-15 10:45:50 -04:00
Steve Gilvarry 44df4a830d Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 20:44:48 +10:00
Isaac Connor 1277f3c792 need arpa/inet for reverse lookups 2016-08-10 12:32:58 -04:00
Isaac Connor 6ac1a70b9c Merge my Rotation/Orientation work and fixes for bad h264 streams 2016-08-10 12:22:04 -04:00
Isaac Connor 62a2ce56fb Merge Rotation/Orientation work, rename id to monitor_id in cameras and also make it an unsigned int since logically that is what it is. Also some fixups for bad rtsp h264 streams. 2016-08-10 12:19:53 -04:00
Steve Gilvarry 21c46bb519 Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 00:52:35 +10:00
Steve Gilvarry 5d8159462c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-11 00:51:46 +10:00
Isaac Connor 3f713df826 bump libavutil version check as per @SteveGilvarry 2016-08-09 13:14:10 -04:00
Isaac Connor 252ac5228a fix merge 2016-08-09 08:41:22 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Isaac Connor 177c2c741b Fixes #1584. I've just copied the relevant functions from ffmpeg source. Please review carefully before merging. 2016-08-07 10:55:19 -04:00
Andrew Bauer f67394ffb7 Merge pull request #1567 from SteveGilvarry/avdictparsestring
Use av_dict_parse_string to create AVDictionary of options
2016-08-06 09:50:49 -05:00
Andrew Bauer 382896dc0d Merge pull request #1498 from josh4trunks/mysql_port_socket
Add support for MySQL Port / Unix Socket
2016-08-06 09:32:32 -05:00
Steve Gilvarry ea1ae815f1 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-05 23:03:06 +10:00
Steve Gilvarry cf84dde613 segfault cause I think I am missing the queue 2016-08-03 23:48:33 +10:00
Isaac Connor ed5d6b37ee Merge ../ZoneMinder.Steve into storageareas 2016-08-02 13:57:52 -04:00
Steve Gilvarry 0425c68d59 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue 2016-08-02 20:17:35 +10:00
Isaac Connor 208337635a Merge branch 'master' into storageareas 2016-08-01 19:30:01 -04:00
Steve Gilvarry 1a684b7709 Remove whitespace 2016-07-28 23:22:34 +10:00
Steve Gilvarry 71e3789bd0 Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport 2016-07-28 23:15:01 +10:00
Isaac Connor 45fadaf297 Use Monitor Id instead of Name when writing diag images. The name symlink might not exist 2016-07-26 13:08:32 -04:00
Isaac Connor 541f879b26 when time_base is not set in codec, set it to video_st->time_base 2016-07-25 21:42:50 -04:00
Isaac Connor 8db20a4543 change test for prevDTS >= dts to just prevDTS > dts 2016-07-25 13:23:44 -04:00
Steve Gilvarry b9a48eb464 Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
2016-07-17 08:11:53 +10:00
Isaac Connor 14d8496972 add NULL test for RTSPDesribe 2016-07-14 10:27:24 -04:00
Isaac Connor b7096b742d implement some checks for valid values when opening the output file 2016-07-13 15:29:29 -04:00
Isaac Connor f68527674a merge Steve's tree, which allegedly fixes the header problems 2016-07-13 12:38:12 -04:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Steve Gilvarry b05eabfe1d Forgot that I was trying to solve case of stream is true and record_audio
is false.
2016-07-13 08:31:10 +10:00
Isaac Connor 91ef963738 add case for no rotation to get rid of log message 2016-07-12 12:06:12 -04:00
Isaac Connor 26369268bb merge Steve's updates, work on zmaudit 2016-07-12 11:27:25 -04:00
Isaac Connor a30610fbda Merge branch 'master' into storageareas 2016-07-12 10:31:10 -04:00
Steve Gilvarry f1b9e1205a Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio 2016-07-12 23:13:02 +10:00
Steve Gilvarry 5d2ece0063 Why are these failing 2016-07-10 11:57:08 +10:00
Steve Gilvarry 25f7a8cadf Restore lost fixes for deprecation 2016-07-09 22:31:01 +10:00
Steve Gilvarry 142784746c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-07-07 19:33:04 +10:00
Andrew Bauer 75a98601ef fix jpeg buffer too small 2016-07-03 14:59:05 -05:00
Isaac Connor 0a4eee323b Use a subquery instead of a join to fix group by errors when sql_mode=only_full_group_by 2016-06-27 10:26:52 -04:00
Andrew Bauer 97baf4ecd3 Merge pull request #1529 from ZoneMinder/fix_1526
connect needs a +1
2016-06-24 09:53:46 -05:00
Isaac Connor 6644db3bea check for null on various Monitor fields 2016-06-24 10:29:50 -04:00
Isaac Connor 081c0add72 fix 2016-06-23 11:25:50 -04:00
Isaac Connor ccea620531 check for null before instantiating strings 2016-06-23 11:13:26 -04:00
Isaac Connor 1383e0b774 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-06-22 09:41:47 -04:00
Isaac Connor 7496dc392f get rid of use of separator, just use \n 2016-06-21 14:06:07 -04:00
Isaac Connor c6761dd094 fix merge 2016-06-21 14:02:36 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor ce22e6534e fix tabs 2016-06-21 12:26:08 -04:00
Isaac Connor dfc885a12a fix tabs 2016-06-21 12:25:13 -04:00
Isaac Connor 6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Steve Gilvarry d8f6cc952d Fix missing } from merge that was preventing building. 2016-06-19 07:22:14 +10:00
Isaac Connor 08c8da3e8f fix extra else and some whitespace 2016-06-17 11:37:20 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 98fab6528d always use \n as separator and remove the segfault 2016-06-13 14:00:24 -04:00
Isaac Connor 910fd8212f Merge branch 'fix_1526' into storageareas 2016-06-13 09:45:34 -04:00
Isaac Connor 472973e975 connect needs a +1 2016-06-12 15:45:24 -04:00
Isaac Connor fad1d95011 fix NULL in linkedMonitors column 2016-06-09 13:06:57 -04:00
Isaac Connor d9f2911f0d handle null values in Monitors columns 2016-06-09 12:51:22 -04:00
Andrew Bauer f289b84901 move VIDEO_MAX_FRAME up 2016-06-06 19:04:02 -05:00
Andy Bauer 06923d44ba Set VIDEO_MAX_FRAME if it is not defined 2016-06-06 16:27:13 -05:00
Isaac Connor b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -04:00
Isaac Connor 2385575c56 fix +1 being outside bind() 2016-06-02 16:23:04 -04:00
Isaac Connor f99f394a3d hopefully fixup zm_av_packet_ref for libavtools 2016-05-25 21:05:08 -04:00
Isaac Connor b3fd156c11 add boost to build depends 2016-05-25 20:01:42 -04:00
Isaac Connor eb30a9079e code style, commenting 2016-09-29 14:04:32 -04:00
Isaac Connor 52df5174e7 fix zm_av_frame_alloc define for trusty 2016-09-29 13:21:24 -04:00
Isaac Connor 07d8d008ba Merge branch 'fix_auth_timeout' into storageareas 2016-09-29 12:22:56 -04:00
Isaac Connor e423e0802c put back the needed sql and add a lot of debugging 2016-09-29 12:22:32 -04:00
Isaac Connor 5c867aa5f5 Merge branch 'fix_auth_timeout' into storageareas 2016-09-29 10:10:38 -04:00
Isaac Connor 8bc7b9562f introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for 2016-09-29 10:04:53 -04:00
Isaac Connor 02ef99584c Revert "alter code to use libv4l2"
This reverts commit 00ef0f4d78.
2016-09-29 09:30:12 -04:00
Isaac Connor b309837f02 put back zmDbRow use 2016-05-25 10:21:44 -04:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Isaac Connor 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04:00
Andy Bauer d12b9dc16d fix typo. needs } 2016-05-24 09:24:18 -05:00
Andy Bauer 6e82f2c9a9 add messages back with debug 3 2016-05-24 08:50:09 -05:00
Andrew Bauer bc163b33fc move multiserver message to once during startup only 2016-05-23 20:06:29 -05:00
josh4trunks 2ab79820a1 Add back changes 2016-05-22 08:08:12 -07:00
Steve Gilvarry 0abfb7378a Buffer work 2016-05-18 00:01:33 +10:00
Isaac Connor 58d326681a quick fix for gcc6 2016-05-17 09:17:19 -04:00
Isaac Connor 435a1f7a2e remove duplicated locking code created by bind_fixes 2016-05-17 09:11:52 -04:00
Isaac Connor 710ecd5b19 Put rotation metadata in the video stream metadata where it belongs 2016-05-16 14:36:09 -04:00
Isaac Connor c11a92efdd implement 180,270 rorations and cleanup 2016-05-13 15:11:17 -04:00
Isaac Connor 943a4cef73 Merge branch 'storageareas' into rotate_video 2016-05-13 15:00:50 -04:00
Isaac Connor 71e9553648 add rotation to video 2016-05-13 14:51:26 -04:00
Isaac Connor 4843cb094e more debug 2016-05-11 11:59:41 -04:00
Isaac Connor 958cf6f3c7 fix merge problem causing duplicated lock 2016-05-11 11:35:38 -04:00
Isaac Connor add4992dea Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-05-09 21:08:13 -04:00
Isaac Connor a8de0bff71 Merge branch 'master' into storageareas 2016-05-09 19:30:02 -04:00
Steve Gilvarry 413eced6df Merge pull request #1450 from ZoneMinder/bind_fixes
add some error checking, but fix the call to bind
2016-05-10 08:00:10 +10:00
Steve Gilvarry 1f3b3d1203 Revert "WIP packetqueue shared memory"
This reverts commit 8aa1cb6bf6.
2016-05-08 15:25:18 +10:00
Steve Gilvarry a3eabe9c72 Shared Memory WIP 2016-05-08 15:14:24 +10:00
Isaac Connor 654d4d2bee Merge branch 'api_fixes' into storageareas 2016-05-07 10:56:47 -04:00
Isaac Connor 18461b0c64 Add some debugging 2016-05-06 12:39:10 -04:00
Isaac Connor fd896acd50 Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6 2016-05-06 08:32:21 -04:00
Isaac Connor 49dc917b2e Merge isaac:ZoneMinder.p1 into storageareas 2016-05-05 15:24:14 -04:00
Isaac Connor e64376ed02 increase debug level for Zone motion detection 2016-05-05 14:51:41 -04:00
Isaac Connor 88a0bdc026 Add some code comments. Make mocord always honour section_length 2016-05-05 14:51:26 -04:00
Isaac Connor e8cbb90125 increase log debug level for blend routing reporting 2016-05-05 14:50:50 -04:00
Isaac Connor c3628a8dfd Merge branch 'updated-console' into storageareas 2016-05-03 14:34:58 -04:00
Steve Gilvarry 02013cef94 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue 2016-05-03 21:15:46 +10:00
Steve Gilvarry 8aa1cb6bf6 WIP packetqueue shared memory 2016-05-03 20:07:45 +10:00
Isaac Connor 341ebc7b45 Merge branch 'master' into bind_fixes 2016-05-02 12:39:55 -04:00
Steve Gilvarry b9a6273f32 Fix dropped part of sql query. 2016-05-01 15:59:53 +10:00
Steve Gilvarry da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Isaac Connor 819dad455e whitespace/tabs 2016-04-29 09:11:14 -04:00
Isaac Connor b41a3b1b25 fix tabs/shiftwidth 2016-04-29 09:01:28 -04:00
Isaac Connor 5eebc50bfb tabs to spaces 2016-04-29 08:57:31 -04:00
Isaac Connor 728bffa6a0 Check and set audio to mono 2016-04-29 08:52:25 -04:00
Isaac Connor af66105c37 Merge branch 'master' into storageareas 2016-04-29 08:28:53 -04:00
Steve Gilvarry e73935a15b Clean up extraneous avutil include 2016-04-29 21:29:07 +10:00
Steve Gilvarry 8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Isaac Connor 097e7f3906 Merge branch 'master' into storageareas 2016-04-28 16:40:44 -04:00
Isaac Connor 0dc2987b84 add some error checking, but fix the call to bind which really should have a +1 in it. 2016-04-28 16:32:50 -04:00
Isaac Connor 30b3fa8a8b add a cast to help the compile figure out which function to use 2016-04-28 12:57:38 -04:00
Isaac Connor 1096461793 Need a cast to handle old avformat 2016-04-28 12:57:14 -04:00
Isaac Connor 1282e36bb2 av_get_media_type_string is not available in trusty 2016-04-28 12:56:40 -04:00
Isaac Connor 337d8a748c simplify the separator stuff 2016-04-28 12:56:19 -04:00
Isaac Connor fac07cba6d Merge branch 'master' into tabs_to_spaces 2016-04-28 09:31:40 -04:00
Isaac Connor 629f141734 Merge pull request #1441 from SteveGilvarry/remove_commented_code
Delete large commented out code segment
2016-04-28 09:30:43 -04:00
Isaac Connor 59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -04:00
Isaac Connor 24e3306955 master master 2016-04-28 09:20:56 -04:00
Steve Gilvarry af361042ef Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string
use std::string instead of C strings. Mostly this will quiet build wa…
2016-04-28 22:13:44 +10:00
Steve Gilvarry d9fd0faa32 Merge pull request #1447 from ZoneMinder/simplify_zm_signal
Simplify zm signal
2016-04-28 21:37:55 +10:00
Steve Gilvarry dcf3852124 Starting to convert to boost.interprocess 2016-04-28 01:28:37 +10:00
Isaac Connor 69d5065ebf move ip down as well 2016-04-26 16:05:37 -04:00
Isaac Connor 5d88acb8a6 re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd 2016-04-26 16:03:26 -04:00
Isaac Connor 7d7249f328 use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows 2016-04-26 15:48:21 -04:00
abi 9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor 2d8c484792 rotate dimensions when instantiating the Monitor object 2016-04-25 16:48:26 -04:00
Isaac Connor d936312207 revert 2016-04-25 16:46:23 -04:00
Isaac Connor 8c53925fdc redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions. 2016-04-25 16:00:34 -04:00
Isaac Connor 851e8f46ff redo fix_rotate 2016-04-25 15:57:39 -04:00
Isaac Connor 26a45d5fa9 Don't rotate dimensions when constructing the monitor because they are already rotated 2016-04-25 13:55:28 -04:00
Steve Gilvarry 4ca61b7bd8 Removed 180 lines of commented out code that has been hanging around
in here for a long time.
2016-04-25 22:12:49 +10:00
Steve Gilvarry 7fcd12fab9 Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer 2016-04-25 22:06:07 +10:00
Isaac Connor 44f32f46b7 deprecate zmdbFetchOne in favor of zmDbRow 2016-04-20 11:56:58 -04:00
Isaac Connor 2fcdee87d9 Merge branch 'storageareas' into valgrind 2016-04-20 10:01:30 -04:00
Isaac Connor 71d79fac99 Merge ../ZoneMinder.SteveGilvarry into valgrind 2016-04-20 09:59:08 -04:00
Isaac Connor d2870f0692 move the mysql_free_result, looks like we can't free it until we free the row 2016-04-20 09:44:11 -04:00
Isaac Connor 98fa65310b whitespace changes 2016-04-17 09:29:00 -04:00
Isaac Connor d6f640907f add avformat_network_init 2016-04-17 09:28:43 -04:00
root 72bf8ac2b8 up the debug level for Have Keyframe 2016-04-16 15:13:36 -04:00
Isaac Connor e4f116af2f more debug and comments, return checking 2016-04-15 15:32:48 -04:00
Isaac Connor 111b1a1566 add back lastKeyframePkt 2016-04-15 15:23:22 -04:00
Isaac Connor db52a61b01 More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash 2016-04-15 15:22:58 -04:00
Isaac Connor f1e69463b6 More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash 2016-04-15 15:22:47 -04:00
Isaac Connor b3e68ca2f7 Must init videoStore in constuctor 2016-04-15 15:10:26 -04:00
Isaac Connor 1e8450ecbf av_set_parameters was deprecated a long time ago 2016-04-15 12:50:05 -04:00
Isaac Connor 21b35c4df0 Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-14 22:12:52 -04:00
Isaac Connor b19f990147 Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-14 22:12:49 -04:00
Isaac Connor 3e683e3002 Add a call to av_set_parameters, found some code that says it must be called 2016-04-14 22:12:34 -04:00
Isaac Connor bcec1813e6 More return value checking/commenting 2016-04-14 21:54:17 -04:00
Isaac Connor c7dceafd67 fix first param to zm_dump_stream_format 2016-04-14 12:42:47 -04:00
Isaac Connor 30066f788d Merge branch 'feature-h264-videostorage' into storageareas 2016-04-14 12:35:21 -04:00
Isaac Connor c189e60d9b add some comments, and dump filename and AVFormatContext on failure to write header 2016-04-14 12:34:52 -04:00
Isaac Connor fb48c909ce Merge branch 'log_include_mId' into storageareas 2016-04-12 08:42:38 -04:00
Isaac Connor 2724b10163 Include mId in syslog logging. 2016-04-12 08:42:12 -04:00
Andrew Bauer 28b30ecb47 Merge pull request #1377 from ZoneMinder/random_fixes
Random fixes
2016-04-11 12:04:05 -05:00
Isaac Connor 61bd60184a Merge branch 'random_fixes' into storageareas 2016-04-11 11:28:24 -04:00
Isaac Connor 7c0f524e1f Merge branch 'master' into random_fixes 2016-04-11 11:24:41 -04:00
Isaac Connor e1cbaed2a3 Merge branch 'icon_video' into storageareas 2016-04-06 12:50:46 -04:00
Isaac Connor fefa2dc804 add a test and error message if the codec is not h264 2016-04-06 12:48:16 -04:00
Isaac Connor dc7f2ff353 fix merge problems 2016-04-06 11:44:57 -04:00
Isaac Connor d83ab4d46c Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines 2016-04-06 11:25:05 -04:00
Isaac Connor 765f79a87f Merge branch 'icon_video' into storageareas 2016-04-06 11:16:38 -04:00
Isaac Connor 2a6071561d use zm_dump_stream_format to dump information about the packet to the log 2016-04-06 10:51:58 -04:00
Isaac Connor 9dd1c8cb4a add some packet dumping functions, stolen from ffmpeg, but these will use our logging functions 2016-04-06 10:51:20 -04:00
Isaac Connor 2f1376950a spelling fix 2016-04-06 10:50:12 -04:00
Isaac Connor 9aeba8ced8 whitespace fixes 2016-04-06 10:50:00 -04:00
Isaac Connor 0ef02287dd revert 2016-04-06 10:49:42 -04:00
Isaac Connor 222f7755fe fix whitespace 2016-04-06 10:27:41 -04:00
Isaac Connor 30d2b475eb increase log level on some success debug statements 2016-04-06 08:39:33 -04:00
Isaac Connor a92764f71a check return codes and report errors when writing trailer and closing file 2016-04-06 08:39:09 -04:00
Isaac Connor dd408cc9a1 Don't skip audo stream detection by finding video stream 2016-04-06 08:38:34 -04:00
Isaac Connor 4bc200f839 fix merge 2016-04-06 08:38:10 -04:00
Isaac Connor 9d9369db6f Don't skip audio stream by finding a video stream 2016-04-06 08:37:28 -04:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 04800afaf5 Some documenting comments and debug lines, mostly just trying to understand what the code does 2016-04-05 12:30:22 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Isaac Connor f1331df4d9 Use != instead of == when checking dts tiemscale stuff 2016-04-05 09:01:54 -04:00
SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am
2016-04-05 22:06:14 +10:00
Isaac Connor be13e56c3c add some comments 2016-04-04 21:58:16 -04:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Andy Bauer 7ff8d36598 Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation 2016-04-04 20:44:53 -05:00
Isaac Connor a60a0959fc fix SQL for inserting event. output the sql on error 2016-04-04 17:41:06 -04:00
Isaac Connor de5b9c6dae I don't know what the Name of an event is, but the column count and value count are off 2016-04-04 16:56:40 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
SteveGilvarry 966fbb1a10 Add Packet Queue 2016-04-04 20:04:14 +10:00
Isaac Connor 9287cd0e0a undo code style changes and whitespace changes 2016-04-01 15:47:40 -04:00
Isaac Connor 89598da5c1 undo code style changes and whitespace changes 2016-04-01 15:30:30 -04:00
Isaac Connor 58c39f930e revert some structure changes 2016-04-01 14:57:48 -04:00
Isaac Connor f4fc129ecf revert some structure changes 2016-04-01 14:15:31 -04:00
Isaac Connor 86c888d079 revert some structure changes 2016-04-01 14:14:02 -04:00
Isaac Connor 9493e99587 Add video file to event data. 2016-04-01 14:06:31 -04:00
Isaac Connor 03cae9d2f2 Add video file to event data. 2016-04-01 14:06:28 -04:00
Isaac Connor 82b32578ec Merge branch 'master' into iconnor_video 2016-04-01 12:54:09 -04:00
Isaac Connor 6816a4c75b Merge branch 'iconnor_video' into storageareas 2016-04-01 11:35:38 -04:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Isaac Connor 2a892c5b9a Merge branch 'iconnor_video' into storageareas 2016-03-31 15:34:52 -04:00
Isaac Connor 5c68e0c9cb structure, whitespace fixes. Add not storing audio frames 2016-03-31 15:33:27 -04:00
Isaac Connor ecce87b779 mamke status a member so that we aren't return the address of a local variable 2016-03-31 14:43:22 -04:00
Isaac Connor 1220f22eac Merge branch 'iconnor_video' into storageareas 2016-03-31 14:04:58 -04:00
Isaac Connor 56d95bb949 Merge branch 'iconnor_video' into storageareas 2016-03-31 14:02:56 -04:00
Isaac Connor c7e766faef finish the record_audio constructor defs 2016-03-31 13:30:31 -04:00
Isaac Connor c26dbb9028 rough in record_audio, and do lots of whitespace cleanups 2016-03-31 12:54:56 -04:00
Isaac Connor 2a3ed0c32c Add record_audio member, also correct whitespace 2016-03-31 12:17:17 -04:00
Isaac Connor 4e8255c80a Add record_audio member 2016-03-31 12:16:50 -04:00
Isaac Connor 92b98e1953 spacing, code structure and code documentation. Also, add in a flag to say whether to store the audio packets 2016-03-31 11:55:21 -04:00
Isaac Connor fa08646243 spacing fix 2016-03-31 11:54:21 -04:00
Isaac Connor aa516dd575 undo the multi-line 2016-03-31 11:24:27 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Isaac Connor ea49dc20d1 Merge branch 'master' into storageareas 2016-03-30 10:58:07 -04:00
Isaac Connor 204a128ecc fix use of connected when it should be mem_ptr 2016-03-29 15:46:47 -04:00
Isaac Connor 1262e831ac rework zmu to load data from the last event with frames when it can't connect to zmc 2016-03-29 14:36:16 -04:00
Isaac Connor 58f19f14e1 print ip and hostname when can't connect 2016-03-29 11:51:58 -04:00
Isaac Connor 34c50b8cfc ipv6 support 2016-03-29 11:51:28 -04:00
Isaac Connor 96ff5ec619 include netinet/in.h for FreeBSD so that we can do ipv6 ip lookups 2016-03-28 05:39:26 -04:00
Isaac Connor a16c1746e5 separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value 2016-03-24 10:00:02 -04:00
Isaac Connor 1e52a8ad2c remove unused class member 2016-03-24 09:44:34 -04:00
Isaac Connor b6ee4e4228 move return up into #ifdef. 2016-03-24 09:43:15 -04:00
Isaac Connor 0c32ae61ef Merge branch 'master' into fix_coverity_issues 2016-03-24 09:42:01 -04:00
Jon Burgess bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
SteveGilvarry 5f4441878e Coded_Frame deprecation all examples were no lomger setting AV_PKT_FLAG_KEY, is it on the packet already. 2016-03-03 17:16:06 +11:00
SteveGilvarry 2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
SteveGilvarry 3ce620eb89 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-27 19:46:56 +11:00
SteveGilvarry 23d437ab47 ffmpeg 3.0 API build failure fixes 2016-02-27 02:12:22 +11:00
SteveGilvarry e70d037895 Start avpicture deprecation 2016-02-27 01:23:20 +11:00
SteveGilvarry 0277a66700 Remove eyezm from distros and Cmake.
Conflicts:
	distros/debian8/control
2016-02-26 22:41:27 +11:00
SteveGilvarry 4837585601 Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
Conflicts:
	src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Isaac Connor e12152602b t push origin masterMerge branch 'knnniggett-zmtrigger2' into storageareas 2016-02-22 09:15:45 -05:00
Kaarle Ritvanen 5b047dc74b zm_event: fix overlap in memcpy buffers 2016-02-20 23:58:36 +02:00
Isaac Connor 68babd783b Merge branch 'master' into storageareas 2016-02-17 09:46:56 -05:00
Isaac Connor 6f221ed269 Merge pull request #1278 from schrorg/bigfont-license
Added script to generate src/zm_bigfont.h
2016-02-16 09:17:54 -05:00
Kaarle Ritvanen 6332f28c53 zm_monitor: fix overlap in memcpy buffers
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
2016-02-16 11:47:49 +02:00
arjunrc e8c38dd016 demoted to debug due to lots of logs 2016-02-11 15:12:21 -05:00
Robin Daermann f5ef721ebd Add IP6 address type to valid types for ConnInfo 2016-02-10 17:53:00 +01:00
Isaac Connor b7256a6891 Merge branch 'master' into storageareas
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	version
2016-02-10 09:17:40 -05:00
Robin Daermann 226b77bb63 Added script to generate src/zm_bigfont.h
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
2016-02-10 11:28:56 +01:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-08 20:41:36 +11:00
SteveGilvarry fa7ec2179d Bring is more of the h264 code and add some master changes to the duplicated code 2016-02-05 01:47:13 +11:00
SteveGilvarry 64bc7398fc Fixes for remote h264 passthrough 2016-02-05 01:47:13 +11:00
SteveGilvarry 78b0a9d0a9 Add videostore to remote_rtsp, still need to check stream is h264 2016-02-05 01:47:12 +11:00
Isaac Connor 48283191ec Merge branch 'master' into storageareas 2016-02-01 15:47:08 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
2016-01-30 15:45:08 +11:00
arjunrc 904f584fcb CMD_QUIT definition 2016-01-29 10:00:02 -05:00
arjunrc 38bca6b95d added CMD_QUIT to kill zms via command 2016-01-29 09:58:57 -05:00
arjunrc 47b2cdbb96 added CMD_QUIT to kill zms via command 2016-01-29 09:58:50 -05:00
Isaac Connor f275498790 Add Debug for sql used to load other than local monitors 2016-01-26 21:00:32 -05:00
Isaac Connor 902065a6c1 Add Debug for sql used to load local monitors 2016-01-26 20:59:07 -05:00
Isaac Connor 3a0b28f168 Add Debug/Info lines reporting multi-server status 2016-01-26 20:53:34 -05:00
Isaac Connor 1504b368db Warning to Debug for Storage class with no Id 2016-01-04 15:21:23 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Isaac Connor 3a18a62bc6 Add ServerId column when inserting log line into database 2015-12-30 08:29:45 -05:00
Isaac Connor 98b6ef36d4 Merge branch 'multi-server' into newpointone
Conflicts:
	src/zm_monitor.cpp
2015-12-28 13:13:15 -05:00
Isaac Connor f357ea6ccd Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server 2015-12-28 11:53:04 -05:00
Isaac Connor ccded54937 put back missing col++ 2015-12-28 11:52:40 -05:00
SteveGilvarry 3f1c782ff7 Fix random extra semicolon 2015-12-28 16:29:04 +11:00
Isaac Connor eccfced6d4 Merge branch 'multi-server' into newpointone
Conflicts:
	distros/ubuntu1204/apache.conf
2015-12-22 09:54:13 -05:00
Isaac Connor e76cc59bad revert whitespace changes 2015-12-21 13:42:44 -05:00
Isaac Connor 36f83aa412 revert whitespace changes 2015-12-21 13:35:17 -05:00
Isaac Connor 609ab79f81 revert whitespace changes 2015-12-21 13:32:57 -05:00
Isaac Connor 1fee421500 revert whitespace changes 2015-12-21 13:29:41 -05:00
Isaac Connor c0a79567e6 revert whitespace changes 2015-12-21 13:26:24 -05:00
Isaac Connor fdf1912ec1 revert whitespace changes 2015-12-21 13:11:18 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
Isaac Connor af9fc1de90 revert white space changes. 2015-12-21 12:57:05 -05:00