d26286a170
fix test for hwtransfer needed
2019-06-27 03:40:18 -04:00
2a65b339c1
init hw_pix_fmt in constructor
2019-06-25 22:19:09 -04:00
7389bbcb25
better debug in selecting hw_format, add CUDA, add setting device for hwaccel
2019-06-25 21:47:19 -04:00
a44631a59d
rough in support for ffmpeg 3.4
2019-06-25 16:35:07 -04:00
5ab4414b11
Only include hwaccel support if LIBAVUTIL_HWCONTEXT_H is deifned
2019-06-25 15:58:55 -04:00
679b6b1b2d
remove old qsv code
2019-06-25 15:47:23 -04:00
cf7f3e8a88
add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency
2019-06-25 15:33:54 -04:00
2cbcaeebbc
clean out old hwdecode stuff. refactor common code out
2019-06-25 14:11:59 -04:00
246b4cb9d1
working hwdecode
2019-06-24 17:22:59 -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
30a210f68f
also need to adjust dts of last packet when switching events
2019-06-12 10:05:08 -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
7671f59d2f
Add error counting on decoding
2019-04-09 12:27:40 -04:00
accaeadb18
code cleanup. dump_codecs
2019-04-08 13:51:41 -04:00
9faaba9300
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-05 15:18:39 -04:00
9ae6acf532
Fix for opening audio_in_codec
2019-04-04 17:20:21 -04:00
d97dd6cdd9
Should close videostore before closing input codecs/streams.
2019-04-04 14:11:56 -04:00
bd412fa9ca
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-04-02 14:25:50 -04:00
036560e3e9
Allow packets with pts=AV_NOPTS_VALUE
2019-04-02 14:23:49 -04:00
a6998cbc9e
Use FFMPEGDeInit instead of avformat_network_deinit
2019-04-01 13:39:11 -04:00
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
9996b3e718
Merge branch 'master' into break_videostorage
2019-02-17 12:10:32 -05:00
a39b92154c
wip
2019-01-17 08:49:48 -05:00
87d1390fed
Merge branch 'storageareas' into h265
2019-01-16 15:20:17 -05:00
8c53f778b6
Start and stop events not just on keyframe. This means we must always queue packets
2019-01-15 11:32:44 -05:00
84c812725e
spacing, improve debug. WHen looking for starting keyframe in packetqueue, use <= instead of <.
2019-01-14 14:00:45 -05:00
c4c6d5b642
switch to swr_convert_frame as a test
2019-01-05 10:15:22 -05:00
3d9c8814f9
increase error_count logging
2018-12-27 13:52:41 -05:00
23124d634c
improve ImageBufferCount too small message
2018-12-03 11:02:45 -05:00
9cbc3352b9
Implement an error count. Return -1 when it gets over 100 so that the camera will be reopened.
2018-11-29 13:09:29 -05:00
a8329465fb
Merge branch 'master' into h265
2018-10-22 10:30:01 -04:00
17726bbe38
Actually say how big the ImageBufferCOunt should be
2018-10-17 17:19:27 -04:00
5fce783b65
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 11:34:05 -04:00
990c4b1b45
Add a warning when there are more videoframes in the packetqueue than image_buffers
2018-10-15 11:33:58 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
45a1a1b1e8
Make packetqueue keep track of audio vs video packet counts.
2018-10-15 10:51:56 -04:00
e8316a0aea
Add detection of packets with massively negative pts. Just skip them
2018-09-28 14:19:36 -04:00
7768b4eeef
Don't need to delete videoStore in destructor, as it gets done in CLose()
2018-09-28 11:37:16 -04:00
1419f20dcc
add setting rtsp_transport to udp. It is the default but we print out an error otherwise
2018-09-26 15:33:29 -04:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
0bb672b86b
dick around reverting ffmpeg 3.4 deprecations to try to get fps correct
2018-09-10 17:10:39 -04:00
974e42a610
spacing
2018-07-09 13:07:49 -04:00
190ac69975
reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit
2018-05-08 12:02:08 -04:00
ced208457d
spacing, google code style
2018-05-07 10:13:36 -07:00
469a7347e8
include zm_terminate to make Capture break out of process is TERM'd
2018-04-30 15:09:00 -04:00
20f6985dff
implement capturing bandwidth
2018-04-24 14:11:27 -04:00
4d95498664
Prevent double init of Ffmpeg by using FFMPEGInit()
2018-04-24 11:41:31 -04:00
bd69f6a2ca
close the videoStore when closing FFmpegCamera
2018-04-18 15:30:42 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor