Isaac Connor
|
b3fd156c11
|
add boost to build depends
|
2016-05-25 20:01:42 -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
|
1bd652ce4b
|
just more messing around trying to get audio transcoding to work
|
2016-09-26 17:04:04 -04:00 |
|
Isaac Connor
|
bd22d72e18
|
cleanups, code style, free resample_context
|
2016-09-26 11:01:47 -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
|
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
|
19a60b01da
|
maybe fixes, maybe big memleaks
|
2016-09-20 16:59:43 -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
|
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
|
bd076fed69
|
Merge branch 'storageareas' into packetqueue
|
2016-09-16 09:56:41 -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
|
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
|
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
|
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
|
9262487a77
|
deprecate wasRecording
|
2016-09-01 10:10:16 -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 |
|
Steve Gilvarry
|
d1bcb14629
|
Right direction
|
2016-09-01 00:00:10 +10:00 |
|
Steve Gilvarry
|
44df4a830d
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 20:44:48 +10:00 |
|
Isaac Connor
|
6ac1a70b9c
|
Merge my Rotation/Orientation work and fixes for bad h264 streams
|
2016-08-10 12:22:04 -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
|
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 |
|
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
|
f68527674a
|
merge Steve's tree, which allegedly fixes the header problems
|
2016-07-13 12:38:12 -04: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
|
26369268bb
|
merge Steve's updates, work on zmaudit
|
2016-07-12 11:27:25 -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 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
6a8db582ff
|
whitespacing updates
|
2016-06-21 12:21:18 -04:00 |
|
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
|
Steve Gilvarry
|
0abfb7378a
|
Buffer work
|
2016-05-18 00:01:33 +10: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 |
|
Steve Gilvarry
|
1f3b3d1203
|
Revert "WIP packetqueue shared memory"
This reverts commit 8aa1cb6bf6.
|
2016-05-08 15:25:18 +10: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 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|