Commit Graph

72 Commits

Author SHA1 Message Date
Isaac Connor f726666f54 Merge branch 'master' into h265 2019-01-14 12:36:11 -05:00
Isaac Connor 55e0d82f20 spacing 2018-12-24 11:30:22 -05:00
Andrew Bauer 6eb7892fc7
Merge pull request #2357 from connortechnology/libswresample
Implement libswresample support as an alternative to libavresample, w…
2018-12-20 16:44:06 -06:00
Isaac Connor 48865f124b cap AAC bitrate at 96000 to prevent the aac encoder from complaining 2018-12-20 15:10:04 -05:00
Isaac Connor 6ee72aa2d9 Implement libswresample support as an alternative to libavresample, which is deprecated 2018-12-20 14:06:56 -05:00
Isaac Connor bc5f8d0d8d rework pts/dts of audio stream. Spacing. Fix crash 2018-12-04 18:23:08 -05:00
Isaac Connor d837b42836 fix ffmpeg warnings. We have to copy parameters from the context to the stream AFTER we open the codec 2018-12-03 10:33:53 -05:00
Isaac Connor b291c06035 Working zms h265 playing. 2018-11-19 16:45:56 -05:00
Isaac Connor e24a308481 Merge branch 'master' into h265 2018-11-14 17:15:37 -05:00
Isaac Connor bca2b30518 Add a test for channel layout and correct it if not set 2018-10-24 13:45:33 -04:00
Isaac Connor a8329465fb Merge branch 'master' into h265 2018-10-22 10:30:01 -04:00
Isaac Connor 51f0e7e5c8 Add a default timebase if the codec timebase is invalid. Also fix crash when we can't open the .mp4 2018-09-26 15:34:01 -04:00
Isaac Connor 45056c3602 fix deprecation warning 2018-09-23 16:51:54 -04:00
Isaac Connor 0ec391354c Merge branch 'fix_zms_from_mp4' into h265 2018-09-13 16:18:28 -04:00
Isaac Connor bf1fbd169c return uninformative debug statement 2018-09-10 15:12:19 -04:00
Isaac Connor 5eec7e00c5 Merge branch 'master' into storageareas 2018-09-09 14:09:52 -04:00
Isaac Connor a296b2b777 fix crash when savind audio on ffmpeg 2.8 2018-09-09 14:01:03 -04:00
Isaac Connor e4c87ce256 Merge branch 'master' into storageareas 2018-09-09 11:36:52 -04:00
Isaac Connor d945e2ba54 Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork. 2018-09-09 11:34:12 -04:00
Isaac Connor 84db1be31d add version test to get rid of deprecation warning for refcounted_frames 2018-05-26 13:01:51 -04:00
Isaac Connor cae2c9e237 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-30 15:11:32 -04:00
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Isaac Connor 371f5dbc00 a zero duration will lead to a non-monotonic non-incrementing pts, so we have to use 1 instead. 2018-04-25 09:37:04 -04:00
Isaac Connor f04bccceb2 handle out of order pts better 2018-04-25 04:59:08 -04:00
Andy Bauer 678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac Connor 9af6dc02bc better debug of packet pts/dts/duration 2018-03-01 19:22:47 -08:00
Isaac Connor 6942aaed15 whitespace 2018-01-31 14:36:01 -05:00
Isaac 66fd02a29e Use dumpPacket 2018-01-23 18:15:29 +01:00
Isaac 414930cb90 simplify logic, improve debugging 2018-01-22 03:26:33 +01:00
Isaac Connor 2ec25a20ec Don't crash if we fail to open the video output stream 2018-01-04 10:07:51 -05:00
Isaac Connor 40e4d909c3 turn Fatal into Error 2017-12-12 12:41:11 -05:00
Isaac Connor 31189bdb11 make an error not fatal and check return to quiet coverity 2017-12-12 12:38:30 -05:00
Isaac Connor d73f9e8a73 wip, crashes 2017-11-28 11:11:41 -05:00
Isaac Connor 1e50df741f fix some memleaks 2017-11-28 09:50:09 -05:00
Isaac Connor 03c9f88d55 fix build on trusty 2017-11-27 08:24:14 -05:00
Isaac Connor 7c491bf62e make compile on trusty 2017-11-26 18:06:12 -05:00
APHW2 MFGENG e17bcb9178 updates for mast ffmpeg 2017-11-07 18:21:51 -08:00
Isaac Connor fdbd344d74 whitespace 2017-11-03 09:23:08 -04:00
Isaac Connor 8c1cfb28a5 use c-style casts because they work 2017-09-26 16:13:26 -04:00
Isaac Connor 94fd113b63 use c-style casts because they work 2017-09-26 16:12:20 -04:00
Isaac Connor e277456682 put parenthesis back in 2017-09-26 09:15:54 -04:00
Isaac Connor 1791d3d5b7 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-09-25 16:23:33 -04:00
Isaac Connor 74bb2da668 remove extra parenthesis 2017-09-25 16:23:15 -04:00
Isaac Connor 2a39cf2bcd split videostore opening out of the constructor so that we can test for failure 2017-09-25 15:28:14 -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 732ebf6df4 shorted some variable names and correct spacing 2017-08-23 10:37:32 -04:00
Isaac Connor eb5cee7f3e use ifdef around uses of AV_CODEC_ID_H265 and fix google code style 2017-08-23 10:14:06 -04:00
Isaac Connor cf8560b648 fix duration if it's negative 2017-08-21 10:15:56 -04:00