Commit Graph

2927 Commits

Author SHA1 Message Date
Isaac Connor
09533c19af Fix %d to %s 2019-09-20 08:19:44 -04:00
Isaac Connor
17e00cec94 Fix setting rtsp_transport when rtsp 2019-09-17 14:58:16 -04:00
Isaac Connor
e8e29d62b2 Use dts instead of pts for first values 2019-09-17 12:53:29 -04:00
Isaac Connor
0d347f0cf5 init log early so that we create zmc_m.log instead of undef.log 2019-09-17 11:37:48 -04:00
Isaac Connor
6041616efc add string_toupper function 2019-09-17 11:37:20 -04:00
Isaac Connor
33aa6abf59 Only open log file if we are going to write to it. 2019-09-17 11:36:57 -04:00
Isaac Connor
ecde0a7ae0 Add a string_toupper function 2019-09-17 11:11:22 -04:00
Isaac Connor
1a94479751 Cleanup/rework. Handle database connection failure. This can happen if we init logging before config reading. Default terminal log level to warning. Cleanup logInit copying the options in order to populate mLogPath from config. We can handle this in the constructor now. 2019-09-17 11:10:59 -04:00
Isaac Connor
9a3765f6aa spacing and google code style 2019-09-17 10:31:48 -04:00
Isaac Connor
4509c6a239 Don't set rtsp options unless we are using rtsp. Should prevent everyone from reporting the warning about unsupported options. Note that I removed some extra includs that have no business in zm_ffmpeg_camera. 2019-09-17 10:31:31 -04:00
Isaac Connor
c8934dac7f Remove useless debug 2019-09-17 10:30:00 -04:00
Isaac Connor
cbf9931371 Don't log about calling dbConnect when already connected. We make this call in zm_logger, it is just going to have to be acceptable to call it multiple times. 2019-09-17 10:29:30 -04:00
Isaac Connor
54c14b17d7 Spacing and google code style 2019-09-17 10:28:42 -04:00
Isaac Connor
6925a75831 codec not ready is not an error. Make it a debug 2019-09-15 18:01:38 -04:00
Isaac Connor
0a31a8dab6 Just use pts instead of tracking both first pts and first dts. Should prevent conflicts 2019-09-15 17:53:25 -04:00
Isaac Connor
675cbe8854 code style, add bytes per second read statistic and a code comment about the sleeping 2019-09-14 10:48:39 -04:00
Isaac Connor
306bda86c2 fix sws_get_delay 2019-09-13 21:28:43 -04:00
Isaac Connor
eafa0da06f fixes, handle when audio codec isn't open in ffmpeg_camera 2019-09-13 16:06:25 -04:00
Isaac Connor
3a5d1ff3ca Hack in missing bits for ubuntu trusty/libav/avresample 2019-09-13 15:51:35 -04:00
Isaac Connor
5ddd20ed1a refactor code. Handle resample buffering during encoding instead of when closing file 2019-09-13 14:34:53 -04: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
788b5b480b hack to make sync work on resample 2019-09-12 17:59:08 -04:00
Isaac Connor
d9d4c6b4ca fix build 2019-09-12 17:26:19 -04:00
Isaac Connor
0a8aba2b76 rework how pts/dts is handled. We still use video_first_pts, but if the result is negative, normalize it to 0. Also now use audio_next_pts/dts to calculate pts when resampling and re-encoding. I believe this resolves the issues with wrong duration in the audio stream. 2019-09-12 16:52:59 -04:00
Isaac Connor
8fb55cdbff Add codec name to zm_dump_codec and zm_dump_codecpar add new functions zm_receive_packet 2019-09-12 16:51:33 -04:00
Isaac Connor
6c6b2d7c6f Fix build 2019-09-09 17:10:40 -04:00
Isaac Connor
097ce5e778 add const to cast 2019-09-09 17:09:01 -04:00
Isaac Connor
792af28c54 return a value from write_packet 2019-09-09 16:55:22 -04:00
Isaac Connor
d5aa95e45f cpplint fixes 2019-09-09 16:13:32 -04:00
Isaac Connor
d5d4d9d19b ret should be a heap var, not a member of the object. Somehow this also seems to fix crashing on debian buster. I assume the compiler is confused 2019-09-08 16:10:57 -04:00
Isaac Connor
8215fe1c0f Some versions off avcodec libs have pkt_pts and pkt_dts but they have been deprecated and weren't of any use anyways 2019-09-08 16:10:20 -04:00
Isaac Connor
85e0a086b3 fixes #2694 2019-09-03 11:55:37 -04:00
Isaac Connor
c80ef0e0ab spacing 2019-08-28 12:20:03 -04:00
Isaac Connor
bd3395ac98 introduce VideoStore::write_packet to refactor out duplicated code. Add the ability to receive multiple packets from audio encoder per input packet 2019-08-28 12:19:54 -04:00
Isaac Connor
efb8711c02 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-28 11:43:59 -04:00
Isaac Connor
5f0080ef92 Fix crash when using auth_relay=none 2019-08-28 10:34:30 -04:00
Isaac Connor
64d024b0c0 Fix spacing 2019-08-28 10:33:18 -04:00
Isaac Connor
505a041c88 Don't add a final db frame to the event, because there is no jpg for the frame. I don't know why this code was originally added. 2019-08-28 10:17:23 -04:00
Isaac Connor
59940ab675 report pixformat names instead of just #'s on error 2019-08-28 09:19:57 -04:00
Isaac Connor
39620c01ff Add rescaling of pkt pts/dts from audio_out_ctx to audio_out_stream 2019-08-26 16:37:32 -04:00
Isaac Connor
b26ed9bf62 Yet more debugging. Also, move pts adjustment to before audio encoding 2019-08-26 16:17:45 -04:00
Isaac Connor
2fe9442257 Fix time_base conversion when flushing audio queue. Add more debugging. COrrect pkt_Duration when resampling audio 2019-08-23 18:17:26 -04:00
Isaac Connor
886a203bf1 Support hwaccel for non-passthrough case as well 2019-08-21 10:11:58 -04:00
Isaac Connor
01e988ffba remove some redundant debugs. Improve some messages 2019-08-20 14:09:47 -04:00
Isaac Connor
4a82ce83a7 quit a bit earlier when stream is broken. 2019-08-20 11:13:38 -04:00
Isaac Connor
ed190340b9 fix typo 2019-08-19 11:12:47 -04:00
Isaac Connor
369dd03909 remove errant i 2019-08-18 21:32:19 -04:00
Isaac Connor
503cf6cd24 More backticking of SQL 2019-08-17 14:37:19 -04:00
Isaac Connor
efa264e0c7 Fix playing in reverse. Fix not sending first frame. Fix sql problem with backticks. Not being able to open a frame image is now non-fatal. 2019-08-16 10:24:51 -04:00
Isaac Connor
c7b6db9be7 Put backticks around all columns and tables in sql to deal with mysql 8 2019-08-14 16:18:21 -04:00