Isaac Connor
|
b16cd7ec84
|
Merge branch 'h265' into zma_to_thread
|
2018-11-20 12:38:17 -05:00 |
Isaac Connor
|
5ab1126260
|
Merge branch 'storageareas' into zma_to_thread
|
2018-10-20 17:31:14 -04:00 |
|
Isaac Connor
|
33c903a644
|
properly initialize packet_counts
|
2018-10-15 11:13:10 -04:00 |
|
Isaac Connor
|
45a1a1b1e8
|
Make packetqueue keep track of audio vs video packet counts.
|
2018-10-15 10:51:56 -04:00 |
|
Isaac Connor
|
0ec391354c
|
Merge branch 'fix_zms_from_mp4' into h265
|
2018-09-13 16:18:28 -04:00 |
|
Isaac Connor
|
cd6dd28280
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2018-08-17 16:15:30 -04:00 |
|
Isaac Connor
|
abb6d4f7d9
|
fixup some logic, remove redundant call to clearQueue, increase first_video_packet_index when clearing video frames from front in queuePacket
|
2018-08-17 16:06:03 -04:00 |
|
Isaac Connor
|
59b0160144
|
use ++it instead of it++
|
2018-08-13 10:01:16 -04:00 |
|
Isaac Connor
|
0428d8687d
|
put the ++ in front instead
|
2018-04-14 17:04:00 -04:00 |
|
Isaac Connor
|
8518278476
|
coverity scan fixes/cleanups
|
2018-04-12 11:29:35 -04:00 |
|
Isaac Connor
|
a419906361
|
Merge branch 'storageareas' into zma_to_thread
|
2018-03-09 09:03:19 -05:00 |
Isaac Connor
|
10a30452fb
|
fix logic when clearing queue, we were deleting packets endlessly.
|
2018-02-15 14:08:21 -05:00 |
|
Isaac Connor
|
215660a817
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
src/zm_videostore.cpp
src/zm_videostore.h
web/includes/Event.php
web/skins/classic/views/events.php
|
2018-01-24 11:06:19 -05:00 |
Isaac
|
bfa0a00e67
|
dfebug improvements
|
2018-01-22 03:27:44 +01:00 |
|
Isaac Connor
|
22df150cb2
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
|
2018-01-17 13:59:34 -05:00 |
|
Isaac Connor
|
360a10276f
|
Fix. We were deleting the keyframe that we wanted to keep.
|
2018-01-17 10:01:48 -05:00 |
|
Isaac Connor
|
c3ab7d5269
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_packetqueue.cpp
src/zma.cpp
|
2018-01-10 14:24:46 -05:00 |
|
Isaac Connor
|
727bde752f
|
Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue
|
2018-01-07 13:39:13 -05:00 |
|
Isaac Connor
|
aff08358f4
|
more debug
|
2017-12-08 13:46:02 -05:00 |
|
Isaac Connor
|
135d3803fb
|
make sure that we don't queue a packet twice
|
2017-12-08 10:39:24 -05:00 |
APHW2 MFGENG
|
0cfc42b9fd
|
some cleanups/fixes
|
2017-12-05 13:16:52 -08:00 |
|
Isaac Connor
|
0865201e1e
|
seems to work
|
2017-12-01 07:26:34 -05:00 |
|
Isaac Connor
|
f2efc80f22
|
works?
|
2017-11-30 14:37:36 -05:00 |
|
Isaac Connor
|
d1886b5536
|
wip
|
2017-11-27 14:57:24 -05:00 |
|
Isaac Connor
|
99968dfa2a
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-27 11:28:36 -05:00 |
|
Isaac Connor
|
8e494ef431
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-23 08:40:49 -05:00 |
|
Isaac Connor
|
24a0d717c5
|
wip
|
2017-11-21 19:55:40 -05:00 |
|
Isaac Connor
|
7ed495c948
|
wip
|
2017-11-21 11:58:15 -05:00 |
|
Isaac Connor
|
a81ff85fbb
|
add ffmpeg decoding of a .mp4 to get the frames
|
2017-08-23 15:05:44 -04:00 |
|
Isaac Connor
|
259b7f7655
|
fix memleak
|
2017-07-31 15:49:27 -04:00 |
|
Isaac Connor
|
98b3621681
|
add Debug, and fix logic deleting frames before the appropriate keyframe
|
2017-05-31 20:44:43 -04:00 |
|
Isaac Connor
|
b1f8485969
|
Fix videostorage (#1885)
* merge relevant c bits to make h264 recording work
* h264 code requires libavresample and boost
* Need libavresample
|
2017-05-16 12:04:56 -04:00 |