From patchwork Tue Sep 12 11:40:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Guillem X-Patchwork-Id: 43709 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2721127pzb; Tue, 12 Sep 2023 04:40:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5aaVSF14jqJUANkoQRFtz0sAUzF4BXRPgcVIOKIG2KspMVt/+Stcu1kFdjiWcRHeGU68H X-Received: by 2002:a17:906:319a:b0:9a6:1446:852c with SMTP id 26-20020a170906319a00b009a61446852cmr11103928ejy.27.1694518835827; Tue, 12 Sep 2023 04:40:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694518835; cv=none; d=google.com; s=arc-20160816; b=paU/Hd/6QW7f/UO7P3nnuY+t1BMFs0FhNtl6AGTK/QUTlj9qBrgqxIbppEm563Ll67 XlJbCekV/nS8q7D2XJQAaciK47ALjK3sE4zOitLZn9//1PEqd265gMOHpJKlnyieZKtE 0ZeNwkY6BJCzLF23O6EmmqAMaj3kOb/mZCqHHbPB4aV0D11iYeQWM3BMW9nG4Y893j4M Lx/hivQeqLHCjPCMRHMnxk0UASH+vRnW+FNkvDbfLbSHyC/9wv2R4/KU1qwBtTqmIWZQ vkJ4riiVsmXKXdj1AMf1eXI08v+lX3zdgNAdS+rWUSfu/6sLk4jJyfQ1RYXSutEZNZ5h LC/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to :feedback-id:delivered-to; bh=IAdkUMfeQT8IGOPAem5X3e/FI1TnkT79MWpNdcExZ38=; fh=3LY024vSFS/PP4LTfcCy63MQoPE5JAibP23dzfT0gvE=; b=TdqGuw5vIS0rHz3m5MJbhHomkR0ZC9qelP70Q0TsNQ3vjoqO2c/xegd7MA1dkC2BFX aoQZdt5VSmjaktYKrVnvKlQd+tX9j9Xvo/KvfGmMvQFYj/omZUCoST+DbtQ37/gbZG53 55CvInEXwOhOQRH8fJ4rPz4lGqQa58ltN8SaBRzh3CptVootC/YLplsRgJ1xjp02jxv0 gRs8Y/LylPajCh6UgJ50KXHAXk5l28FBOwgvKWhEM/g7qUc7GdZEZ4JrVZIZJ2+/uhqM GoDJdvXkJ/406X8rfV0GJvllJnp8Vq/mU7hnYzrIRU2O8/coEotCxJU6kPTAqeUNYhKa UisA== ARC-Authentication-Results: i=1; mx.google.com; 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 u22-20020a1709060b1600b0098e47bbff3csi8154021ejg.297.2023.09.12.04.40.32; Tue, 12 Sep 2023 04:40:35 -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; 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 148CF68C8E9; Tue, 12 Sep 2023 14:40:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 231CB68C90E for ; Tue, 12 Sep 2023 14:40:20 +0300 (EEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id A842B5C02E0 for ; Tue, 12 Sep 2023 07:40:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 12 Sep 2023 07:40:18 -0400 X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudeiiedggedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomhepvfhhohhmrghsucfiuhhilhhlvghmuceothhhohhmrghssehglhhl mhdrfhhrqeenucggtffrrghtthgvrhhnpefgtdelgfevtddtledufeetgfefjeehgefhvd evffevgfdtvedtkeejieekvefgjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehthhhomhgrshesghhllhhmrdhfrh X-ME-Proxy: Feedback-ID: i239440f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 12 Sep 2023 07:40:17 -0400 (EDT) To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Sep 2023 13:40:13 +0200 Message-Id: <20230912114015.59937-1-thomas@gllm.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] error_resilience: set the decode_error_flags outside 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: , X-Patchwork-Original-From: Thomas Guillem via ffmpeg-devel From: Thomas Guillem Reply-To: FFmpeg development discussions and patches Cc: Thomas Guillem Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ++2P716HLqte This will allow to fix data-races when ff_er_frame_end() is called after ff_thread_finish_setup() --- libavcodec/error_resilience.c | 12 ++++++------ libavcodec/error_resilience.h | 2 +- libavcodec/h263dec.c | 6 ++++-- libavcodec/h264dec.c | 3 ++- libavcodec/mpeg12dec.c | 3 ++- libavcodec/mss2.c | 8 +++++--- libavcodec/rv10.c | 10 ++++++++-- libavcodec/rv34.c | 12 +++++++++--- libavcodec/vc1dec.c | 6 ++++-- 9 files changed, 41 insertions(+), 21 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 68e20925e0..1f43b233ff 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -889,7 +889,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, } } -void ff_er_frame_end(ERContext *s) +int ff_er_frame_end(ERContext *s) { int *linesize = NULL; int i, mb_x, mb_y, error, error_type, dc_error, mv_error, ac_error; @@ -906,7 +906,7 @@ void ff_er_frame_end(ERContext *s) !er_supported(s) || atomic_load(&s->error_count) == 3 * s->mb_width * (s->avctx->skip_top + s->avctx->skip_bottom)) { - return; + return 0; } linesize = s->cur_pic.f->linesize; @@ -921,7 +921,7 @@ void ff_er_frame_end(ERContext *s) if (mb_x == s->mb_width) { av_log(s->avctx, AV_LOG_DEBUG, "ignoring last missing slice\n"); - return; + return 0; } } @@ -960,7 +960,7 @@ void ff_er_frame_end(ERContext *s) s->cur_pic.ref_index[i] = NULL; s->cur_pic.motion_val[i] = NULL; } - return; + return 0; } } @@ -1114,8 +1114,6 @@ void ff_er_frame_end(ERContext *s) av_log(s->avctx, AV_LOG_INFO, "concealing %d DC, %d AC, %d MV errors in %c frame\n", dc_error, ac_error, mv_error, av_get_picture_type_char(s->cur_pic.f->pict_type)); - s->cur_pic.f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; - is_intra_likely = is_intra_more_likely(s); /* set unknown mb-type to most likely */ @@ -1352,4 +1350,6 @@ void ff_er_frame_end(ERContext *s) memset(&s->cur_pic, 0, sizeof(ERPicture)); memset(&s->last_pic, 0, sizeof(ERPicture)); memset(&s->next_pic, 0, sizeof(ERPicture)); + + return 1; } diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 47cc8a4fc6..a8cf73c72e 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -90,7 +90,7 @@ typedef struct ERContext { } ERContext; void ff_er_frame_start(ERContext *s); -void ff_er_frame_end(ERContext *s); +int ff_er_frame_end(ERContext *s); void ff_er_add_slice(ERContext *s, int startx, int starty, int endx, int endy, int status); diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 52e51dd489..3e83d90586 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -621,8 +621,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 = FF_HW_SIMPLE_CALL(avctx, end_frame); diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index f13b1081fc..553f300c3d 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -779,7 +779,8 @@ end: if (sl->ref_count[1]) ff_h264_set_erpic(&h->er.next_pic, sl->ref_list[1][0].parent); - ff_er_frame_end(&h->er); + if (ff_er_frame_end(&h->er) > 0) + h->cur_pic_ptr->f->decode_error_flags |= FF_DECODE_ERROR_CONCEALMENT_ACTIVE; if (use_last_pic) memset(&sl->ref_list[0][0], 0, sizeof(sl->ref_list[0][0])); } diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 1accd07e9e..b2cc78c3d3 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2033,7 +2033,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 70aa56cb84..29cb4be614 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 5edd934f82..6d7ae8f903 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 af4d6a3400..cae6e9d81b 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 b8663aaf98..7113abd0a9 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1347,8 +1347,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);