From patchwork Fri Jun 7 13:01:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 49671 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1018666vqo; Fri, 7 Jun 2024 06:19:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVT6z9eQHLfwDMl+cl8u72Gvs+QfulRbigxRq9iVGcQ35REfHoM2LQqQUHgEXdyuhqHcI7jxjrqI+N8yRh06SJ9km6Jk5Ayjy49PA== X-Google-Smtp-Source: AGHT+IHCmUg14GIMbV86cdnZxpQUk2ABD49d3CoU9MlU/bBtyxZ58GOCQy9Qz52nsnwud/CMMBb7 X-Received: by 2002:a17:906:380b:b0:a68:eade:17af with SMTP id a640c23a62f3a-a6cd665fca6mr189679666b.25.1717766349606; Fri, 07 Jun 2024 06:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717766349; cv=none; d=google.com; s=arc-20160816; b=R14cH3Z8AJIucVsgcCPdqhnzLO2obQ0wPbN7tbHIp4b7xdJvuHMOPP8bVMsikjg5Oi w8YNZC+Ay65Ioh+ZHIeDYQ7FIh/3rsa/qneen4mTo2zjnMbt2a13uPflImrZOq3tR24A 4eZlvdgyq5QjtrlknohrhSklIA5cqw7l1edDCLxF3O9LvSFidXYjLxXyEm9c+uxRJfuC QWokOHP2JTKyTyk9h0twsMSW7XgqtZbkJyFMb4XuJausql21OoLjNpSjvRdVflVwH4qo t3s/oZiVIvkm9/nwh9f/ZoBoJ8NfkmyXfIOJRNVfPnJDCl7LYfjXehJdD31Tju3C7RFv PbqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=egrfVuN1E1ld9K9+UIGZ+mAAAU/KKplgfUjNv+0A89E=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=xOb/v/PWBtuVQHkeP7wfFfuPptzTqIYc79UI17YLFFSMtOmnLDKPDx8lRSMVbmy8a0 iCHum5T78fRLkv4vxAJqwzjXyKBHV1Defqjlqv1uupgpkBvnj9HAb1YHFAlye9VJB4TZ BR3tblaKt2JONFWHq26Gz5fGYTq7I4o1+pdguIHkuL8mila54bKiCBQPAzl4xmM4BUnj mc3c5Y9q9BQhy0+BAx9zQjXOEVdzPMgqSoTbPHMGJHPPM8aodwf2MyZ+5ByZKNVavtPI gqY+VT3B4TIqkOZsluf8+mPKuApYbbNkHQADV92yA27Ou3AzV+qPrDLNV9ZJeRw1dmFY hmDw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="sB0/tT0w"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6c80591cebsi186787066b.36.2024.06.07.06.19.09; Fri, 07 Jun 2024 06:19:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="sB0/tT0w"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E0BE68D7D5; Fri, 7 Jun 2024 16:08:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DF7668D883 for ; Fri, 7 Jun 2024 16:08:45 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=sB0/tT0w; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 298ED4DBC for ; Fri, 7 Jun 2024 15:08:45 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id n6y075bVh-jz for ; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1717765724; bh=L3mfQq3CId1Y1SArgMRDjx4TU/fdy6B88z737ZL+XwM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=sB0/tT0wMvPV/8ePtCytwMJ2KT3j58NaK/qL1dA05LRPrMt7HDYOTBfG0H7jQ3a6+ wfCiVOxCxwDBqick7txELRBGqAFWSX5sJiZrAuQvGrRrxlRPSEpi0uq9tNeoV2zvMv xU5ZRrZqem2ga4gQ9lGY6cnP0LG84dC/V3vPZqZwqUSiWttLBHReqw6LWlF9EuRT/s EhFDEz35MDf4k0tG86MeTpp90B7KcYdax8RuTao1LBf3F3ODsJvDjdPD7V8ItcBeo7 jL+xtxN0We8HpvkSa8qyajWjURV1X5zyQOxBxnQrE+HzbJL/dAs50I3bAVMFttI2jE l3qB1IiRL4M9g== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 9A74D4D9D for ; Fri, 7 Jun 2024 15:08:44 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 1616E3A274F for ; Fri, 07 Jun 2024 15:03:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 15:01:33 +0200 Message-ID: <20240607130135.9088-37-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240607130135.9088-1-anton@khirnov.net> References: <20240607130135.9088-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 37/39] lavc/hevcdec: move some frame-end code to hevc_frame_end() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HKpSEp330jlR Specifically, calling hwaccel end_frame, verifying frame checksum, and printing the frame-was-decoded message. --- libavcodec/hevc/hevcdec.c | 187 +++++++++++++++++++------------------- libavcodec/hevc/hevcdec.h | 1 - 2 files changed, 91 insertions(+), 97 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 7263b80a24..a8c2172674 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -2942,7 +2942,6 @@ static int hevc_frame_start(HEVCContext *s) ff_hevc_clear_refs(s); } - s->is_decoded = 0; s->slice_idx = 0; s->first_nal_type = s->nal_unit_type; s->poc = s->sh.poc; @@ -3038,6 +3037,75 @@ fail: return ret; } +static int verify_md5(HEVCContext *s, AVFrame *frame) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + char msg_buf[4 * (50 + 2 * 2 * 16 /* MD5-size */)]; + int pixel_shift; + int err = 0; + int i, j; + + if (!desc) + return AVERROR(EINVAL); + + pixel_shift = desc->comp[0].depth > 8; + + /* the checksums are LE, so we have to byteswap for >8bpp formats + * on BE arches */ +#if HAVE_BIGENDIAN + if (pixel_shift && !s->checksum_buf) { + av_fast_malloc(&s->checksum_buf, &s->checksum_buf_size, + FFMAX3(frame->linesize[0], frame->linesize[1], + frame->linesize[2])); + if (!s->checksum_buf) + return AVERROR(ENOMEM); + } +#endif + + msg_buf[0] = '\0'; + for (i = 0; frame->data[i]; i++) { + int width = s->avctx->coded_width; + int height = s->avctx->coded_height; + int w = (i == 1 || i == 2) ? (width >> desc->log2_chroma_w) : width; + int h = (i == 1 || i == 2) ? (height >> desc->log2_chroma_h) : height; + uint8_t md5[16]; + + av_md5_init(s->md5_ctx); + for (j = 0; j < h; j++) { + const uint8_t *src = frame->data[i] + j * frame->linesize[i]; +#if HAVE_BIGENDIAN + if (pixel_shift) { + s->bdsp.bswap16_buf((uint16_t *) s->checksum_buf, + (const uint16_t *) src, w); + src = s->checksum_buf; + } +#endif + av_md5_update(s->md5_ctx, src, w << pixel_shift); + } + av_md5_final(s->md5_ctx, md5); + +#define MD5_PRI "%016" PRIx64 "%016" PRIx64 +#define MD5_PRI_ARG(buf) AV_RB64(buf), AV_RB64((const uint8_t*)(buf) + 8) + + if (!memcmp(md5, s->sei.picture_hash.md5[i], 16)) { + av_strlcatf(msg_buf, sizeof(msg_buf), + "plane %d - correct " MD5_PRI "; ", + i, MD5_PRI_ARG(md5)); + } else { + av_strlcatf(msg_buf, sizeof(msg_buf), + "mismatching checksum of plane %d - " MD5_PRI " != " MD5_PRI "; ", + i, MD5_PRI_ARG(md5), MD5_PRI_ARG(s->sei.picture_hash.md5[i])); + err = AVERROR_INVALIDDATA; + } + } + + av_log(s->avctx, err < 0 ? AV_LOG_ERROR : AV_LOG_DEBUG, + "Verifying checksum for frame with POC %d: %s\n", + s->poc, msg_buf); + + return err; + } + static int hevc_frame_end(HEVCContext *s) { HEVCFrame *out = s->cur_frame; @@ -3062,6 +3130,28 @@ static int hevc_frame_end(HEVCContext *s) av_assert1(ret >= 0); } + if (s->avctx->hwaccel) { + ret = FF_HW_SIMPLE_CALL(s->avctx, end_frame); + if (ret < 0) { + av_log(s->avctx, AV_LOG_ERROR, + "hardware accelerator failed to decode picture\n"); + ff_hevc_unref_frame(s->cur_frame, ~0); + return ret; + } + } else { + if (s->avctx->err_recognition & AV_EF_CRCCHECK && + s->sei.picture_hash.is_md5) { + ret = verify_md5(s, s->cur_frame->f); + if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) { + ff_hevc_unref_frame(s->cur_frame, ~0); + return ret; + } + } + } + s->sei.picture_hash.is_md5 = 0; + + av_log(s->avctx, AV_LOG_DEBUG, "Decoded frame with POC %d.\n", s->poc); + return 0; } @@ -3109,7 +3199,6 @@ static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb) ret = hevc_frame_end(s); if (ret < 0) return ret; - s->is_decoded = 1; } return 0; @@ -3290,75 +3379,6 @@ fail: return ret; } -static int verify_md5(HEVCContext *s, AVFrame *frame) -{ - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); - char msg_buf[4 * (50 + 2 * 2 * 16 /* MD5-size */)]; - int pixel_shift; - int err = 0; - int i, j; - - if (!desc) - return AVERROR(EINVAL); - - pixel_shift = desc->comp[0].depth > 8; - - /* the checksums are LE, so we have to byteswap for >8bpp formats - * on BE arches */ -#if HAVE_BIGENDIAN - if (pixel_shift && !s->checksum_buf) { - av_fast_malloc(&s->checksum_buf, &s->checksum_buf_size, - FFMAX3(frame->linesize[0], frame->linesize[1], - frame->linesize[2])); - if (!s->checksum_buf) - return AVERROR(ENOMEM); - } -#endif - - msg_buf[0] = '\0'; - for (i = 0; frame->data[i]; i++) { - int width = s->avctx->coded_width; - int height = s->avctx->coded_height; - int w = (i == 1 || i == 2) ? (width >> desc->log2_chroma_w) : width; - int h = (i == 1 || i == 2) ? (height >> desc->log2_chroma_h) : height; - uint8_t md5[16]; - - av_md5_init(s->md5_ctx); - for (j = 0; j < h; j++) { - const uint8_t *src = frame->data[i] + j * frame->linesize[i]; -#if HAVE_BIGENDIAN - if (pixel_shift) { - s->bdsp.bswap16_buf((uint16_t *) s->checksum_buf, - (const uint16_t *) src, w); - src = s->checksum_buf; - } -#endif - av_md5_update(s->md5_ctx, src, w << pixel_shift); - } - av_md5_final(s->md5_ctx, md5); - -#define MD5_PRI "%016" PRIx64 "%016" PRIx64 -#define MD5_PRI_ARG(buf) AV_RB64(buf), AV_RB64((const uint8_t*)(buf) + 8) - - if (!memcmp(md5, s->sei.picture_hash.md5[i], 16)) { - av_strlcatf(msg_buf, sizeof(msg_buf), - "plane %d - correct " MD5_PRI "; ", - i, MD5_PRI_ARG(md5)); - } else { - av_strlcatf(msg_buf, sizeof(msg_buf), - "mismatching checksum of plane %d - " MD5_PRI " != " MD5_PRI "; ", - i, MD5_PRI_ARG(md5), MD5_PRI_ARG(s->sei.picture_hash.md5[i])); - err = AVERROR_INVALIDDATA; - } - } - - av_log(s->avctx, err < 0 ? AV_LOG_ERROR : AV_LOG_DEBUG, - "Verifying checksum for frame with POC %d: %s\n", - s->poc, msg_buf); - - return err; -} - static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int length, int first) { int ret, i; @@ -3424,31 +3444,6 @@ static int hevc_decode_frame(AVCodecContext *avctx, AVFrame *rframe, if (ret < 0) return ret; - if (avctx->hwaccel) { - if (s->cur_frame && (ret = FF_HW_SIMPLE_CALL(avctx, end_frame)) < 0) { - av_log(avctx, AV_LOG_ERROR, - "hardware accelerator failed to decode picture\n"); - ff_hevc_unref_frame(s->cur_frame, ~0); - return ret; - } - } else { - /* verify the SEI checksum */ - if (avctx->err_recognition & AV_EF_CRCCHECK && s->cur_frame && s->is_decoded && - s->sei.picture_hash.is_md5) { - ret = verify_md5(s, s->cur_frame->f); - if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) { - ff_hevc_unref_frame(s->cur_frame, ~0); - return ret; - } - } - } - s->sei.picture_hash.is_md5 = 0; - - if (s->is_decoded) { - av_log(avctx, AV_LOG_DEBUG, "Decoded frame with POC %d.\n", s->poc); - s->is_decoded = 0; - } - if (s->output_frame->buf[0]) { av_frame_move_ref(rframe, s->output_frame); *got_output = 1; diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h index f0443b3ab9..da4d83e661 100644 --- a/libavcodec/hevc/hevcdec.h +++ b/libavcodec/hevc/hevcdec.h @@ -488,7 +488,6 @@ typedef struct HEVCContext { int bs_width; int bs_height; - int is_decoded; // NoRaslOutputFlag associated with the last IRAP frame int no_rasl_output_flag;