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

Support hwaccel for non-passthrough case as well

This commit is contained in:
Isaac Connor 2019-08-21 10:11:58 -04:00
parent 01e988ffba
commit 886a203bf1
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/zm_ffmpeg_camera.cpp
View File

@ -269,9 +269,38 @@ int FfmpegCamera::Capture(Image &image) {
} }
frameComplete = 1; frameComplete = 1;
Debug(4, "Decoded video packet at frame %d", frameCount); zm_dump_video_frame(mRawFrame, "raw frame from decoder");
if ( transfer_to_image(image, mFrame, mRawFrame) < 0 ) { #if HAVE_LIBAVUTIL_HWCONTEXT_H
#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
if (
(hw_pix_fmt != AV_PIX_FMT_NONE)
&&
(mRawFrame->format == hw_pix_fmt)
) {
/* retrieve data from GPU to CPU */
ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0);
if ( ret < 0 ) {
Error("Unable to transfer frame at frame %d: %s, continuing",
frameCount, av_make_error_string(ret).c_str());
zm_av_packet_unref(&packet);
continue;
}
zm_dump_video_frame(hwFrame, "After hwtransfer");
hwFrame->pts = mRawFrame->pts;
input_frame = hwFrame;
} else {
#endif
#endif
input_frame = mRawFrame;
#if HAVE_LIBAVUTIL_HWCONTEXT_H
#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
}
#endif
#endif
if ( transfer_to_image(image, mFrame, input_frame) < 0 ) {
zm_av_packet_unref(&packet); zm_av_packet_unref(&packet);
return -1; return -1;
} }