e226618300
better debug of video/audio frames
2021-01-26 12:21:51 -05:00
8d52baeee2
Merge branch 'master' into rtsp_server
...
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1. 0 means no error but also no success.
Debugging and braces improvements in local_camera.
2020-12-17 10:16:54 -05:00
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
268e364cfd
handle the paused case
2020-10-09 10:21:00 -04:00
1aadeb2206
free the context as well.
2020-10-08 16:46:03 -04:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
4126f96b40
clean up sendFrame a bit introducing send_file and send_buffer utility functions
2020-09-07 11:19:47 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
434f34f027
use delete[] instead of delete.
2020-04-30 11:04:55 -04:00
ae9a5766f5
Merge branch 'release-1.34' into fix_zms
2020-04-26 18:19:30 -04:00
1c197db619
Merge branch 'master' into rate_dropdown
2020-01-07 14:49:58 -05:00
16a73d6d5a
don't seek back when not neccesary
2019-12-13 18:12:33 -05:00
5fcd6361bc
fix segfault reading frames for .mp4 in zms
2019-12-13 17:47:18 -05:00
3b9b49c44d
wip work on fixing zms mp4 to mjpeg
2019-12-02 15:51:03 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
701aa8d924
add flushing the resample buffer to get the remaining samples encoded
2019-09-13 10:55:30 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
05be9008c7
use FFMPEGInit to initialise ffmpeg instead of doing it ourselves
2019-07-11 17:57:11 -04:00
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
2cbcaeebbc
clean out old hwdecode stuff. refactor common code out
2019-06-25 14:11:59 -04:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
a30c4d9551
rework ffmpeg_input to not use pkt_duration which doesn't exist in avconv
2019-03-21 10:41:59 -04:00
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
b16cd7ec84
Merge branch 'h265' into zma_to_thread
2018-11-20 12:38:17 -05:00
b291c06035
Working zms h265 playing.
2018-11-19 16:45:56 -05:00
0ec391354c
Merge branch 'fix_zms_from_mp4' into h265
2018-09-13 16:18:28 -04:00
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
c7deb91319
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2018-04-14 14:58:25 -04:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
646f0dd65e
fix merge
2018-03-03 13:31:55 -08:00
03d3f5e665
Merge branch 'storageareas' into zma_to_thread
2018-03-03 13:28:01 -08:00
d980def64f
spacing, increase debug
2018-03-02 18:26:07 -08:00
43b71fc49b
rework
2017-11-20 15:32:40 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
64816aa005
fixes from cppcheck.
2017-11-18 16:00:10 -05:00
3be40bcc99
blah
2017-10-25 13:25:44 -07:00
98590b99f8
Merge branch 'storageareas' into work_on_zms
2017-09-04 14:35:02 -04:00
2a4f751a4f
ffmpeg versionc heck
2017-08-24 12:00:48 -04:00
789de37d33
fix builds on older ffmpeg
2017-08-24 09:53:40 -04:00
a81ff85fbb
add ffmpeg decoding of a .mp4 to get the frames
2017-08-23 15:05:44 -04:00
9fa48954db
more work
2017-07-18 22:30:22 -04:00
62d6394923
finish roughing in ffmpeg_input
2017-06-26 16:55:49 -04:00
b73c0ba978
rough in zm_ffmpeg_input and split out eventstream
2017-06-22 17:58:32 -04:00
Isaac Connor
Isaac Connor
Peter Keresztes Schmidt
Isaac Connor
Isaac Connor