Commit Graph

27 Commits

Author SHA1 Message Date
Isaac Connor 1aadeb2206 free the context as well. 2020-10-08 16:46:03 -04:00
Isaac Connor 4126f96b40 clean up sendFrame a bit introducing send_file and send_buffer utility functions 2020-09-07 11:19:47 -04:00
Peter Keresztes Schmidt 8f980a1168 Convert NULL/0 to nullptr
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Isaac Connor 434f34f027 use delete[] instead of delete. 2020-04-30 11:04:55 -04:00
Isaac Connor ae9a5766f5 Merge branch 'release-1.34' into fix_zms 2020-04-26 18:19:30 -04:00
Isaac Connor 1c197db619 Merge branch 'master' into rate_dropdown 2020-01-07 14:49:58 -05:00
Isaac Connor 16a73d6d5a don't seek back when not neccesary 2019-12-13 18:12:33 -05:00
Isaac Connor 5fcd6361bc fix segfault reading frames for .mp4 in zms 2019-12-13 17:47:18 -05:00
Isaac Connor 3b9b49c44d wip work on fixing zms mp4 to mjpeg 2019-12-02 15:51:03 -05:00
Isaac Connor 701aa8d924 add flushing the resample buffer to get the remaining samples encoded 2019-09-13 10:55:30 -04:00
Isaac Connor 05be9008c7 use FFMPEGInit to initialise ffmpeg instead of doing it ourselves 2019-07-11 17:57:11 -04:00
Isaac Connor d0abd16494 add passing hwaccel name and device. use av_make_error_string(ret).c_str() to reduce code and increase consistency 2019-06-25 15:34:01 -04:00
Isaac Connor 2cbcaeebbc clean out old hwdecode stuff. refactor common code out 2019-06-25 14:11:59 -04:00
Isaac Connor a30c4d9551 rework ffmpeg_input to not use pkt_duration which doesn't exist in avconv 2019-03-21 10:41:59 -04:00
Isaac Connor 9b713a489d fix sleep time by using a comparison between the frame display time and the distance between now and when we started playing.
handle infinite fps
2019-03-06 14:50:36 -05:00
Isaac Connor b291c06035 Working zms h265 playing. 2018-11-19 16:45:56 -05:00
Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -04:00
Isaac Connor 0efc45fa93 implement a getFrame function that takes a timestamp and will seek to the appropriate time in the mp4 before getting a frame 2018-09-11 13:21:12 -04:00
Isaac Connor d980def64f spacing, increase debug 2018-03-02 18:26:07 -08:00
Isaac Connor 64816aa005 fixes from cppcheck. 2017-11-18 16:00:10 -05:00
Isaac Connor 98590b99f8 Merge branch 'storageareas' into work_on_zms 2017-09-04 14:35:02 -04:00
Isaac Connor 2a4f751a4f ffmpeg versionc heck 2017-08-24 12:00:48 -04:00
Isaac Connor 789de37d33 fix builds on older ffmpeg 2017-08-24 09:53:40 -04:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor 9fa48954db more work 2017-07-18 22:30:22 -04:00
Isaac Connor 62d6394923 finish roughing in ffmpeg_input 2017-06-26 16:55:49 -04:00
Isaac Connor b73c0ba978 rough in zm_ffmpeg_input and split out eventstream 2017-06-22 17:58:32 -04:00