Isaac Connor
|
d5bb6f3210
|
remove line that causes endless reading when doing single image mode
|
2017-02-11 09:57:36 -05:00 |
abishai
|
74dd8ab027
|
make clang happy take two
|
2017-02-06 09:57:22 +03:00 |
Isaac Connor
|
aae4a1f83b
|
remove extraneous setting of NULL to videowriter which is already NULL
|
2017-02-04 11:20:21 -05:00 |
|
abishai
|
8d5a8f5512
|
make clang happy
|
2017-02-03 14:53:53 +03:00 |
|
Isaac Connor
|
f73bf0aee0
|
add a cast to fix compilation with clang
|
2017-02-02 12:43:13 -05:00 |
|
Isaac Connor
|
1102f449aa
|
don't do extra copy of classString
|
2017-02-02 09:22:13 -05:00 |
|
abishai
|
1687217d18
|
switch to POSIX basename()
|
2017-01-31 11:10:25 +03:00 |
|
abishai
|
97380f009b
|
implement platform-agnostic comparison without abs()
|
2017-01-31 10:42:57 +03:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
|
Isaac Connor
|
41b6369c36
|
Merge branch 'master' into feature-h264-videostorage
|
2017-01-25 09:46:06 -05:00 |
|
Isaac Connor
|
61827fec0c
|
remove redundant mkdir eventdir.
|
2017-01-18 09:31:08 -05:00 |
|
Isaac Connor
|
7116d66500
|
use the correct pointer casts
|
2017-01-16 21:57:21 -05:00 |
|
Isaac Connor
|
1f3644f6bd
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-01-16 21:14:39 -05:00 |
|
Isaac Connor
|
19bc79a5ec
|
move nRet into the block where it is used. Add a comment.
|
2017-01-16 21:11:28 -05:00 |
|
Isaac Connor
|
f6d1707382
|
fix event insert
|
2017-01-16 21:08:13 -05:00 |
SteveGilvarry
|
2f3ebd80da
|
Remove zmf, die..die..die
|
2017-01-16 13:20:05 -08:00 |
Andrew Bauer
|
5833196a84
|
packpack - change error code handling
|
2017-01-16 08:36:46 -06:00 |
|
Isaac Connor
|
c5ad62b9fc
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 14:24:58 -05:00 |
|
Isaac Connor
|
29acad163c
|
Add some casts to quiet warnings. The warnings happen because we are doing arithmetic on pointers.
|
2017-01-15 14:24:50 -05:00 |
|
Isaac Connor
|
b7ee64ff41
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-15 13:35:45 -05:00 |
|
Isaac Connor
|
899b1b82b9
|
Merge branch 'filter_by_runstate' into storageareas
|
2017-01-14 17:07:20 -05:00 |
|
Isaac Connor
|
242e5a56d8
|
rough in the ability to filter on RunState
|
2017-01-14 16:55:28 -05:00 |
|
Isaac Connor
|
babe4f07fb
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-14 10:53:49 -05:00 |
|
Isaac Connor
|
21c1e1d26f
|
add a call to av_interleaved_write_Frame to clear out the queues in the destructor
|
2017-01-13 14:37:18 -05:00 |
|
Isaac Connor
|
251264ac92
|
bump ffmpeg version required to use codecpar
|
2017-01-11 14:31:30 -05:00 |
|
Isaac Connor
|
7f059b750f
|
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
|
2017-01-11 14:25:46 -05:00 |
|
Isaac Connor
|
23b40da598
|
fix whitespacing causing a warning when compiling. In this case braces are not neccessary.
|
2017-01-11 14:25:12 -05:00 |
|
Isaac Connor
|
8653822bff
|
cleanup av_packet_unref/free_packet by using our zm_av_packet_unref
|
2017-01-11 14:22:37 -05:00 |
|
Isaac Connor
|
87daba346b
|
fix else behaviour by adding braces
|
2017-01-11 14:18:56 -05:00 |
|
Isaac Connor
|
0d5910644e
|
whitespace and braces fixes. Also add some braces to fixup a compiler error about the else not doing what it should be.
|
2017-01-11 14:18:11 -05:00 |
|
Isaac Connor
|
5d03e9f50e
|
Merge branch 'fix_1743_Edimax' into storageareas
|
2017-01-11 10:34:08 -05:00 |
|
Isaac Connor
|
c0e929f136
|
change regexp to handle quotes in the content-type line. This is needed for edimax cameras
|
2017-01-11 09:11:27 -05:00 |
|
Isaac Connor
|
8ae02b9ac0
|
use a FrameType enum instead of string comparisons
|
2017-01-08 16:53:29 -05:00 |
|
Isaac Connor
|
8f3e40d7af
|
add a const array of char * strings for the frame types so that we can make better use of the FrameType enum for more efficient code
|
2017-01-08 16:53:15 -05:00 |
|
Isaac Connor
|
dccd1e9732
|
fix
|
2017-01-05 13:54:34 -05:00 |
|
Isaac Connor
|
71ad08613e
|
fix
|
2017-01-05 11:30:01 -05:00 |
|
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
|
Isaac Connor
|
d5ad757116
|
Merge branch 'master' into feature-h264-videostorage
|
2017-01-02 10:00:02 -05:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
727d4b9714
|
add tests when select returns true, but no bytes available, in single image mode
|
2016-12-23 11:27:50 -05:00 |
|
Isaac Connor
|
61d3ecf9c1
|
when a socket times out, use getsockopt to see if there are any errors
|
2016-12-22 13:31:42 -05:00 |
|
Isaac Connor
|
f6c377c2b4
|
Merge branch 'master' into feature-h264-videostorage
|
2016-12-15 16:47:32 -05:00 |
|
Isaac Connor
|
87e8f91868
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2016-12-13 15:06:07 -05:00 |
|
Isaac Connor
|
92a4641e1b
|
Merge branch 'log_failed_log_insert' into storageareas
|
2016-12-12 21:46:53 -05:00 |
|
Isaac Connor
|
6fa3b25d2a
|
fix whitespace
|
2016-12-12 21:44:03 -05:00 |
|
Isaac Connor
|
1f6a6f9758
|
fix whitespace
|
2016-12-12 21:43:07 -05:00 |
|
Isaac Connor
|
9b76a16af4
|
log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert
|
2016-12-12 21:41:55 -05:00 |
|
Isaac Connor
|
d97c1f1cff
|
Merge branch 'fix_braces' into storageareas
|
2016-12-08 14:58:38 -05:00 |
|
Isaac Connor
|
7f2bf04c2f
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 14:26:13 -05:00 |
|
Isaac Connor
|
c27a18a758
|
fix braces in zm_monitor.cpp
|
2016-12-08 11:49:54 -05:00 |
|
Isaac Connor
|
fac6de6cb1
|
Instead of passing orientation, pass the whole monitor object so that we can use it's other features.
|
2016-12-06 11:54:34 -05:00 |
|
Isaac Connor
|
ead1631fce
|
copy some filter code into the object
|
2016-12-02 13:24:59 -05:00 |
|
Isaac Connor
|
0e302001dd
|
fix snprintf format for 64bit type
|
2016-11-29 15:26:19 -05:00 |
|
Isaac Connor
|
1a25b957ad
|
check for and create events dir for monitor on Object instantiation
|
2016-11-27 20:10:12 -05:00 |
|
Andy Bauer
|
873bb9902b
|
recalculating zmswap at this point is unnesessary
|
2016-11-19 08:53:17 -06:00 |
|
Andy Bauer
|
3afa8937d8
|
calculate string lengths and array ndx's properly
|
2016-11-19 08:52:22 -06:00 |
Isaac Connor
|
2bd080a6a6
|
Merge branch 'master' into storageareas
|
2016-11-15 08:41:00 -05:00 |
|
Andy Bauer
|
d3a7fca079
|
only unlink if zmc is being destroyed
|
2016-11-14 19:01:00 -06:00 |
|
Andy Bauer
|
6c7d71361a
|
unlink the mmap file when the monitor object is destroyed
|
2016-11-13 16:40:54 -06:00 |
|
Isaac Connor
|
11b160b7d1
|
document code blocks
|
2016-11-03 16:44:03 -04:00 |
|
Isaac Connor
|
dbd7d7d095
|
fix crash when not compiled with sws_resample
|
2016-11-03 16:43:48 -04:00 |
|
Isaac Connor
|
a2f782d61a
|
Merge branch 'master' into feature-h264-videostorage
|
2016-11-03 16:26:18 -04:00 |
|
Isaac Connor
|
6a16db0361
|
get rid of extra line feed
|
2016-10-26 14:45:13 -04:00 |
|
Isaac Connor
|
420d141bc7
|
split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable
|
2016-10-18 09:50:01 -04:00 |
|
Isaac Connor
|
5b8b9c5345
|
merge update
|
2016-10-12 09:24:10 -04:00 |
|
Isaac Connor
|
9656a7c3e8
|
Store Oriention on event creation
|
2016-10-12 09:12:09 -04:00 |
|
Isaac Connor
|
2b37999cd5
|
Merge branch 'fix_zm_image_memleak' into storageareas
|
2016-10-07 11:39:03 -04:00 |
|
Isaac Connor
|
006fcad10a
|
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
|
2016-10-07 11:35:14 -04:00 |
|
Isaac Connor
|
37a4c67ae6
|
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
|
2016-10-07 11:33:25 -04:00 |
|
Isaac Connor
|
a7979eb63b
|
Merge branch 'master' into feature-h264-videostorage
|
2016-10-03 13:21:50 -04:00 |
|
Isaac Connor
|
056e560b70
|
Merge ../ZoneMinder.master into storageareas
|
2016-10-02 12:25:51 -04:00 |
|
Isaac Connor
|
0df70a7e0f
|
if out the new code that frees structure on Image destroy. It creates a memleak
|
2016-10-02 12:24:33 -04:00 |
|
Isaac Connor
|
4fc64e4874
|
fix crash when not compiled with libswresample
|
2016-10-02 12:24:19 -04:00 |
|
Isaac Connor
|
f5914939df
|
Revert "if out the new code that frees structure on Image destroy. It creates a memleak"
This reverts commit bb174ba49d.
|
2016-10-02 12:21:56 -04:00 |
|
Isaac Connor
|
bb174ba49d
|
if out the new code that frees structure on Image destroy. It creates a memleak
|
2016-10-02 12:20:39 -04:00 |
|
Isaac Connor
|
fb4a2babc7
|
better debug message
|
2016-09-30 09:37:41 -04:00 |
|
Isaac Connor
|
cf9fa78ca3
|
work on fixing event view
|
2016-09-29 09:28:48 -04:00 |
|
Isaac Connor
|
48d9f31fa9
|
add more debug
|
2016-09-28 09:08:00 -04:00 |
|
Isaac Connor
|
00ef0f4d78
|
alter code to use libv4l2
|
2016-09-28 08:43:41 -04:00 |
|
Isaac Connor
|
187e952ffc
|
append PATH_WEB for relative dir_events when instsantiating default Storage Object
|
2016-09-28 07:10:20 -04:00 |
|
Isaac Connor
|
89d4b9fec5
|
ifdef the libswresample lib stuff
|
2016-09-27 13:34:10 -04:00 |
|
Isaac Connor
|
13e8979a98
|
refactor some redundant code
|
2016-09-27 09:47:19 -04:00 |
|
Isaac Connor
|
f00b5d26b1
|
only start videostore on keyframe so as not to record non-keyframes
|
2016-09-26 20:43:08 -04:00 |
|
Isaac Connor
|
079aa827c5
|
whitespace
|
2016-09-26 20:08:45 -04:00 |
|
Isaac Connor
|
30acfcc2fd
|
do the videostore test in the constructor
|
2016-09-26 20:08:20 -04:00 |
|
Isaac Connor
|
85dd5ea00c
|
do the videostore test in the constructor
|
2016-09-26 20:08:09 -04:00 |
|
Isaac Connor
|
1bd652ce4b
|
just more messing around trying to get audio transcoding to work
|
2016-09-26 17:04:04 -04:00 |
|
Isaac Connor
|
06da04c5d7
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-26 11:01:52 -04:00 |
|
Isaac Connor
|
bd22d72e18
|
cleanups, code style, free resample_context
|
2016-09-26 11:01:47 -04:00 |
|
Steve Gilvarry
|
c81f48716a
|
Was audio stream calls in middle of video packet write correct, was seg faulting
|
2016-09-27 00:42:40 +10:00 |
|
Steve Gilvarry
|
6be3938ae1
|
Ignore bad decodes
|
2016-09-26 22:36:53 +10:00 |
|
Steve Gilvarry
|
ab5dff1650
|
Match spacing, nope cannot be perfect
|
2016-09-26 21:43:08 +10:00 |
|
Steve Gilvarry
|
664bfded6f
|
Match spacing
|
2016-09-26 21:38:39 +10:00 |
|
Steve Gilvarry
|
2eba0b4c45
|
Swap event and web path around the right way
|
2016-09-26 21:22:58 +10:00 |
|
Isaac Connor
|
8f6007bb49
|
fixes
|
2016-09-25 11:26:48 -04:00 |
|
Isaac Connor
|
aaab089b72
|
make storagea->Path absolute by appending PATH_WEB
|
2016-09-25 09:31:20 -04:00 |
|
Isaac Connor
|
8e6136c821
|
reset start pts and dts when values are out of sync
|
2016-09-23 18:06:40 -04:00 |
|
Isaac Connor
|
0d418882e7
|
sorta works
|
2016-09-23 15:39:52 -04:00 |
|
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 |