4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
2e7fad68d1
Properly compute video buffer length when analysis fps is set
...
Currently the number of video frames kept in the buffer is set as the
pre_event_count. This falls short when the capture fps is larger
than the analysis fps. Fix by computing the retained video duration
as pre_event_count/analysis_fps
No change if analysis fps is not set.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -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
56d41e8f50
drop lock_packet
2019-02-26 09:45:51 -05:00
448294f593
wip
2019-02-25 10:21:43 -05:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
45a1a1b1e8
Make packetqueue keep track of audio vs video packet counts.
2018-10-15 10:51:56 -04:00
533b370a81
add a mutex to the packetqueue
2017-12-08 10:39:57 -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
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
575b3138de
change it from a queue to a list. Implement a clearQueue that keeps some frames, and a function clear out unwanted frames
2017-04-12 13:39:47 -04:00
f19b3d5505
create zm_packet
2017-02-18 15:22:56 -05:00
19a60b01da
maybe fixes, maybe big memleaks
2016-09-20 16:59:43 -04:00
61df6e9d75
Work on aac encoding
2016-09-16 15:54:13 -04:00
caaaffbb5d
change sematics of pop to return the packet* instead of boolean. Free packets in clearQueue
2016-09-09 10:05:29 -04:00
a51944b2c5
cleanup, remove separate audio and video queues
2016-08-31 15:38:44 -04:00
0abfb7378a
Buffer work
2016-05-18 00:01:33 +10:00
1f3b3d1203
Revert "WIP packetqueue shared memory"
...
This reverts commit 8aa1cb6bf6
2016-05-08 15:25:18 +10:00
8aa1cb6bf6
WIP packetqueue shared memory
2016-05-03 20:07:45 +10:00
dcf3852124
Starting to convert to boost.interprocess
2016-04-28 01:28:37 +10:00
7fcd12fab9
Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer
2016-04-25 22:06:07 +10:00
966fbb1a10
Add Packet Queue
2016-04-04 20:04:14 +10:00
Isaac Connor
Selva Nair
Isaac Connor
APHW2 MFGENG
Isaac Connor
Steve Gilvarry