Commit Graph

68 Commits

Author SHA1 Message Date
Isaac Connor 12631abd46 when copying a packet (for old ffmpeg) copy pts, dts and duration too 2019-04-03 16:51:27 -04:00
Isaac Connor 2e7fd7c9a2 handle really old ffmpeg not having pkt_duration 2019-04-03 14:55:29 -04:00
Isaac Connor f78e95f5d4 add is_video_context and is_audio_context and use them in zm_revceive_frame to add audio decoding support 2019-04-03 13:21:52 -04:00
Isaac Connor c9985107ee Add a deinit function to handle avformat_network_deinit 2019-04-01 13:38:13 -04:00
Isaac Connor 05976b3227 Add pts to zm_dump_frame 2019-03-20 16:06:31 -04:00
Isaac Connor 6c8eac1ac8 Merge branch 'storageareas' into h265 2019-03-06 11:10:01 -05:00
Isaac Connor 5029d7214a Merge branch 'master' into storageareas 2019-02-18 17:00:45 -05:00
Isaac Connor 9996b3e718 Merge branch 'master' into break_videostorage 2019-02-17 12:10:32 -05:00
Isaac Connor ad69915e4a fix build on libav 9, ubuntu trusty 2019-01-22 13:30:40 -05:00
Isaac Connor 87d1390fed Merge branch 'storageareas' into h265 2019-01-16 15:20:17 -05:00
Isaac Connor f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor c97eb16942 create zm_dump_frame to print out useful frame info. 2019-01-14 10:47:22 -05:00
Isaac Connor 0bfe1007c8 Merge branch 'master' into storageareas 2018-12-14 10:16:08 -05:00
Pliable Pixels ebaafef607 Ffmpeg logs optional (#2345)
* make ffmpeg logs configurable via web

* fix Info
2018-12-14 08:01:23 -05:00
Isaac Connor a1e9058729 adjust ffmpeg logging levels 2018-12-13 16:19:55 -05:00
Isaac Connor 0784a8a5a1 reduce ffmpeg log levels from error to warning and warning to info. Ffmpeg outputs a lot of errors that don't significantly affect video recording. 2018-12-13 10:27:44 -05:00
Isaac Connor 0cf56f186c add frame_size to stream dump 2018-12-03 10:32:01 -05:00
Isaac Connor 1273cb863c send logPrint a pre-formatted string 2018-11-23 13:04:46 -05:00
Isaac Connor 817a760559 send logPrint a pre-formatted string 2018-11-23 13:04:20 -05:00
Isaac Connor c89bb8bc16 Merge branch 'av_logging' into storageareas 2018-11-23 12:46:27 -05:00
Isaac Connor 61759a1f2d older libavcodecs don't have AV_LOG_TRACE AND AV_LOG_MAX_OFFSET 2018-11-23 12:45:21 -05:00
Isaac Connor b291c06035 Working zms h265 playing. 2018-11-19 16:45:56 -05:00
Isaac Connor 64ce035129 Merge branch 'av_logging' into storageareas 2018-11-14 17:03:32 -05:00
Isaac Connor 70d9fda758 Implement a logging callback for avcodec to use our logging functions 2018-11-14 17:02:52 -05:00
Isaac Connor c48ce09068 Turn back on ffmpeg debug logging 2018-10-24 13:11:09 -04:00
Isaac Connor 15f89c4b50 Turn ffmpeg logging back on 2018-10-24 12:44:14 -04:00
Isaac Connor a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Isaac Connor 49a7614504 revert change that breaks building on newer ffmpeg libs. 2018-09-26 18:35:29 -04:00
Isaac Connor 5ef64bf256 fix memleak on old libav distros 2018-09-26 16:20:29 -04:00
Isaac Connor 2385c80a4a cleanup code a bit 2018-09-26 15:32:54 -04:00
Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -04:00
Isaac Connor e98603885d Show # of frames, not the # of frames decoded already 2018-09-11 13:21:42 -04:00
Isaac Connor 0bb672b86b dick around reverting ffmpeg 3.4 deprecations to try to get fps correct 2018-09-10 17:10:39 -04:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Andy Bauer 678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor bbb10fa4b4 Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34 2018-04-24 12:40:15 -04:00
Isaac Connor 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac Connor bdb5176981 increase debug lvel of dumpPacket 2018-01-31 14:33:42 -05:00
Isaac abb2cfbe12 fix zm_av_packet_ref for old ffmpeg. Need to set the size and flags as well as copying the mem. 2018-01-23 18:14:55 +01:00
Isaac Connor 18f0610d87 Merge zm_ffmpeg.cpp from zma_to_thread 2018-01-21 17:18:29 -05:00
Isaac Connor 716a29545f fix strncpy not leaving null terminator space 2017-12-12 12:53:05 -05:00
Isaac Connor d73f9e8a73 wip, crashes 2017-11-28 11:11:41 -05:00
Isaac Connor fc27674d76 can't do init in the if statement 2017-11-26 17:50:57 -05:00
Isaac Connor 7d77cd75fe eliminate redundant code and memleak 2017-11-18 09:45:47 -05:00
Isaac Connor 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
APHW2 MFGENG e17bcb9178 updates for mast ffmpeg 2017-11-07 18:21:51 -08:00
Isaac Connor a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor b73c0ba978 rough in zm_ffmpeg_input and split out eventstream 2017-06-22 17:58:32 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor b51d885f66 fix build on old ffmpeg 2017-06-14 10:36:08 -04:00