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
7,379 Commits 99 Branches 106 Tags
4ee1f38dd083d0070712c3facb7b09ff47817bac
Commit Graph

81 Commits

Author SHA1 Message Date
Isaac Connor
4ee1f38dd0 move storing packet to videostore up before decoding. move packet allocation inside the while that it needs to be in. 2016-09-09 14:38:16 -04:00
Isaac Connor
8148e35ec6 rework to dynamically allocate packet instead of putting it on the stack. Plus packet freeing cleanups 2016-09-09 10:04:42 -04:00
Isaac Connor
7a62d84bd2 Merge ../ZoneMinder.Steve into packetqueue 2016-09-08 09:23:31 -04:00
Steve Gilvarry
33baa3b302 Free Audio and pickup unconverted video codec context. 2016-09-06 23:25:59 +10:00
Steve Gilvarry
e40acc301d Add mAudioCodecContext and mAudioCodec and turn existing into video 
versions. Check if audio stream available and check audio stream codec
same as video is being checked now. Was Seg faulting if no audio stream.
 2016-09-06 01:27:57 +10:00
Isaac Connor
9262487a77 deprecate wasRecording 2016-09-01 10:10:16 -04:00
Isaac Connor
9d19e2587c fix should only write out the queue if we are starting a new event 2016-08-31 16:58:41 -04:00
Steve Gilvarry
d1bcb14629 Right direction 2016-09-01 00:00:10 +10:00
Steve Gilvarry
44df4a830d Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 20:44:48 +10:00
Isaac Connor
6ac1a70b9c Merge my Rotation/Orientation work and fixes for bad h264 streams 2016-08-10 12:22:04 -04:00
Steve Gilvarry
21c46bb519 Merge branch 'feature-h264-videostorage' into monitor_packetqueue 2016-08-11 00:52:35 +10:00
Steve Gilvarry
5d8159462c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-11 00:51:46 +10:00
Steve Gilvarry
0425c68d59 Merge remote-tracking branch 'upstream/feature-h264-videostorage' into monitor_packetqueue 2016-08-02 20:17:35 +10:00
Steve Gilvarry
1a684b7709 Remove whitespace 2016-07-28 23:22:34 +10:00
Steve Gilvarry
71e3789bd0 Use av_dict_parse_string to split ffmpeg options, and remove creating strings to split them in next step for rtsp_transport 2016-07-28 23:15:01 +10:00
Steve Gilvarry
b05eabfe1d Forgot that I was trying to solve case of stream is true and record_audio 
is false.
 2016-07-13 08:31:10 +10:00
Steve Gilvarry
f1b9e1205a Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio 2016-07-12 23:13:02 +10:00
Isaac Connor
26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Steve Gilvarry
0abfb7378a Buffer work 2016-05-18 00:01:33 +10:00
Steve Gilvarry
1f3b3d1203 Revert "WIP packetqueue shared memory" 
This reverts commit 8aa1cb6bf6.
 2016-05-08 15:25:18 +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
8aa1cb6bf6 WIP packetqueue shared memory 2016-05-03 20:07:45 +10:00
Steve Gilvarry
da157f5a1a Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-04-30 22:27:10 +10:00
Steve Gilvarry
8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
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
Isaac Connor
b3e68ca2f7 Must init videoStore in constuctor 2016-04-15 15:10:26 -04:00
Isaac Connor
fefa2dc804 add a test and error message if the codec is not h264 2016-04-06 12:48:16 -04: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
Isaac Connor
abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Jon Burgess
bfd846bbff Add more logging to diagnose problems with applying ffmpeg options 2016-03-20 21:44:58 +00:00
SteveGilvarry
2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
SteveGilvarry
e70d037895 Start avpicture deprecation 2016-02-27 01:23:20 +11: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