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