Commit Graph

88 Commits

Author SHA1 Message Date
Isaac Connor 22df150cb2 Merge branch 'storageareas' into zma_to_thread
Conflicts:
	src/zm_ffmpeg_camera.cpp
	src/zm_packetqueue.cpp
2018-01-17 13:59:34 -05:00
Isaac Connor 687d797303 Only log debug message about excluding audio if there is an audio stream 2018-01-17 09:53:03 -05:00
Isaac Connor 7f4deef4a9 Move debug comment about opening audio codec into the part where the audio codec is opened 2018-01-17 09:21:17 -05:00
Isaac Connor 0ea6fd9807 Merge branch 'storageareas' into zma_to_thread 2017-12-19 14:06:58 -05:00
Isaac Connor bcdadc67bf Merge branch 'storageareas' into zma_to_thread 2017-12-12 15:29:19 -05:00
Isaac Connor a9bbe3e85c remove debug lines 2017-12-12 12:36:35 -05:00
Isaac Connor bc525a4e01 blah 2017-12-02 13:55:26 -05:00
Isaac Connor 556c4d8851 debug 2017-11-30 16:10:30 -05:00
Isaac Connor c52d7c60eb finish deprecating zma 2017-11-30 15:19:31 -05:00
Isaac Connor f2efc80f22 works? 2017-11-30 14:37:36 -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 24a0d717c5 wip 2017-11-21 19:55:40 -05:00
Isaac Connor 7ed495c948 wip 2017-11-21 11:58:15 -05:00
Isaac Connor 74650ebc70 simplify Analysis 2017-11-20 11:48:56 -05:00
Isaac Connor 6702b10dee remove redundant code and memory leaks 2017-11-17 15:37:26 -05:00
Isaac Connor ef5e296144 some fixes 2017-11-17 14:30:38 -05:00
Isaac Connor 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor 3129afa5d6 fixup decoding when recording from a non-ffmpeg suorce 2017-11-14 13:16:07 -08:00
Isaac Connor 0e7f475ce8 merge work from zma_to_thread, but not the zma_to_thread part 2017-11-12 11:42:34 -05:00
APHW2 MFGENG e17bcb9178 updates for mast ffmpeg 2017-11-07 18:21:51 -08:00
Isaac Connor 0a3327e2d2 move test for h264 into the code that opens the stream instead of comparing on every capture 2017-11-05 09:59:27 -05:00
Isaac Connor cab8c4cd5e cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style 2017-11-03 13:49:42 -04:00
Isaac Connor a8b679e479 set frameCount for audio packets too so that a long period of just audio will return and update lastframesent etc. 2017-11-02 11:45:33 -04:00
Isaac Connor ef0379dd18 wip 2017-10-27 20:36:49 -07:00
Isaac Connor 0265a48a30 fix seg fault, fix pkt pts dts/duration. Stil wrong framerate 2017-10-26 10:12:56 -07:00
Isaac Connor b58c9d87c3 wip 2017-10-23 09:51:41 -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 a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -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 e98ea0b891 fix non hwaccel build 2017-08-22 10:47:37 -04:00
Isaac Connor a63d0878b6 remove more hwaccel code 2017-08-16 13:41:44 -04:00
Isaac Connor da5438a6ff detect hardware accel capabilities 2017-08-16 12:16:15 -04:00
Isaac Connor 9e2aa941fc rough in vaapi and qsv decoders. More debugging 2017-08-16 11:31:47 -04:00
Isaac Connor ad0644b906 Merge branch 'storageareas' into vaapi 2017-08-15 16:05:25 -04:00
Isaac Connor 591fdfe68c fix 2017-08-15 13:44:23 -04:00
Isaac Connor adab628af9 fix video speed, various other 2017-08-14 18:22:52 -04:00
Isaac Connor b255414bbb Merge branch 'storageareas' into remove_ffmpeg_thread 2017-08-14 11:15:25 -04:00
Isaac Connor 0f0ab6170b Don't decode video until we have received a keyframe. 2017-08-14 11:15:09 -04:00
Isaac Connor daee5b4450 experiment with no ffmpeg thread 2017-08-11 12:03:37 -04:00
Isaac Connor 536ccc0cec maybe fix memleak, maybe fix crash 2017-08-10 15:44:20 -04:00
Isaac Connor cc28af8ed2 rework things to always start the recording on a video keyframe. Also fix pts/dts of remaining audio frames 2017-08-09 12:50:46 -04:00
Isaac Connor 00533fc624 potentially fix memleaks 2017-08-03 12:41:26 -04:00
Isaac Connor 4f032c8e65 rough in vaapi 2017-08-02 16:15:11 -04:00
Isaac Connor 259b7f7655 fix memleak 2017-07-31 15:49:27 -04:00
Isaac Connor e92974c5d4 fix spacing 2017-07-13 09:41:46 -04:00
Isaac Connor 119f8fc86c Fix version checks to fix build on yaketty 2017-06-15 13:02:54 -04:00
Isaac Connor dd70eb3e5f more deprecation fixes 2017-06-13 17:06:50 -04:00
Isaac Connor 0ac26277e3 debug, fix deprecations, fix audio 2017-06-02 16:52:52 -04:00
Isaac Connor 915450de13 spacing and comments 2017-06-01 17:48:52 -04:00