Isaac Connor
6a8db582ff
whitespacing updates
2016-06-21 12:21:18 -04:00
Isaac Connor
943a4cef73
Merge branch 'storageareas' into rotate_video
2016-05-13 15:00:50 -04:00
Isaac Connor
71e9553648
add rotation to video
2016-05-13 14:51:26 -04:00
Isaac Connor
c3628a8dfd
Merge branch 'updated-console' into storageareas
2016-05-03 14:34:58 -04:00
Steve Gilvarry
8452c4bce5
Fix tab to spaces merge issues
2016-04-29 21:27:28 +10:00
Isaac Connor
851e8f46ff
redo fix_rotate
2016-04-25 15:57:39 -04:00
Isaac Connor
71d79fac99
Merge ../ZoneMinder.SteveGilvarry into valgrind
2016-04-20 09:59:08 -04:00
Isaac Connor
dc7f2ff353
fix merge problems
2016-04-06 11:44:57 -04:00
Isaac Connor
765f79a87f
Merge branch 'icon_video' into storageareas
2016-04-06 11:16:38 -04:00
Isaac Connor
9aeba8ced8
whitespace fixes
2016-04-06 10:50:00 -04:00
Isaac Connor
dd408cc9a1
Don't skip audo stream detection by finding video stream
2016-04-06 08:38:34 -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
be13e56c3c
add some comments
2016-04-04 21:58:16 -04:00
Isaac Connor
03b1ced568
tabs to spaces and use 2space indenting
2016-04-04 10:11:48 -04:00
Isaac Connor
c26dbb9028
rough in record_audio, and do lots of whitespace cleanups
2016-03-31 12:54:56 -04:00
Isaac Connor
92b98e1953
spacing, code structure and code documentation. Also, add in a flag to say whether to store the audio packets
2016-03-31 11:55:21 -04:00
SteveGilvarry
2122d6e443
Fix all the av_picture related deprecations
2016-03-03 01:03:55 +11:00
SteveGilvarry
fa7ec2179d
Bring is more of the h264 code and add some master changes to the duplicated code
2016-02-05 01:47:13 +11:00
SteveGilvarry
78b0a9d0a9
Add videostore to remote_rtsp, still need to check stream is h264
2016-02-05 01:47:12 +11:00
SteveGilvarry
477e63a878
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 17:19:58 +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
Andrew Bauer
a2d7ac86fe
add rtsp_describe to RtspThread class
2015-08-21 10:29:54 -05:00
Emmanuel Papin
a36b4aa65d
Implement version check for ffmpeg and libav (address issue #580 )
2015-05-29 17:38:02 +02:00
manupap1
d2e849104c
Fix memory leaks with rtsp and a bug
2014-11-14 22:31:03 +01: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
Sune1337
04b8ecf0a7
Support streaming with zms (using ffmpeg) better
...
* ZoneMinder compiles with ffmpeg 0.5..master
* Make VideoStream class able to stream through ffmpeg better.
* Ability to use fixed quality instead of fixed bitrate (by specifying bitrate 0...100)
* Format url parameter supports <format>/<encoder> syntax
Details:
- Redefine av_err2str to a to avoid compiler warning on newer g++'s
- When using rtp format; if ffmpeg does not have a default codec, use CODEC_ID_MPEG4. (because this is what the default is as of 2.2 when this code was written)
- Specify ofc->packet_size if rtp format is requested
- Video generated in a thread to guarantee a constant fps.
- Move _AVCODECID definition into zm_ffmpeg.h (and use instead of (AV)CodecID
- Call avformat_network_init because ffmpeg warns about it beeing required soon.
- increase VideoStream::video_outbuf_size to 4MiB to be able to encode larger pictures
2014-04-25 22:12:58 +02:00
Anton Khirnov
296aa2517b
Support building with new libavcodec versions.
...
CODEC_ID_* has been replaced with AV_CODEC_ID_* upstream.
2014-02-06 08:39:47 +01:00
Edward Barnard
9a06ec51c6
Save a couple of cpu cycles.
2013-12-02 15:37:26 +00:00
Edward Barnard
21946b5854
H264 SPS and PPS frames are now handled correctly
2013-11-30 21:59:04 +00:00
POKKAHOH
33b6e5cd03
Now can recive RTSP stream.
...
Decode fragmented NAL
Understand sprop-parametr-sets
Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
2013-09-27 15:08:11 +04:00
nextime
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
