mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-30 19:52:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add frame format to debug logging. Use fix_deprecated_fmt to fix when ctx->fmt is yuvj420p instead of yuv420p

Browse Source
This commit is contained in:
Isaac Connor
2021-02-22 15:48:16 -05:00
parent 8a417bb8d2
commit 730cd815d3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_packet.cpp
View File

@@ -165,10 +165,11 @@ int ZMPacket::decode(AVCodecContext *ctx) {
#if HAVE_LIBAVUTIL_HWCONTEXT_H
#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
if ( ctx->sw_pix_fmt != in_frame->format ) {
Debug(1, "Have different format %s != %s.",
if ( fix_deprecated_pix_fmt(ctx->sw_pix_fmt) != in_frame->format ) {
Debug(1, "Have different format ctx->pix_fmt %s ?= ctx->sw_pix_fmt %s in_frame->format %s.",
av_get_pix_fmt_name(ctx->pix_fmt),
av_get_pix_fmt_name(ctx->sw_pix_fmt)
av_get_pix_fmt_name(ctx->sw_pix_fmt),
av_get_pix_fmt_name(static_cast<AVPixelFormat>(in_frame->format))
);
#if 0
if ( target_format == AV_PIX_FMT_NONE and ctx->hw_frames_ctx and (image->Colours() == 4) ) {