Commit Graph

21 Commits

Author SHA1 Message Date
Isaac Connor 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
Isaac Connor 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
Isaac Connor 470da03322 Merge sync fixes from storageareas 2019-06-20 15:14:20 -04:00
Isaac Connor 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
Isaac Connor c44967f770 fix push to push_front 2019-05-27 12:47:38 -04:00
Isaac Connor 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
Isaac Connor c91da4a7f5 if no packet found, still append to end 2019-05-03 14:58:29 -04:00
Isaac Connor aec8311deb implement sorting incoming packets in the packetqueue 2019-05-03 13:48:05 -04:00
Isaac Connor 87d1390fed Merge branch 'storageareas' into h265 2019-01-16 15:20:17 -05:00
Isaac Connor 84c812725e spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <. 2019-01-14 14:00:45 -05: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 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac bfa0a00e67 dfebug improvements 2018-01-22 03:27:44 +01: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 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 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