ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2019-06-25 22:19:27 -04:00
parent cf5cffa876 2a65b339c1
commit 6390f99e2f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_ffmpeg_camera.cpp
View File

@ -151,6 +151,9 @@ FfmpegCamera::FfmpegCamera(
have_video_keyframe = false; have_video_keyframe = false;
packetqueue = NULL; packetqueue = NULL;
error_count = 0; error_count = 0;
#if HAVE_LIBAVUTIL_HWCONTEXT_H
hw_pix_fmt = AV_PIX_FMT_NONE;
#endif
#if HAVE_LIBSWSCALE #if HAVE_LIBSWSCALE
mConvertContext = NULL; mConvertContext = NULL;
@ -915,7 +918,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
if ( error_count > 0 ) error_count --; if ( error_count > 0 ) error_count --;
zm_dump_video_frame(mRawFrame); zm_dump_video_frame(mRawFrame);
#if HAVE_LIBAVUTIL_HWCONTEXT_H #if HAVE_LIBAVUTIL_HWCONTEXT_H
if ( mRawFrame->format == hw_pix_fmt ) { if ( hw_pix_fmt != mRawFrame->format == hw_pix_fmt ) {
/* retrieve data from GPU to CPU */ /* retrieve data from GPU to CPU */
ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0); ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0);
if ( ret < 0 ) { if ( ret < 0 ) {

2
src/zm_ffmpeg_camera.h
View File

@ -63,8 +63,8 @@ class FfmpegCamera : public Camera {
AVFrame *hwFrame; AVFrame *hwFrame;
#if HAVE_LIBAVUTIL_HWCONTEXT_H #if HAVE_LIBAVUTIL_HWCONTEXT_H
DecodeContext decode; DecodeContext decode;
#endif
AVBufferRef *hw_device_ctx = NULL; AVBufferRef *hw_device_ctx = NULL;
#endif
// Used to store the incoming packet, it will get copied when queued. // Used to store the incoming packet, it will get copied when queued.
// We only ever need one at a time, so instead of constantly allocating // We only ever need one at a time, so instead of constantly allocating