mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-07-08 04:05:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,977 Commits 99 Branches 106 Tags
7fcd12fab90f00b406ae5c48411737b70cc9155e
Commit Graph

49 Commits

Author SHA1 Message Date
Steve Gilvarry
7fcd12fab9 Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer 2016-04-25 22:06:07 +10:00
SteveGilvarry
966fbb1a10 Add Packet Queue 2016-04-04 20:04:14 +10:00
Heng Liu
44f63443c1 video branch ffmpeg 2.9 fixes 
ffmpeg 2.9 patched removed SSE2 CPU
 2015-11-04 14:43:45 -08: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
dc0506c597 Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues 2015-11-04 22:33:29 +11:00
SteveGilvarry
5ba13f1a76 ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected 
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
 2015-11-04 16:24:39 +11:00
SteveGilvarry
51914994f7 Migrating from av_free/av_freep to av_frame_free using libavcodec version 
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
 2015-11-04 15:30:14 +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
9b06b1399c Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
	src/zm_ffmpeg_camera.cpp
	web/skins/classic/views/event.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/timeline.php
 2015-06-10 23:09:30 +10:00
Emmanuel Papin
a36b4aa65d Implement version check for ffmpeg and libav (address issue #580) 2015-05-29 17:38:02 +02:00
Rick Sayre
12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work 
haven't attempted to build yet, there are some changes
 2015-05-17 17:18:54 -07:00
Dmitry Smirnov
eddada011c spelling corrections (thanks, /usr/bin/codespell) 2015-04-19 20:38:23 +10:00
Sune1337
5779b2e20f * use pthread_join instead of pthread_tryjoin_np 2015-04-08 22:15:54 +02:00
SteveGilvarry
b587222ce5 bring recent improvements in ffmpeg capture function into captureandrecord 2015-03-22 21:02:02 +11:00
SteveGilvarry
ba425edd0f Convert from event_directory to event file as per Video branch 2015-01-12 20:42:17 +10:00
SteveGilvarry
25bfedc9d6 Clean up comments and add av_free_packet 2015-01-06 15:15:14 +10:00
SteveGilvarry
4a492ce088 Fix some issues from the merge conflict 2014-12-02 21:49:50 +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
d8351eb1e3 mp4 changes 2014-11-25 20:28:18 +11:00
SteveGilvarry
8d71d4de03 Swap to mp4 container 2014-11-09 18:15:43 +11:00
SteveGilvarry
4245928b35 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
	web/skins/classic/js/skin.js
 2014-10-12 20:10:36 +11:00
SteveGilvarry
6cb96f1316 Put opts back in 2014-10-12 16:47:27 +11:00
Sune1337
7534557533 - join reconnect thread when finished to clean up thread resources. 
- don't spawn a new thread for every attempt to open a stream while reconnecting.
 2014-10-12 16:31:27 +11:00
Sune1337
a865a555f2 Define AV_ERROR_MAX_STRING_SIZE after all include files to use ffmpeg define if it exists. 2014-10-12 16:31:27 +11:00
Sune1337
f32b1276df Define AV_ERROR_MAX_STRING_SIZE to 64 if it is not already defined. 2014-10-12 16:23:58 +11:00
Sune1337
83d2a494c3 Process should exit if ReopenFfmpeg function fails to create a worker thread. 2014-10-12 16:23:58 +11:00
Sune1337
7de59df080 removed use of av_err2str. someone could not compile when using that macro. 2014-10-12 16:23:58 +11:00
Sune1337
a307b8a1e3 Use value from options (FFMPEG_OPEN_TIMEOUT) as timeout when calling av_open_input_file. 2014-10-12 16:23:58 +11:00
Sune1337
ebf466c2df - Timeout when opening stream after 10 seconds 
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever.
- Reopen stream if av_read_frame returns EOF
Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured.
- Reopen stream if av_read_frame returns -110
Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
 2014-10-12 16:23:58 +11:00
Andy Bauer
549360cabd Merge branch 'zms/videostream-improvements' of https://github.com/Sune1337/ZoneMinder into Sune1337-zms/videostream-improvements 
Conflicts:
	src/zm_ffmpeg.h
	src/zm_mpeg.cpp
 2014-10-11 15:38:38 -05:00
stevegilvarry
8c81c8df9c Option handled added in master, removing duplicate declaration 2014-06-29 08:50:17 +10:00
stevegilvarry
17d7404c93 Merging master again 2014-06-28 22:50:28 +10:00
Will W
5051c26d31 Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem) 2014-05-30 02:05:20 +10:00
m-bene
a81b9b8ce2 change examples for options 2014-05-17 21:48:08 +02:00
m-bene
f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene
9a71a0068a add help window for ffmpeg/libvlc options 2014-05-17 04:33:33 +02:00
m-bene
1b4f9c082c change check for av_dict_set success 2014-05-15 16:01:29 +02:00
m-bene
6016206f98 modify debug message 2014-05-15 15:42:27 +02:00
m-bene
5cb7cd916f add quotes to option debug/warn messages 2014-05-15 15:13:39 +02:00
m-bene
c1557a99e5 add debug and warn messages 2014-05-15 15:06:01 +02:00
m-bene
ae0ee9b3b3 testing/fixing 2014-05-05 15:54:13 +02:00
m-bene
ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Sune1337
3155d621d0 - Removed an unreferenced variable 
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
 2014-04-25 22:57:29 +02:00
Chris Wiggins
8da327e9a3 Keep last keyframe so that as soon as the video starts to record, it has a keyframe to use rather than waiting 2013-09-28 23:26:28 +12:00
Chris Wiggins
a7c4d3f3e9 Accidental copy of old logic. Fixed 2013-09-22 10:40:54 +12:00
Chris Wiggins
6a7b38dac6 update changes 2013-09-19 21:55:56 +12:00
Chris Wiggins
774a84d487 Updated event processing to actually add frames into the DB. Use MP4 container 2013-09-14 00:50:54 +12:00
Chris Wiggins
c61029f780 First iteration of h264 saving in the capture daemon. 
To use, enable use_mkv_storage in the paths section of the ZM config (be sure to import the new SQL config)
Must have the latest FFMPEG compiled from git with x264 linked in
 2013-09-06 15:07:46 +12:00
nextime
33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00