Isaac Connor
|
a9e2011727
|
Merge branch 'storageareas' into zma_to_thread
|
2019-02-13 12:24:38 -05:00 |
|
Isaac Connor
|
fc7403fe3d
|
Merge branch 'master' into storageareas
|
2019-01-13 14:53:34 -05:00 |
|
Isaac Connor
|
a5de51478e
|
The termination callback should be private
|
2019-01-08 13:12:22 -05:00 |
|
Isaac Connor
|
28dafd5931
|
Merge branch 'storageareas' into zma_to_thread
|
2018-12-26 12:02:00 -05:00 |
|
Isaac Connor
|
9cbc3352b9
|
Implement an error count. Return -1 when it gets over 100 so that the camera will be reopened.
|
2018-11-29 13:09:29 -05:00 |
|
Isaac Connor
|
45a1a1b1e8
|
Make packetqueue keep track of audio vs video packet counts.
|
2018-10-15 10:51:56 -04:00 |
|
Isaac Connor
|
89cd7ceaf8
|
Whitespace, extra parentheses, google code style
|
2018-09-23 16:47:06 -04:00 |
Isaac Connor
|
672b4affe1
|
Merge branch 'storageareas' into zma_to_thread
|
2018-08-31 19:05:22 -04:00 |
|
Isaac Connor
|
3b86d9255b
|
adjust some spacing
|
2018-08-10 11:16:27 -04:00 |
|
Isaac Connor
|
c3053a2f8a
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-10 17:51:38 -04:00 |
|
Isaac Connor
|
190ac69975
|
reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit
|
2018-05-08 12:02:08 -04:00 |
|
Isaac Connor
|
f6139d33ed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-05-05 12:25:11 -04:00 |
Isaac Connor
|
34111251d9
|
Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error.
|
2018-04-17 07:02:52 -07:00 |
|
Isaac Connor
|
cd3046abb3
|
Merge branch 'storageareas' into zma_to_thread
|
2018-04-14 11:03:08 -04:00 |
|
Isaac Connor
|
8518278476
|
coverity scan fixes/cleanups
|
2018-04-12 11:29:35 -04: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
|
748f78d7a6
|
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:17:22 -05:00 |
|
Isaac Connor
|
bc525a4e01
|
blah
|
2017-12-02 13:55:26 -05:00 |
|
Isaac Connor
|
7ed495c948
|
wip
|
2017-11-21 11:58:15 -05:00 |
|
Isaac Connor
|
64816aa005
|
fixes from cppcheck.
|
2017-11-18 16:00:10 -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 |
|
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
|
a63d0878b6
|
remove more hwaccel code
|
2017-08-16 13:41:44 -04:00 |
|
Isaac Connor
|
9e2aa941fc
|
rough in vaapi and qsv decoders. More debugging
|
2017-08-16 11:31:47 -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
|
d2fb4a7874
|
braces, spacing cleanup. Remove unused variable wasRecording
|
2017-04-19 10:34:17 -04:00 |
|
Isaac Connor
|
59c85c1fbb
|
change bool recording to a timeval.
|
2017-04-12 13:38:39 -04:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
Isaac Connor
|
0d418882e7
|
sorta works
|
2016-09-23 15:39:52 -04:00 |
|
Isaac Connor
|
a5b7b6e74f
|
move the input packet into a member of the camera. Fix packet copying in packetqueue. Implement separate start pts and dts for audio and video
|
2016-09-22 10:43:20 -04:00 |
Steve Gilvarry
|
34a85ba3f1
|
Moron forgot a file
|
2016-09-08 23:39:04 +10:00 |
|
Isaac Connor
|
d5f60ad3f8
|
merge pertinent restructuring and packet queue worko
|
2016-08-31 16:58:59 -04:00 |
|
Steve Gilvarry
|
d1bcb14629
|
Right direction
|
2016-09-01 00:00:10 +10:00 |
|
Steve Gilvarry
|
0abfb7378a
|
Buffer work
|
2016-05-18 00:01:33 +10:00 |
|
Steve Gilvarry
|
02013cef94
|
Merge remote-tracking branch 'upstream/feature-h264-videostorage' into packetqueue
|
2016-05-03 21:15:46 +10:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
03b1ced568
|
tabs to spaces and use 2space indenting
|
2016-04-04 10:11:48 -04:00 |
|
SteveGilvarry
|
966fbb1a10
|
Add Packet Queue
|
2016-04-04 20:04:14 +10:00 |
Heng Liu
|
4e263f5913
|
Merge branch 'master' into feature-h264-videostorage
Conflicts:
src/zm_ffmpeg.h
|
2015-11-04 14:39:52 -08:00 |
SteveGilvarry
|
bc5ef6c599
|
Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
|
2015-11-04 12:46:26 +11:00 |
Dmitry Smirnov
|
0ff7a4e616
|
Replace deprecated FFmpeg API
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
|
2015-11-03 11:58:23 +11:00 |
|
SteveGilvarry
|
cc85424999
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
src/zm_ffmpeg_camera.cpp
|
2014-12-02 20:18:24 +11:00 |
|
SteveGilvarry
|
0e4156c095
|
Add CaptureAndRecord to vlc, still need to make it record
|
2014-10-23 19:56:35 +11:00 |