Isaac Connor
|
83785ac73f
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-22 09:41:50 -05:00 |
Isaac Connor
|
9caa71233a
|
catch another EOF case
|
2018-02-17 11:07:06 -05:00 |
|
Isaac Connor
|
7702e09ec2
|
merge fixes
|
2018-02-16 16:05:30 -05:00 |
|
Isaac Connor
|
b5e0745ac7
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-14 13:56:03 -05:00 |
|
Isaac Connor
|
744d776d9f
|
return when ReopenFfmpeg fails
|
2018-02-13 10:11:39 -05:00 |
|
Isaac Connor
|
162a08e81d
|
return when ReopenFfmpeg fails
|
2018-02-13 10:11:05 -05:00 |
|
Isaac Connor
|
d8e4b0abfb
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
scripts/zmwatch.pl.in
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
src/zmc.cpp
|
2018-02-06 10:34:17 -05:00 |
|
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
|
Isaac Connor
|
a1392bf613
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_mpeg.cpp
src/zmc.cpp
|
2018-02-02 14:23:26 -05:00 |
|
Isaac Connor
|
31ad807a90
|
If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors
|
2018-01-31 14:34:39 -05:00 |
|
Isaac Connor
|
67b365948e
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
|
2018-01-29 15:53:26 -05:00 |
|
Isaac Connor
|
16c24240f7
|
clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error
|
2018-01-28 15:14:38 -05:00 |
|
Isaac Connor
|
50fc4a2d94
|
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
|
2018-01-24 11:51:11 -05:00 |
Isaac
|
4127aa50f3
|
simplify logic, improve debugging
|
2018-01-22 03:26:25 +01:00 |
|
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 |