0ab4f9fce0
More debugging in packetqueue.
2019-06-27 21:49:43 -04:00
ac7d4869de
We need to seek back pre_event_count video frames, not any frames
2019-06-27 15:36:13 -04:00
dd57fd95ce
Clean up cruft from videostore api. Fix packetqueue clear_unwanted_packets to take a pre_event_count and take it into consideration when finding the right spot in the queue to start recording.
2019-06-27 11:11:14 -04:00
dab9544845
Revert audio sync fixes ( #2646 )
...
* Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it
* Spacing, google code style and tabs to spaces
* Revert the work I did to srt packets by dts after changing their time_base. It doesn't work. Instead since dts doesn't actually matter to playback, only ffmpeg storing, munge it to whatever is neccessary to make ffmpeg happy.
2019-06-24 11:27:47 -04:00
470da03322
Merge sync fixes from storageareas
2019-06-20 15:14:20 -04:00
acb95709e6
Fix issues with too much audio in events by storing packets in the queue with their timestamps converted to AV_TIME_BASE_Q, so that we can sort video and audio packets together.
2019-06-11 10:19:42 -04:00
c44967f770
fix push to push_front
2019-05-27 12:47:38 -04:00
663f941963
If we can't find a packet before ours in the queue, then stick it at the front of the queue, not the end.
2019-05-27 12:31:18 -04:00
c91da4a7f5
if no packet found, still append to end
2019-05-03 14:58:29 -04:00
aec8311deb
implement sorting incoming packets in the packetqueue
2019-05-03 13:48:05 -04:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
240abd824b
Don't use image_index anymore
2019-02-26 09:45:40 -05:00
448294f593
wip
2019-02-25 10:21:43 -05:00
7d6286d517
Merge branch 'storageareas' into zma_to_thread
2019-02-18 16:23:17 -05:00
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
84c812725e
spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <.
2019-01-14 14:00:45 -05:00
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
33c903a644
properly initialize packet_counts
2018-10-15 11:13:10 -04:00
45a1a1b1e8
Make packetqueue keep track of audio vs video packet counts.
2018-10-15 10:51:56 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
cd6dd28280
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-17 16:15:30 -04:00
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
59b0160144
use ++it instead of it++
2018-08-13 10:01:16 -04:00
0428d8687d
put the ++ in front instead
2018-04-14 17:04:00 -04:00
8518278476
coverity scan fixes/cleanups
2018-04-12 11:29:35 -04:00
a419906361
Merge branch 'storageareas' into zma_to_thread
2018-03-09 09:03:19 -05:00
10a30452fb
fix logic when clearing queue, we were deleting packets endlessly.
2018-02-15 14:08:21 -05:00
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
bfa0a00e67
dfebug improvements
2018-01-22 03:27:44 +01:00
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
360a10276f
Fix. We were deleting the keyframe that we wanted to keep.
2018-01-17 10:01:48 -05:00
c3ab7d5269
Merge branch 'storageareas' into zma_to_thread
...
Conflicts:
src/zm_packetqueue.cpp
src/zma.cpp
2018-01-10 14:24:46 -05:00
727bde752f
Count non-i frames in frames_to_keep. Should reduce the size of the packetqueue
2018-01-07 13:39:13 -05:00
aff08358f4
more debug
2017-12-08 13:46:02 -05:00
135d3803fb
make sure that we don't queue a packet twice
2017-12-08 10:39:24 -05:00
0cfc42b9fd
some cleanups/fixes
2017-12-05 13:16:52 -08:00
0865201e1e
seems to work
2017-12-01 07:26:34 -05:00
f2efc80f22
works?
2017-11-30 14:37:36 -05:00
d1886b5536
wip
2017-11-27 14:57:24 -05:00
99968dfa2a
Merge branch 'storageareas' into zma_to_thread
2017-11-27 11:28:36 -05:00
8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
24a0d717c5
wip
2017-11-21 19:55:40 -05:00
7ed495c948
wip
2017-11-21 11:58:15 -05:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
259b7f7655
fix memleak
2017-07-31 15:49:27 -04:00
98b3621681
add Debug, and fix logic deleting frames before the appropriate keyframe
2017-05-31 20:44:43 -04:00
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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac
APHW2 MFGENG