2013-03-17 07:45:21 +08:00
|
|
|
//
|
|
|
|
// ZoneMinder Remote Camera Class Implementation, $Date$, $Revision$
|
|
|
|
// Copyright (C) 2001-2008 Philip Coombes
|
|
|
|
//
|
|
|
|
// This program is free software; you can redistribute it and/or
|
|
|
|
// modify it under the terms of the GNU General Public License
|
|
|
|
// as published by the Free Software Foundation; either version 2
|
|
|
|
// of the License, or (at your option) any later version.
|
|
|
|
//
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License for more details.
|
|
|
|
//
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
|
|
// along with this program; if not, write to the Free Software
|
2016-12-26 23:23:16 +08:00
|
|
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2013-03-17 07:45:21 +08:00
|
|
|
//
|
|
|
|
|
|
|
|
#include "zm_remote_camera_rtsp.h"
|
|
|
|
|
2021-02-04 11:47:28 +08:00
|
|
|
#include "zm_config.h"
|
2021-02-11 05:52:50 +08:00
|
|
|
#include "zm_monitor.h"
|
2021-02-04 11:47:28 +08:00
|
|
|
#include "zm_packet.h"
|
|
|
|
|
|
|
|
#if HAVE_LIBAVFORMAT
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2019-04-29 00:05:32 +08:00
|
|
|
RemoteCameraRtsp::RemoteCameraRtsp(
|
2021-02-08 02:12:39 +08:00
|
|
|
const Monitor *monitor,
|
2019-04-29 00:05:32 +08:00
|
|
|
const std::string &p_method,
|
|
|
|
const std::string &p_host,
|
|
|
|
const std::string &p_port,
|
|
|
|
const std::string &p_path,
|
|
|
|
int p_width,
|
|
|
|
int p_height,
|
|
|
|
bool p_rtsp_describe,
|
|
|
|
int p_colours,
|
|
|
|
int p_brightness,
|
|
|
|
int p_contrast,
|
|
|
|
int p_hue,
|
|
|
|
int p_colour,
|
|
|
|
bool p_capture,
|
|
|
|
bool p_record_audio ) :
|
2021-01-28 05:12:32 +08:00
|
|
|
RemoteCamera(
|
2021-02-08 02:12:39 +08:00
|
|
|
monitor, "rtsp",
|
2021-01-28 05:12:32 +08:00
|
|
|
p_host, p_port, p_path,
|
|
|
|
p_width, p_height, p_colours,
|
|
|
|
p_brightness, p_contrast, p_hue, p_colour,
|
|
|
|
p_capture, p_record_audio),
|
|
|
|
rtsp_describe(p_rtsp_describe),
|
|
|
|
frameCount(0)
|
2013-03-17 07:45:21 +08:00
|
|
|
{
|
2016-04-04 22:11:48 +08:00
|
|
|
if ( p_method == "rtpUni" )
|
|
|
|
method = RtspThread::RTP_UNICAST;
|
|
|
|
else if ( p_method == "rtpMulti" )
|
|
|
|
method = RtspThread::RTP_MULTICAST;
|
|
|
|
else if ( p_method == "rtpRtsp" )
|
|
|
|
method = RtspThread::RTP_RTSP;
|
|
|
|
else if ( p_method == "rtpRtspHttp" )
|
|
|
|
method = RtspThread::RTP_RTSP_HTTP;
|
|
|
|
else
|
2021-02-08 02:12:39 +08:00
|
|
|
Fatal("Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), monitor->Id());
|
2016-04-04 22:11:48 +08:00
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
if ( capture ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
Initialise();
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
|
2017-10-23 21:51:41 +08:00
|
|
|
if ( colours == ZM_COLOUR_RGB32 ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
subpixelorder = ZM_SUBPIX_ORDER_RGBA;
|
|
|
|
imagePixFormat = AV_PIX_FMT_RGBA;
|
2017-10-23 21:51:41 +08:00
|
|
|
} else if ( colours == ZM_COLOUR_RGB24 ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
subpixelorder = ZM_SUBPIX_ORDER_RGB;
|
|
|
|
imagePixFormat = AV_PIX_FMT_RGB24;
|
2017-10-23 21:51:41 +08:00
|
|
|
} else if ( colours == ZM_COLOUR_GRAY8 ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
subpixelorder = ZM_SUBPIX_ORDER_NONE;
|
|
|
|
imagePixFormat = AV_PIX_FMT_GRAY8;
|
|
|
|
} else {
|
2019-09-23 22:52:57 +08:00
|
|
|
Panic("Unexpected colours: %d", colours);
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2017-05-20 21:53:35 +08:00
|
|
|
} // end RemoteCameraRtsp::RemoteCameraRtsp(...)
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
RemoteCameraRtsp::~RemoteCameraRtsp() {
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2021-01-28 05:12:32 +08:00
|
|
|
if ( mVideoCodecContext ) {
|
|
|
|
avcodec_close(mVideoCodecContext);
|
|
|
|
mVideoCodecContext = nullptr; // Freed by avformat_free_context in the destructor of RtspThread class
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2021-01-28 05:12:32 +08:00
|
|
|
// Is allocated in RTSPThread and is free there as well
|
|
|
|
mFormatContext = nullptr;
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
if ( capture ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
Terminate();
|
|
|
|
}
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
void RemoteCameraRtsp::Initialise() {
|
2016-04-04 22:11:48 +08:00
|
|
|
RemoteCamera::Initialise();
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
int max_size = width*height*colours;
|
2013-03-17 07:45:21 +08:00
|
|
|
|
Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model. Fixes #191.
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* 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)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a94cba4d8955fcd03bd965ed2772f34d.
* Add CaptureAndRecord to vlc, still need to make it record
* Resolve SegFault on videostore
* Swap to mp4 container
* mp4 changes
* spaces to tabs, hide video stuff if video writer is turned off
* Make timeline open event.mp4 instead of mkv
* Missed mkv in timeline.js
* Fix some issues from the merge conflict
* Resolve post merge build issues with braces
* Fix whitespace
* Update Jpeg and Video options for passthrough options
* Whitespace fix zm_camera.h
* Fix array mkssing comma
* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
* Update VideoStoreData memory size comment
* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
* Fix bracket issues post merge
* Clean up comments and add av_free_packet
* Convert from event_directory to event file as per Video branch
* Testing videojs for video playback
* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
* bring recent improvements in ffmpeg capture function into captureandrecord
* Remove pict from writeAudioFramePacket as not used
* Add translate options for h264 Storage options in Monitor and update en_gb file
* Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
* Clean up videostore code and remove lots of unused code
* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
Conflicts:
web/skins/classic/views/event.php
* removed redundant field in sql query
Conflicts:
web/skins/classic/views/event.php
* local storage of video js plugin
* Beautify!
Make the code somewhat readable.
* added missing videojs.zoomrotate.js file
added missing videojs.zoomrotate.js file
* Typo
added missing "
* Added missing brackets
* fix to display thumbnails when only storing snapshot.jpg
* added control for video playback rate
Conflicts:
web/skins/classic/views/event.php
* dynamically create jpegs from video file for viewing in browser
* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
* only expose monitor info which are being used in client
* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
when libx264 is not installed
* better way of detecting showing image or video in timeline and event view
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
* Remove syslog.h
* fixed SaveJPEGs are not working
which is caused in errors introduced when merging with master
* Update README.md
* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
* Fix PRId64 issue in travis, another try
* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
* Revert space removal around PRId64
* video branch ffmpeg 2.9 fixes
ffmpeg 2.9 patched removed SSE2 CPU
* Add FFMPEGInit back
* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
also fixed bug which prevented seeking in timeline video preview
* ffmpeg 3.0 API build failure fixes
* Update README.md
* merge all the commits from the messed up iconnor_video branch
* fix whitespace
* revert
* whitespace fixes
* spelling fix
* put back some text
* add these back
* fix spelling mistake
* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
* add a test and error message if the codec is not h264
* these have been removed in master
* add a view to check auth and just send the video
* add some comments, and dump filename and AVFormatContext on failure to write header
* add the toggle for RecordAudio so that the checkbox works to turn off Audio
* Must init videoStore in constuctor
* more debug and comments, return checking
* Fix dropped part of sql query.
* fix extra else and some whitespace
* Fix missing } from merge that was preventing building.
* fix tabs
* get rid of use of separator, just use \n
* Restore lost fixes for deprecation
* Why are these failing
* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
* Forgot that I was trying to solve case of stream is true and record_audio
is false.
* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
* Merge my Rotation/Orientation work and fixes for bad h264 streams
* need arpa/inet for reverse lookups
* pull in the new byte range code for viewing videos
* Move our recording flag deeper into closeevent
* add braces and only call closeEvent if there is an event
* deprecate the z_frame_rate stuff which is deprecated in ffmpeg
* remark out some debugging
* fix for video on stream 1
* fix audio_stream to audio_st
* Ignore bad decodes
* fix problems with content-length causing viewing to not work in chrome/android
* change logic of sending file contents to handle an off by one and be more readable
* Some fixes pointed out by Maxim Romanov. Also simply the loading of events to not join the Monitors table
* fix to sql for timeline
* added RecordAudio to sql in README
* Use sub queries instead of joins to fix errors when using new mysql defaults.
* fix sql queries
* Dockerfile to build feature-h264-videostorage
* Must cast codec
* add php-acpu as a dependency
* require php5-acpu
* fix typo
* remove extra /
* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
* delete merge conflict files
* delete merge conflict files
2017-05-16 10:02:48 +08:00
|
|
|
// This allocates a buffer able to hold a raw fframe, which is a little artbitrary. Might be nice to get some
|
2017-05-17 00:04:56 +08:00
|
|
|
// decent data on how large a buffer is really needed. I think in ffmpeg there are now some functions to do that.
|
2019-09-23 22:52:57 +08:00
|
|
|
buffer.size(max_size);
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2019-09-23 22:52:57 +08:00
|
|
|
FFMPEGInit();
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
Connect();
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
void RemoteCameraRtsp::Terminate() {
|
2016-04-04 22:11:48 +08:00
|
|
|
Disconnect();
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
int RemoteCameraRtsp::Connect() {
|
2021-03-03 02:56:35 +08:00
|
|
|
rtspThread = ZM::make_unique<RtspThread>(monitor->Id(), method, protocol, host, port, path, auth, rtsp_describe);
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2019-09-23 22:52:57 +08:00
|
|
|
return 0;
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
int RemoteCameraRtsp::Disconnect() {
|
2021-03-03 02:56:35 +08:00
|
|
|
if (rtspThread) {
|
|
|
|
rtspThread->Stop();
|
|
|
|
rtspThread.reset();
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2019-09-23 22:52:57 +08:00
|
|
|
return 0;
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
int RemoteCameraRtsp::PrimeCapture() {
|
2019-09-23 22:52:57 +08:00
|
|
|
Debug(2, "Waiting for sources");
|
2020-05-08 01:40:32 +08:00
|
|
|
for ( int i = 0; (i < 100) && !rtspThread->hasSources(); i++ ) {
|
2019-09-23 22:52:57 +08:00
|
|
|
usleep(100000);
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2020-05-08 01:40:32 +08:00
|
|
|
if ( !rtspThread->hasSources() ) {
|
|
|
|
Error("No RTSP sources");
|
|
|
|
return -1;
|
|
|
|
}
|
2016-04-04 22:11:48 +08:00
|
|
|
|
2019-09-23 22:52:57 +08:00
|
|
|
Debug(2, "Got sources");
|
2016-04-04 22:11:48 +08:00
|
|
|
|
|
|
|
mFormatContext = rtspThread->getFormatContext();
|
|
|
|
|
|
|
|
// Find first video stream present
|
|
|
|
mVideoStreamId = -1;
|
2017-05-17 00:04:56 +08:00
|
|
|
mAudioStreamId = -1;
|
2017-11-10 03:50:20 +08:00
|
|
|
|
Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model. Fixes #191.
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* 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)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a94cba4d8955fcd03bd965ed2772f34d.
* Add CaptureAndRecord to vlc, still need to make it record
* Resolve SegFault on videostore
* Swap to mp4 container
* mp4 changes
* spaces to tabs, hide video stuff if video writer is turned off
* Make timeline open event.mp4 instead of mkv
* Missed mkv in timeline.js
* Fix some issues from the merge conflict
* Resolve post merge build issues with braces
* Fix whitespace
* Update Jpeg and Video options for passthrough options
* Whitespace fix zm_camera.h
* Fix array mkssing comma
* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
* Update VideoStoreData memory size comment
* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
* Fix bracket issues post merge
* Clean up comments and add av_free_packet
* Convert from event_directory to event file as per Video branch
* Testing videojs for video playback
* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
* bring recent improvements in ffmpeg capture function into captureandrecord
* Remove pict from writeAudioFramePacket as not used
* Add translate options for h264 Storage options in Monitor and update en_gb file
* Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
* Clean up videostore code and remove lots of unused code
* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
Conflicts:
web/skins/classic/views/event.php
* removed redundant field in sql query
Conflicts:
web/skins/classic/views/event.php
* local storage of video js plugin
* Beautify!
Make the code somewhat readable.
* added missing videojs.zoomrotate.js file
added missing videojs.zoomrotate.js file
* Typo
added missing "
* Added missing brackets
* fix to display thumbnails when only storing snapshot.jpg
* added control for video playback rate
Conflicts:
web/skins/classic/views/event.php
* dynamically create jpegs from video file for viewing in browser
* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
* only expose monitor info which are being used in client
* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
when libx264 is not installed
* better way of detecting showing image or video in timeline and event view
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
* Remove syslog.h
* fixed SaveJPEGs are not working
which is caused in errors introduced when merging with master
* Update README.md
* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
* Fix PRId64 issue in travis, another try
* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
* Revert space removal around PRId64
* video branch ffmpeg 2.9 fixes
ffmpeg 2.9 patched removed SSE2 CPU
* Add FFMPEGInit back
* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
also fixed bug which prevented seeking in timeline video preview
* ffmpeg 3.0 API build failure fixes
* Update README.md
* merge all the commits from the messed up iconnor_video branch
* fix whitespace
* revert
* whitespace fixes
* spelling fix
* put back some text
* add these back
* fix spelling mistake
* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
* add a test and error message if the codec is not h264
* these have been removed in master
* add a view to check auth and just send the video
* add some comments, and dump filename and AVFormatContext on failure to write header
* add the toggle for RecordAudio so that the checkbox works to turn off Audio
* Must init videoStore in constuctor
* more debug and comments, return checking
* Fix dropped part of sql query.
* fix extra else and some whitespace
* Fix missing } from merge that was preventing building.
* fix tabs
* get rid of use of separator, just use \n
* Restore lost fixes for deprecation
* Why are these failing
* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
* Forgot that I was trying to solve case of stream is true and record_audio
is false.
* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
* Merge my Rotation/Orientation work and fixes for bad h264 streams
* need arpa/inet for reverse lookups
* pull in the new byte range code for viewing videos
* Move our recording flag deeper into closeevent
* add braces and only call closeEvent if there is an event
* deprecate the z_frame_rate stuff which is deprecated in ffmpeg
* remark out some debugging
* fix for video on stream 1
* fix audio_stream to audio_st
* Ignore bad decodes
* fix problems with content-length causing viewing to not work in chrome/android
* change logic of sending file contents to handle an off by one and be more readable
* Some fixes pointed out by Maxim Romanov. Also simply the loading of events to not join the Monitors table
* fix to sql for timeline
* added RecordAudio to sql in README
* Use sub queries instead of joins to fix errors when using new mysql defaults.
* fix sql queries
* Dockerfile to build feature-h264-videostorage
* Must cast codec
* add php-acpu as a dependency
* require php5-acpu
* fix typo
* remove extra /
* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
* delete merge conflict files
* delete merge conflict files
2017-05-16 10:02:48 +08:00
|
|
|
// Find the first video stream.
|
|
|
|
for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
|
2020-05-08 01:40:32 +08:00
|
|
|
if ( is_video_stream(mFormatContext->streams[i]) ) {
|
2017-05-17 00:04:56 +08:00
|
|
|
if ( mVideoStreamId == -1 ) {
|
|
|
|
mVideoStreamId = i;
|
2021-01-28 23:45:53 +08:00
|
|
|
mVideoStream = mFormatContext->streams[i];
|
2021-01-30 04:37:23 +08:00
|
|
|
mVideoStream->time_base = AV_TIME_BASE_Q;
|
2017-05-17 00:04:56 +08:00
|
|
|
continue;
|
|
|
|
} else {
|
2019-09-23 22:52:57 +08:00
|
|
|
Debug(2, "Have another video stream.");
|
2017-05-17 00:04:56 +08:00
|
|
|
}
|
2021-01-30 04:37:23 +08:00
|
|
|
#if 0
|
2020-05-08 01:40:32 +08:00
|
|
|
} else if ( is_audio_stream(mFormatContext->streams[i]) ) {
|
2017-05-17 00:04:56 +08:00
|
|
|
if ( mAudioStreamId == -1 ) {
|
|
|
|
mAudioStreamId = i;
|
2021-01-28 23:45:53 +08:00
|
|
|
mAudioStream = mFormatContext->streams[i];
|
2017-05-17 00:04:56 +08:00
|
|
|
} else {
|
2019-09-23 22:52:57 +08:00
|
|
|
Debug(2, "Have another audio stream.");
|
2017-05-17 00:04:56 +08:00
|
|
|
}
|
2021-01-30 04:37:23 +08:00
|
|
|
#endif
|
2019-04-29 00:05:32 +08:00
|
|
|
} else {
|
2020-05-08 01:40:32 +08:00
|
|
|
Debug(1, "Have unknown codec type in stream %d", i);
|
2017-05-17 00:04:56 +08:00
|
|
|
}
|
|
|
|
} // end foreach stream
|
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
if ( mVideoStreamId == -1 )
|
2019-09-23 22:52:57 +08:00
|
|
|
Fatal("Unable to locate video stream");
|
2017-05-17 00:04:56 +08:00
|
|
|
if ( mAudioStreamId == -1 )
|
2019-09-23 22:52:57 +08:00
|
|
|
Debug(3, "Unable to locate audio stream");
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
// Get a pointer to the codec context for the video stream
|
2017-11-10 03:50:20 +08:00
|
|
|
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
|
2021-01-28 05:12:32 +08:00
|
|
|
mVideoCodecContext = avcodec_alloc_context3(NULL);
|
|
|
|
avcodec_parameters_to_context(mVideoCodecContext, mFormatContext->streams[mVideoStreamId]->codecpar);
|
2017-11-10 03:50:20 +08:00
|
|
|
#else
|
2021-01-28 05:12:32 +08:00
|
|
|
mVideoCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
|
2017-11-10 03:50:20 +08:00
|
|
|
#endif
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
// Find the decoder for the video stream
|
2021-01-28 05:12:32 +08:00
|
|
|
AVCodec *codec = avcodec_find_decoder(mVideoCodecContext->codec_id);
|
|
|
|
if ( codec == nullptr )
|
|
|
|
Panic("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
// Open codec
|
2015-05-29 23:38:02 +08:00
|
|
|
#if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
|
2021-01-28 05:12:32 +08:00
|
|
|
if ( avcodec_open(mVideoCodecContext, codec) < 0 )
|
2013-03-17 07:45:21 +08:00
|
|
|
#else
|
2021-01-28 05:12:32 +08:00
|
|
|
if ( avcodec_open2(mVideoCodecContext, codec, 0) < 0 )
|
2013-03-17 07:45:21 +08:00
|
|
|
#endif
|
2019-09-23 22:52:57 +08:00
|
|
|
Panic("Can't open codec");
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-03-02 22:03:55 +08:00
|
|
|
#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
|
2019-09-23 22:52:57 +08:00
|
|
|
int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
|
2016-03-02 22:03:55 +08:00
|
|
|
#else
|
2019-09-23 22:52:57 +08:00
|
|
|
int pSize = avpicture_get_size(imagePixFormat, width, height);
|
2016-03-02 22:03:55 +08:00
|
|
|
#endif
|
|
|
|
|
2017-05-20 21:53:35 +08:00
|
|
|
if ( (unsigned int)pSize != imagesize ) {
|
2021-04-29 06:13:16 +08:00
|
|
|
Fatal("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2017-11-10 03:50:20 +08:00
|
|
|
|
2020-12-28 01:02:02 +08:00
|
|
|
return 1;
|
|
|
|
} // end PrimeCapture
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2017-05-17 00:04:56 +08:00
|
|
|
int RemoteCameraRtsp::PreCapture() {
|
2021-03-03 02:56:35 +08:00
|
|
|
if (!rtspThread || rtspThread->IsStopped())
|
2019-09-23 22:52:57 +08:00
|
|
|
return -1;
|
2017-05-20 21:53:35 +08:00
|
|
|
if ( !rtspThread->hasSources() ) {
|
2019-09-23 22:52:57 +08:00
|
|
|
Error("Cannot precapture, no RTP sources");
|
|
|
|
return -1;
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2020-12-28 01:02:02 +08:00
|
|
|
return 1;
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
|
2021-05-09 09:14:20 +08:00
|
|
|
int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
|
2016-04-04 22:11:48 +08:00
|
|
|
int frameComplete = false;
|
2021-05-09 09:14:20 +08:00
|
|
|
AVPacket *packet = &zm_packet->packet;
|
|
|
|
if ( !zm_packet->image ) {
|
2021-01-28 05:12:32 +08:00
|
|
|
Debug(1, "Allocating image %dx%d %d colours %d", width, height, colours, subpixelorder);
|
2021-05-09 09:14:20 +08:00
|
|
|
zm_packet->image = new Image(width, height, colours, subpixelorder);
|
2021-01-28 05:12:32 +08:00
|
|
|
}
|
2021-01-30 04:37:23 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
|
2021-05-09 09:14:20 +08:00
|
|
|
while (!frameComplete) {
|
2016-04-04 22:11:48 +08:00
|
|
|
buffer.clear();
|
2021-03-03 02:56:35 +08:00
|
|
|
if (!rtspThread || rtspThread->IsStopped())
|
2017-11-04 01:49:42 +08:00
|
|
|
return -1;
|
2016-04-04 22:11:48 +08:00
|
|
|
|
2019-09-23 22:52:57 +08:00
|
|
|
if ( rtspThread->getFrame(buffer) ) {
|
|
|
|
Debug(3, "Read frame %d bytes", buffer.size());
|
|
|
|
Hexdump(4, buffer.head(), 16);
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2016-04-04 22:11:48 +08:00
|
|
|
if ( !buffer.size() )
|
2017-11-04 01:49:42 +08:00
|
|
|
return -1;
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2021-01-28 05:12:32 +08:00
|
|
|
if ( mVideoCodecContext->codec_id == AV_CODEC_ID_H264 ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
// SPS and PPS frames should be saved and appended to IDR frames
|
|
|
|
int nalType = (buffer.head()[3] & 0x1f);
|
|
|
|
|
2017-05-17 00:04:56 +08:00
|
|
|
// SPS The SPS NAL unit contains parameters that apply to a series of consecutive coded video pictures
|
2020-12-28 01:25:23 +08:00
|
|
|
if ( nalType == 1 ) {
|
|
|
|
} else if ( nalType == 7 ) {
|
2016-04-04 22:11:48 +08:00
|
|
|
lastSps = buffer;
|
|
|
|
continue;
|
2017-10-23 21:51:41 +08:00
|
|
|
} else if ( nalType == 8 ) {
|
2017-05-17 00:04:56 +08:00
|
|
|
// PPS The PPS NAL unit contains parameters that apply to the decoding of one or more individual pictures inside a coded video sequence
|
2016-04-04 22:11:48 +08:00
|
|
|
lastPps = buffer;
|
|
|
|
continue;
|
2017-10-23 21:51:41 +08:00
|
|
|
} else if ( nalType == 5 ) {
|
2020-12-28 01:02:02 +08:00
|
|
|
packet->flags |= AV_PKT_FLAG_KEY;
|
2021-05-09 09:14:20 +08:00
|
|
|
zm_packet->keyframe = 1;
|
2016-04-04 22:11:48 +08:00
|
|
|
// IDR
|
|
|
|
buffer += lastSps;
|
|
|
|
buffer += lastPps;
|
2020-05-08 01:40:32 +08:00
|
|
|
} else {
|
|
|
|
Debug(2, "Unknown nalType %d", nalType);
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
2017-05-20 21:53:35 +08:00
|
|
|
} else {
|
|
|
|
Debug(3, "Not an h264 packet");
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
|
|
|
|
2021-01-28 05:12:32 +08:00
|
|
|
//while ( (!frameComplete) && (buffer.size() > 0) ) {
|
|
|
|
if ( buffer.size() > 0 ) {
|
2017-11-13 00:42:34 +08:00
|
|
|
packet->data = buffer.head();
|
|
|
|
packet->size = buffer.size();
|
2020-05-03 06:03:42 +08:00
|
|
|
bytes += packet->size;
|
Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model. Fixes #191.
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* 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)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a94cba4d8955fcd03bd965ed2772f34d.
* Add CaptureAndRecord to vlc, still need to make it record
* Resolve SegFault on videostore
* Swap to mp4 container
* mp4 changes
* spaces to tabs, hide video stuff if video writer is turned off
* Make timeline open event.mp4 instead of mkv
* Missed mkv in timeline.js
* Fix some issues from the merge conflict
* Resolve post merge build issues with braces
* Fix whitespace
* Update Jpeg and Video options for passthrough options
* Whitespace fix zm_camera.h
* Fix array mkssing comma
* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
* Update VideoStoreData memory size comment
* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
* Fix bracket issues post merge
* Clean up comments and add av_free_packet
* Convert from event_directory to event file as per Video branch
* Testing videojs for video playback
* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
* bring recent improvements in ffmpeg capture function into captureandrecord
* Remove pict from writeAudioFramePacket as not used
* Add translate options for h264 Storage options in Monitor and update en_gb file
* Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
* Clean up videostore code and remove lots of unused code
* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
Conflicts:
web/skins/classic/views/event.php
* removed redundant field in sql query
Conflicts:
web/skins/classic/views/event.php
* local storage of video js plugin
* Beautify!
Make the code somewhat readable.
* added missing videojs.zoomrotate.js file
added missing videojs.zoomrotate.js file
* Typo
added missing "
* Added missing brackets
* fix to display thumbnails when only storing snapshot.jpg
* added control for video playback rate
Conflicts:
web/skins/classic/views/event.php
* dynamically create jpegs from video file for viewing in browser
* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
* only expose monitor info which are being used in client
* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
when libx264 is not installed
* better way of detecting showing image or video in timeline and event view
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
* Remove syslog.h
* fixed SaveJPEGs are not working
which is caused in errors introduced when merging with master
* Update README.md
* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
* Fix PRId64 issue in travis, another try
* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
* Revert space removal around PRId64
* video branch ffmpeg 2.9 fixes
ffmpeg 2.9 patched removed SSE2 CPU
* Add FFMPEGInit back
* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
also fixed bug which prevented seeking in timeline video preview
* ffmpeg 3.0 API build failure fixes
* Update README.md
* merge all the commits from the messed up iconnor_video branch
* fix whitespace
* revert
* whitespace fixes
* spelling fix
* put back some text
* add these back
* fix spelling mistake
* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
* add a test and error message if the codec is not h264
* these have been removed in master
* add a view to check auth and just send the video
* add some comments, and dump filename and AVFormatContext on failure to write header
* add the toggle for RecordAudio so that the checkbox works to turn off Audio
* Must init videoStore in constuctor
* more debug and comments, return checking
* Fix dropped part of sql query.
* fix extra else and some whitespace
* Fix missing } from merge that was preventing building.
* fix tabs
* get rid of use of separator, just use \n
* Restore lost fixes for deprecation
* Why are these failing
* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
* Forgot that I was trying to solve case of stream is true and record_audio
is false.
* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
* Merge my Rotation/Orientation work and fixes for bad h264 streams
* need arpa/inet for reverse lookups
* pull in the new byte range code for viewing videos
* Move our recording flag deeper into closeevent
* add braces and only call closeEvent if there is an event
* deprecate the z_frame_rate stuff which is deprecated in ffmpeg
* remark out some debugging
* fix for video on stream 1
* fix audio_stream to audio_st
* Ignore bad decodes
* fix problems with content-length causing viewing to not work in chrome/android
* change logic of sending file contents to handle an off by one and be more readable
* Some fixes pointed out by Maxim Romanov. Also simply the loading of events to not join the Monitors table
* fix to sql for timeline
* added RecordAudio to sql in README
* Use sub queries instead of joins to fix errors when using new mysql defaults.
* fix sql queries
* Dockerfile to build feature-h264-videostorage
* Must cast codec
* add php-acpu as a dependency
* require php5-acpu
* fix typo
* remove extra /
* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
* delete merge conflict files
* delete merge conflict files
2017-05-16 10:02:48 +08:00
|
|
|
|
2021-01-30 04:37:23 +08:00
|
|
|
struct timeval now;
|
|
|
|
gettimeofday(&now, NULL);
|
|
|
|
packet->pts = packet->dts = now.tv_sec*1000000+now.tv_usec;
|
|
|
|
|
2021-05-09 09:14:20 +08:00
|
|
|
int bytes_consumed = zm_packet->decode(mVideoCodecContext);
|
2021-01-28 05:12:32 +08:00
|
|
|
if ( bytes_consumed < 0 ) {
|
2019-09-23 22:52:57 +08:00
|
|
|
Error("Error while decoding frame %d", frameCount);
|
2021-01-28 05:12:32 +08:00
|
|
|
//Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
|
|
|
|
}
|
|
|
|
buffer -= packet->size;
|
|
|
|
if ( bytes_consumed ) {
|
2021-05-09 09:14:20 +08:00
|
|
|
zm_dump_video_frame(zm_packet->in_frame, "remote_rtsp_decode");
|
2021-02-06 01:30:51 +08:00
|
|
|
if ( ! mVideoStream->
|
|
|
|
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
|
|
|
|
codecpar
|
|
|
|
#else
|
|
|
|
codec
|
|
|
|
#endif
|
|
|
|
->width ) {
|
2021-01-30 03:04:21 +08:00
|
|
|
zm_dump_codec(mVideoCodecContext);
|
2021-02-06 01:30:51 +08:00
|
|
|
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
|
2021-01-30 03:04:21 +08:00
|
|
|
zm_dump_codecpar(mVideoStream->codecpar);
|
2021-05-09 09:14:20 +08:00
|
|
|
mVideoStream->codecpar->width = zm_packet->in_frame->width;
|
|
|
|
mVideoStream->codecpar->height = zm_packet->in_frame->height;
|
2021-02-06 01:30:51 +08:00
|
|
|
#else
|
2021-05-09 09:14:20 +08:00
|
|
|
mVideoStream->codec->width = zm_packet->in_frame->width;
|
|
|
|
mVideoStream->codec->height = zm_packet->in_frame->height;
|
2021-02-06 01:30:51 +08:00
|
|
|
#endif
|
|
|
|
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
|
2021-01-30 03:04:21 +08:00
|
|
|
zm_dump_codecpar(mVideoStream->codecpar);
|
2021-02-06 01:30:51 +08:00
|
|
|
#endif
|
2021-01-30 03:04:21 +08:00
|
|
|
}
|
2021-05-09 09:14:20 +08:00
|
|
|
zm_packet->codec_type = mVideoCodecContext->codec_type;
|
|
|
|
zm_packet->stream = mVideoStream;
|
2021-01-28 05:12:32 +08:00
|
|
|
frameComplete = true;
|
|
|
|
Debug(2, "Frame: %d - %d/%d", frameCount, bytes_consumed, buffer.size());
|
|
|
|
packet->data = nullptr;
|
|
|
|
packet->size = 0;
|
Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model. Fixes #191.
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* 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)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a94cba4d8955fcd03bd965ed2772f34d.
* Add CaptureAndRecord to vlc, still need to make it record
* Resolve SegFault on videostore
* Swap to mp4 container
* mp4 changes
* spaces to tabs, hide video stuff if video writer is turned off
* Make timeline open event.mp4 instead of mkv
* Missed mkv in timeline.js
* Fix some issues from the merge conflict
* Resolve post merge build issues with braces
* Fix whitespace
* Update Jpeg and Video options for passthrough options
* Whitespace fix zm_camera.h
* Fix array mkssing comma
* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
* Update VideoStoreData memory size comment
* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
* Fix bracket issues post merge
* Clean up comments and add av_free_packet
* Convert from event_directory to event file as per Video branch
* Testing videojs for video playback
* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
* bring recent improvements in ffmpeg capture function into captureandrecord
* Remove pict from writeAudioFramePacket as not used
* Add translate options for h264 Storage options in Monitor and update en_gb file
* Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
* Clean up videostore code and remove lots of unused code
* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
Conflicts:
web/skins/classic/views/event.php
* removed redundant field in sql query
Conflicts:
web/skins/classic/views/event.php
* local storage of video js plugin
* Beautify!
Make the code somewhat readable.
* added missing videojs.zoomrotate.js file
added missing videojs.zoomrotate.js file
* Typo
added missing "
* Added missing brackets
* fix to display thumbnails when only storing snapshot.jpg
* added control for video playback rate
Conflicts:
web/skins/classic/views/event.php
* dynamically create jpegs from video file for viewing in browser
* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
* only expose monitor info which are being used in client
* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
when libx264 is not installed
* better way of detecting showing image or video in timeline and event view
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
* Remove syslog.h
* fixed SaveJPEGs are not working
which is caused in errors introduced when merging with master
* Update README.md
* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
* Fix PRId64 issue in travis, another try
* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
* Revert space removal around PRId64
* video branch ffmpeg 2.9 fixes
ffmpeg 2.9 patched removed SSE2 CPU
* Add FFMPEGInit back
* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
also fixed bug which prevented seeking in timeline video preview
* ffmpeg 3.0 API build failure fixes
* Update README.md
* merge all the commits from the messed up iconnor_video branch
* fix whitespace
* revert
* whitespace fixes
* spelling fix
* put back some text
* add these back
* fix spelling mistake
* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
* add a test and error message if the codec is not h264
* these have been removed in master
* add a view to check auth and just send the video
* add some comments, and dump filename and AVFormatContext on failure to write header
* add the toggle for RecordAudio so that the checkbox works to turn off Audio
* Must init videoStore in constuctor
* more debug and comments, return checking
* Fix dropped part of sql query.
* fix extra else and some whitespace
* Fix missing } from merge that was preventing building.
* fix tabs
* get rid of use of separator, just use \n
* Restore lost fixes for deprecation
* Why are these failing
* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
* Forgot that I was trying to solve case of stream is true and record_audio
is false.
* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
* Merge my Rotation/Orientation work and fixes for bad h264 streams
* need arpa/inet for reverse lookups
* pull in the new byte range code for viewing videos
* Move our recording flag deeper into closeevent
* add braces and only call closeEvent if there is an event
* deprecate the z_frame_rate stuff which is deprecated in ffmpeg
* remark out some debugging
* fix for video on stream 1
* fix audio_stream to audio_st
* Ignore bad decodes
* fix problems with content-length causing viewing to not work in chrome/android
* change logic of sending file contents to handle an off by one and be more readable
* Some fixes pointed out by Maxim Romanov. Also simply the loading of events to not join the Monitors table
* fix to sql for timeline
* added RecordAudio to sql in README
* Use sub queries instead of joins to fix errors when using new mysql defaults.
* fix sql queries
* Dockerfile to build feature-h264-videostorage
* Must cast codec
* add php-acpu as a dependency
* require php5-acpu
* fix typo
* remove extra /
* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
* delete merge conflict files
* delete merge conflict files
2017-05-16 10:02:48 +08:00
|
|
|
}
|
2016-04-04 22:11:48 +08:00
|
|
|
}
|
Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model. Fixes #191.
* Initial commit for saving events as videos :)
* Add zm_video.cpp to autotools
* Add zm_video.h to autotools
* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h
* Fix serve memory leak
* Few minor code improvements
* Added the ability to override preset, tune, profile and few other improvements
* Correctly write SPS & PPS from x264 encoder headers
* Remove unnessecary SPS & PPS writing code
* Imported missing files from master to feature-h264-videostorage
* 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)
* Updates to make gcc happy
* Add html5 video control to timeline and event to support mkv playback
* Add zm_videostore.cpp to CMakeLists.txt
* Remove Modern Branch for now
* Fix minor bug
* Option handled added in master, removing duplicate declaration
* Add CaptureandRecord from zm_camera.h
* Putting placeholder in for CaptureAndRecord function
* Removed duplicate code and brackets
* add digest auth file for cmake
Conflicts:
src/CMakeLists.txt
* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"
This reverts commit d9bbcdf3a94cba4d8955fcd03bd965ed2772f34d.
* Add CaptureAndRecord to vlc, still need to make it record
* Resolve SegFault on videostore
* Swap to mp4 container
* mp4 changes
* spaces to tabs, hide video stuff if video writer is turned off
* Make timeline open event.mp4 instead of mkv
* Missed mkv in timeline.js
* Fix some issues from the merge conflict
* Resolve post merge build issues with braces
* Fix whitespace
* Update Jpeg and Video options for passthrough options
* Whitespace fix zm_camera.h
* Fix array mkssing comma
* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed
* Update VideoStoreData memory size comment
* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch
* Fix bracket issues post merge
* Clean up comments and add av_free_packet
* Convert from event_directory to event file as per Video branch
* Testing videojs for video playback
* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors
* bring recent improvements in ffmpeg capture function into captureandrecord
* Remove pict from writeAudioFramePacket as not used
* Add translate options for h264 Storage options in Monitor and update en_gb file
* Cherry-Pick from iconnor - make it compile on ubuntu 15.04. Which is libav 56.1.0
Conflicts:
src/zm_ffmpeg.cpp
src/zm_remote_camera_rtsp.cpp
Conflicts:
distros/ubuntu1204/changelog
* Clean up videostore code and remove lots of unused code
* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate
Conflicts:
web/skins/classic/views/event.php
* removed redundant field in sql query
Conflicts:
web/skins/classic/views/event.php
* local storage of video js plugin
* Beautify!
Make the code somewhat readable.
* added missing videojs.zoomrotate.js file
added missing videojs.zoomrotate.js file
* Typo
added missing "
* Added missing brackets
* fix to display thumbnails when only storing snapshot.jpg
* added control for video playback rate
Conflicts:
web/skins/classic/views/event.php
* dynamically create jpegs from video file for viewing in browser
* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)
* only expose monitor info which are being used in client
* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)
when libx264 is not installed
* better way of detecting showing image or video in timeline and event view
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22). Prefilters common packet issues. Add metadata title to generated video file
* Remove syslog.h
* fixed SaveJPEGs are not working
which is caused in errors introduced when merging with master
* Update README.md
* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues
* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here
* Fix PRId64 issue in travis, another try
* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3
* Revert space removal around PRId64
* video branch ffmpeg 2.9 fixes
ffmpeg 2.9 patched removed SSE2 CPU
* Add FFMPEGInit back
* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
also fixed bug which prevented seeking in timeline video preview
* ffmpeg 3.0 API build failure fixes
* Update README.md
* merge all the commits from the messed up iconnor_video branch
* fix whitespace
* revert
* whitespace fixes
* spelling fix
* put back some text
* add these back
* fix spelling mistake
* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines
* add a test and error message if the codec is not h264
* these have been removed in master
* add a view to check auth and just send the video
* add some comments, and dump filename and AVFormatContext on failure to write header
* add the toggle for RecordAudio so that the checkbox works to turn off Audio
* Must init videoStore in constuctor
* more debug and comments, return checking
* Fix dropped part of sql query.
* fix extra else and some whitespace
* Fix missing } from merge that was preventing building.
* fix tabs
* get rid of use of separator, just use \n
* Restore lost fixes for deprecation
* Why are these failing
* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
* Forgot that I was trying to solve case of stream is true and record_audio
is false.
* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.
* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
* Merge my Rotation/Orientation work and fixes for bad h264 streams
* need arpa/inet for reverse lookups
* pull in the new byte range code for viewing videos
* Move our recording flag deeper into closeevent
* add braces and only call closeEvent if there is an event
* deprecate the z_frame_rate stuff which is deprecated in ffmpeg
* remark out some debugging
* fix for video on stream 1
* fix audio_stream to audio_st
* Ignore bad decodes
* fix problems with content-length causing viewing to not work in chrome/android
* change logic of sending file contents to handle an off by one and be more readable
* Some fixes pointed out by Maxim Romanov. Also simply the loading of events to not join the Monitors table
* fix to sql for timeline
* added RecordAudio to sql in README
* Use sub queries instead of joins to fix errors when using new mysql defaults.
* fix sql queries
* Dockerfile to build feature-h264-videostorage
* Must cast codec
* add php-acpu as a dependency
* require php5-acpu
* fix typo
* remove extra /
* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php
* delete merge conflict files
* delete merge conflict files
2017-05-16 10:02:48 +08:00
|
|
|
} /* getFrame() */
|
|
|
|
} // end while true
|
|
|
|
|
2017-11-10 03:50:20 +08:00
|
|
|
return 1;
|
|
|
|
} // end int RemoteCameraRtsp::Capture(ZMPacket &packet)
|
2013-03-17 07:45:21 +08:00
|
|
|
|
2017-05-17 00:04:56 +08:00
|
|
|
int RemoteCameraRtsp::PostCapture() {
|
2020-12-28 01:02:02 +08:00
|
|
|
return 1;
|
2013-03-17 07:45:21 +08:00
|
|
|
}
|
|
|
|
#endif // HAVE_LIBAVFORMAT
|