ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allocate our own CodecContext for decoding. Reusing the existing one doesn't work for hwaccel. Add hwaccel flags to let it use Constrained Baseline for Baseline profile streams. Try without specified device if hwdevice_ctx_create fails.

pull/3122/head
Isaac Connor 2021-01-08 15:48:01 -05:00
parent 81d6f8c1ee
commit 736b14327e
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/zm_ffmpeg_camera.cpp
View File

@ -370,15 +370,15 @@ int FfmpegCamera::OpenFfmpeg() {
mVideoStreamId, mAudioStreamId); mVideoStreamId, mAudioStreamId);
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0) #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
// mVideoCodecContext = avcodec_alloc_context3(NULL); mVideoCodecContext = avcodec_alloc_context3(nullptr);
// avcodec_parameters_to_context(mVideoCodecContext, avcodec_parameters_to_context(mVideoCodecContext,
// mFormatContext->streams[mVideoStreamId]->codecpar); mFormatContext->streams[mVideoStreamId]->codecpar);
// this isn't copied. // this isn't copied.
// mVideoCodecContext->time_base = mVideoCodecContext->time_base =
// mFormatContext->streams[mVideoStreamId]->codec->time_base; mFormatContext->streams[mVideoStreamId]->codec->time_base;
#else #else
#endif #endif
mVideoCodecContext = mFormatContext->streams[mVideoStreamId]->codec; //mVideoCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
#ifdef CODEC_FLAG2_FAST #ifdef CODEC_FLAG2_FAST
mVideoCodecContext->flags2 |= CODEC_FLAG2_FAST | CODEC_FLAG_LOW_DELAY; mVideoCodecContext->flags2 |= CODEC_FLAG2_FAST | CODEC_FLAG_LOW_DELAY;
#endif #endif
@ -451,23 +451,23 @@ int FfmpegCamera::OpenFfmpeg() {
Debug(1, "Selected hw_pix_fmt %d %s", Debug(1, "Selected hw_pix_fmt %d %s",
hw_pix_fmt, av_get_pix_fmt_name(hw_pix_fmt)); hw_pix_fmt, av_get_pix_fmt_name(hw_pix_fmt));
mVideoCodecContext->hwaccel_flags |= AV_HWACCEL_FLAG_IGNORE_LEVEL;
//if (!lavc_param->check_hw_profile)
mVideoCodecContext->hwaccel_flags |= AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH;
ret = av_hwdevice_ctx_create(&hw_device_ctx, type, ret = av_hwdevice_ctx_create(&hw_device_ctx, type,
(hwaccel_device != "" ? hwaccel_device.c_str() : nullptr), nullptr, 0); (hwaccel_device != "" ? hwaccel_device.c_str() : nullptr), nullptr, 0);
if ( ret < 0 and hwaccel_device != "" ) {
ret = av_hwdevice_ctx_create(&hw_device_ctx, type, nullptr, nullptr, 0);
}
if ( ret < 0 ) { if ( ret < 0 ) {
Error("Failed to create hwaccel device. %s", av_make_error_string(ret).c_str()); Error("Failed to create hwaccel device. %s", av_make_error_string(ret).c_str());
if ( hwaccel_device != "" ) { hw_pix_fmt = AV_PIX_FMT_NONE;
ret = av_hwdevice_ctx_create(&hw_device_ctx, type, nullptr, nullptr, 0);
if ( ret < 0 ) {
Error("Failed to create hwaccel device. %s", av_make_error_string(ret).c_str());
hw_pix_fmt = AV_PIX_FMT_NONE;
}
} else {
hw_pix_fmt = AV_PIX_FMT_NONE;
}
} else { } else {
Debug(1, "Created hwdevice for %s", hwaccel_device.c_str()); Debug(1, "Created hwdevice for %s", hwaccel_device.c_str());
mVideoCodecContext->get_format = get_hw_format; mVideoCodecContext->get_format = get_hw_format;
mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx); mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx);
hwFrame = zm_av_frame_alloc(); hwFrame = zm_av_frame_alloc();
} }
} else { } else {
@ -569,7 +569,7 @@ int FfmpegCamera::Close() {
if ( mVideoCodecContext ) { if ( mVideoCodecContext ) {
avcodec_close(mVideoCodecContext); avcodec_close(mVideoCodecContext);
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0) #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
// avcodec_free_context(&mVideoCodecContext); avcodec_free_context(&mVideoCodecContext);
#endif #endif
mVideoCodecContext = nullptr; // Freed by av_close_input_file mVideoCodecContext = nullptr; // Freed by av_close_input_file
} }