From patchwork Fri Jul 21 13:37:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 42886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp228613pzb; Fri, 21 Jul 2023 06:38:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlFNS0K6EyqUPpnhvYWFBKWjruLb6KD3H+j5LYLcdJKCvmu7fbM8CFiSog80xwQA0JfLZPwt X-Received: by 2002:a17:906:7a1b:b0:98e:1c4b:10bb with SMTP id d27-20020a1709067a1b00b0098e1c4b10bbmr1697485ejo.35.1689946713426; Fri, 21 Jul 2023 06:38:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689946713; cv=none; d=google.com; s=arc-20160816; b=zSKV4/c4WLC88yK99XsJPtdbXkgFl4WPow8/C4EOf5GuG1mYymT6j4GHWI/ikuGmDk bUZWJvN53EA9+cw7xYDC36PpiIwRk79ki8aMYGsKnW098I8XZDtKjzOxUuXqIXjKHp+K Rk1XOCdwo+caFw8k9Gy7EajNxuoGuSQ74vBR/jaLMm1qRecbLBBjWN4XBIgiidVrfl3Z TsrAfjZdTbxteIuYZ9x1XYgptKco3qzfypKssfxyMVsRyrwSOzglVVuaqbzKHnZnZKed iL/L179WzxS20IGss78gBnPns6zpn+/aObe4z/9w2s2yGXCEHlxvOOjbKo2Tvxz20zDh 3SnA== 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:feedback-id:dkim-signature:dkim-signature:delivered-to; bh=dkMJkzt7Afhjk4XrM57mBNCZv4tifBJE4t1Du2DSJ8g=; fh=RX379NAUHdZIU7CQlxbXTMt5HBBB5CUKf4o4OtPlQjY=; b=Bw4ElxNq5dee3v4zfxK67utOT8ED61eOb8El7WDTUtvIQeVaFZ64nN1p3/fNVnM5IX jVh/eYApdbj0iDVxB2HNQccIZIzsfgvEq2AfMOpe9fwZdxvfiYrciYw4NR6j7GtCRNjG 2k4KMRNF7ea241Xjk06vhz5yx28G83j+8SAostLtBKUySq4VBiUtTxmC/Rx3u3u+uc+0 cz6xsSszaWlFiyX8l8mZpk8th3QfqK5kVexHjMzdgk+ejH5c4b9b9EfIy8rz+B2PFrMW uyCkeINnsozZ/xW4Z9+n34gSmFuhx4yzrBZtkRDCo69MFJBEhT88sJeza9xRBDTSGabE VnAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=XqlFDkR3; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=AfcpOKnE; 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 ot18-20020a170906ccd200b0099b495adc29si2053620ejb.545.2023.07.21.06.38.33; Fri, 21 Jul 2023 06:38:33 -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=@itanimul.li header.s=fm1 header.b=XqlFDkR3; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=AfcpOKnE; 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 34DED68C638; Fri, 21 Jul 2023 16:38:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37D6968C1B8 for ; Fri, 21 Jul 2023 16:37:53 +0300 (EEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 525595C0167 for ; Fri, 21 Jul 2023 09:37:52 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 21 Jul 2023 09:37:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1689946672; x= 1690033072; bh=buSnVS+aLDQ552UrZEV5btzaCDrpUUIdNu37FDBmJ18=; b=X qlFDkR3Heq4YMUE0g+dhCB3MJv4+OcUsHxV5eUMvny1qCXd5qeO0w008S5fLkR/m qiZU7QI41cNX2m2JXjLbfYH32iSqJRnzkLJSecr4jYmnEgzVjt/vRYs1URAjdcJk Bjkr+oPxtJM6l+kIVoZ+UTqAY4wDoB6DbsD3SwXFTZR1BIPEnQjCmyZPaeKUqlFM XmxJ/SGOwxwkFzwiLVeEskWOsg5W6ICkJ7R/EJmLCGguy4+uBUNU9roCUGyduRYb a54jrGDEywpUSXYT20/JQq08E0YMM59POEftC7FxaN4f7TKSBs6tDT/lBcZPKLBm A2gAONTfi3UhcNMKhH1iw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1689946672; x=1690033072; bh=b uSnVS+aLDQ552UrZEV5btzaCDrpUUIdNu37FDBmJ18=; b=AfcpOKnEOrfzWsUlU LIJLA85wQOciWz4HIS8c/PzXNt7Ajg4YM5Ed3v81taM+SuEq9QUzFV/oSiQwMC/7 fl5kondWPs2ycKvbHQTgdI1oBYWyaAg/mTQRphSGF6n2LTGckbFPZa09GcaXi5By S0npoLFvX4EdZw4n6HhcPbHB6eKcyVWdcTjwsTLFS3wyaMrNFhx/Sl5+loRsNsx8 7xsKcj/VSjQjxI/hkFinwUuhC7VGVA54UmF9tT5LfdPJVRkGkuaUR9CMaI/vsp0Q zSNpY3OvQimGaKsKV1IlLS/O6kCAJxlJGcTcvi8shbYH9JBf+8GhXo8Vn6u+IxMu oXY2Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrhedvgdeifecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeegvdfhffduudegheevieekieeffefgveffke dtheekieefhfevueetueefhfetteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 21 Jul 2023 09:37:51 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jul 2023 15:37:43 +0200 Message-ID: <20230721133746.33335-4-jdek@itanimul.li> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721133746.33335-1-jdek@itanimul.li> References: <20230721133746.33335-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] lavc: set decode_error_flags when ec active 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: gEflbt0Pvr+W FF_DECODE_ERROR_CONCEALMENT_ACTIVE should be set when ec is active on supported decoders. Co-Authored-By: Thomas Guillem Signed-off-by: J. Dekker --- libavcodec/h263dec.c | 6 ++++-- libavcodec/mpeg12dec.c | 3 ++- libavcodec/mss2.c | 8 +++++--- libavcodec/rv10.c | 10 ++++++++-- libavcodec/rv34.c | 12 +++++++++--- libavcodec/vc1dec.c | 6 ++++-- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 68a618a7ed..f3b9f09303 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -620,8 +620,10 @@ retry: av_assert1(s->bitstream_buffer_size == 0); frame_end: - if (!s->studio_profile) - ff_er_frame_end(&s->er); + if (!s->studio_profile) { + if (ff_er_frame_end(&s->er) > 0) + s->current_picture.f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; + } if (avctx->hwaccel) { ret = avctx->hwaccel->end_frame(avctx); diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 27b45c6fc4..82a1e56b67 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2038,7 +2038,8 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) if (/* s->mb_y << field_pic == s->mb_height && */ !s->first_field && !s1->first_slice) { /* end of image */ - ff_er_frame_end(&s->er); + if (ff_er_frame_end(&s->er) > 0) + s->current_picture_ptr->f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; ff_mpv_frame_end(s); diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 98103f7fed..851346b0ad 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -421,8 +421,12 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, ff_vc1_decode_blocks(v); + f = s->current_picture.f; + if (v->end_mb_x == s->mb_width && s->end_mb_y == s->mb_height) { - ff_er_frame_end(&s->er); + if (ff_er_frame_end(&s->er) > 0) + f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; + } else { av_log(v->s.avctx, AV_LOG_WARNING, "disabling error correction due to block count mismatch %dx%d != %dx%d\n", @@ -431,8 +435,6 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, ff_mpv_frame_end(s); - f = s->current_picture.f; - if (v->respic == 3) { ctx->dsp.upsample_plane(f->data[0], f->linesize[0], w, h); ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w+1 >> 1, h+1 >> 1); diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index bb1ead5002..09a1d4dba6 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -440,6 +440,12 @@ static av_cold int rv10_decode_end(AVCodecContext *avctx) return 0; } +static void rv10_er_frame_end(MpegEncContext *s) +{ + if (ff_er_frame_end(&s->er) > 0) + s->current_picture_ptr->f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; +} + static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, int buf_size, int buf_size2, int whole_size) { @@ -477,7 +483,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, if ((s->mb_x == 0 && s->mb_y == 0) || !s->current_picture_ptr) { // FIXME write parser so we always have complete frames? if (s->current_picture_ptr) { - ff_er_frame_end(&s->er); + rv10_er_frame_end(s); ff_mpv_frame_end(s); s->mb_x = s->mb_y = s->resync_mb_x = s->resync_mb_y = 0; } @@ -649,7 +655,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, AVFrame *pict, } if (s->current_picture_ptr && s->mb_y >= s->mb_height) { - ff_er_frame_end(&s->er); + rv10_er_frame_end(s); ff_mpv_frame_end(s); if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 51f18147af..c6231adf5f 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1554,13 +1554,19 @@ static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n, in return buf_size; } +static void rv34_er_frame_end(MpegEncContext *s) +{ + if (ff_er_frame_end(&s->er) > 0) + s->current_picture_ptr->f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; +} + static int finish_frame(AVCodecContext *avctx, AVFrame *pict) { RV34DecContext *r = avctx->priv_data; MpegEncContext *s = &r->s; int got_picture = 0, ret; - ff_er_frame_end(&s->er); + rv34_er_frame_end(s); ff_mpv_frame_end(s); s->mb_num_left = 0; @@ -1655,7 +1661,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, AVFrame *pict, av_log(avctx, AV_LOG_ERROR, "New frame but still %d MB left.\n", s->mb_num_left); if (!s->context_reinit) - ff_er_frame_end(&s->er); + rv34_er_frame_end(s); ff_mpv_frame_end(s); } @@ -1790,7 +1796,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, AVFrame *pict, av_log(avctx, AV_LOG_INFO, "marking unfished frame as finished\n"); /* always mark the current frame as finished, frame-mt supports * only complete frames */ - ff_er_frame_end(&s->er); + rv34_er_frame_end(s); ff_mpv_frame_end(s); s->mb_num_left = 0; ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0); diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 9e343d003f..d930502176 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1321,8 +1321,10 @@ static int vc1_decode_frame(AVCodecContext *avctx, AVFrame *pict, } if ( !v->field_mode && avctx->codec_id != AV_CODEC_ID_WMV3IMAGE - && avctx->codec_id != AV_CODEC_ID_VC1IMAGE) - ff_er_frame_end(&s->er); + && avctx->codec_id != AV_CODEC_ID_VC1IMAGE) { + if (ff_er_frame_end(&s->er) > 0) + s->current_picture.f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; + } } ff_mpv_frame_end(s);