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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |