From patchwork Sun Apr 9 14:26:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 41076 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1598735pzb; Sun, 9 Apr 2023 07:27:13 -0700 (PDT) X-Google-Smtp-Source: AKy350bapr5I+R6UFP2gv2MZtw5DO8LxUSHBkKOSmgGRHRW8teqg3q1PQnaSmaBy0kTUHN4r/C1y X-Received: by 2002:a05:6402:611:b0:502:4c82:9b4d with SMTP id n17-20020a056402061100b005024c829b4dmr9096186edv.15.1681050433326; Sun, 09 Apr 2023 07:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681050433; cv=none; d=google.com; s=arc-20160816; b=uz9R/YHD89YW5HoSBqpkSaYmZgREjUH8ImZ4X6kALAN8lN3YhXT+FzBO4tUjoyzT/h CzRjnF/tbBZ26dMqedMB8fezVz4xmfw77C5/Jgx2/pmHHRFb/tcq7L9k0ZNfuiu/GaHA XdGnfzambAQfT4eQG6cpzngVoXM7b1y9j/l2ou9nS8yuNBfvrlHp24k3bHJylu+P4i9j a6ybsfLkddjMaBlyaalKkUvm2eeQjQLe50MfbUmt4Ei1zh3LgfDrB0UQ43YbXG/G4lYl 3RrY6+GFlA1kMVo3cwYzAAR5KojQxBKZw2qhU4ftT0vKvaYOoUhlzM7CvxRfmPxprY+E m31Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=gExVGhO7P91mq+mgz6HUoxGEy493uXD6dn4ieJxLocQ=; b=xE7Lc9B8J5sKrKgg8mCyl58gce/74H+Yh2YWGpFiR5H1X+qDMn63Enat83OCPM4H3w Lk4SkEkxsye5E095xM7j15RF66BbVbnDt1nSEVHSJiZx2jj+UL8PLXhT/+u4W/5MNwMk AzfIR0MlY3TvCbOulgDeBTyIa6AFOEmbPnK8ametKYZzskuDf69+PHXvani2IJZwoXNW 5Al1yUtVkh/EDbsHMBA6z0pOIvB7CwuEIEj4GsvE6jHq2GmOHnubzkTAk9S5OZmthYEb h3kSHL/SIv+mVgVmHfoQAgZzSx4iVE+U1KcGO7PnLlhmJYoRnUP5HA5r8wCkIcL8awWN 4kEw== 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 v9-20020aa7d9c9000000b005044fb23651si7436266eds.173.2023.04.09.07.27.13; Sun, 09 Apr 2023 07:27:13 -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 6343168BD2E; Sun, 9 Apr 2023 17:26:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2971068BCC3 for ; Sun, 9 Apr 2023 17:26:33 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 7B68F40004 for ; Sun, 9 Apr 2023 14:26:32 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 9 Apr 2023 16:26:26 +0200 Message-Id: <20230409142627.19820-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230409142627.19820-1-michael@niedermayer.cc> References: <20230409142627.19820-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 5/6] Revert "avcodec/er: remove check for fields" 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sksVNEAltvjF Fixes: out of array write on x86-32 Fixes: 57825/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-6094366187061248 Fixes: 57829/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG2VIDEO_fuzzer-4526419991724032 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg This reverts commit f7abe92bd7939b6aeeb2393fe141033e733305d4. --- libavcodec/error_resilience.c | 9 ++------- libavcodec/error_resilience.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index bd7050062ce..2aa6f1d8640 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -805,7 +805,8 @@ void ff_er_frame_start(ERContext *s) static int er_supported(ERContext *s) { if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || - !s->cur_pic.f + !s->cur_pic.f || + s->cur_pic.field_picture ) return 0; return 1; @@ -907,12 +908,6 @@ void ff_er_frame_end(ERContext *s) (s->avctx->skip_top + s->avctx->skip_bottom)) { return; } - - if (!s->warned_fields && (s->cur_pic.field_picture || s->cur_pic.f->interlaced_frame)) { - av_log(s->avctx, AV_LOG_WARNING, "Error concealment is not fully implemented for field pictures.\n"); - s->warned_fields = 1; - } - linesize = s->cur_pic.f->linesize; if ( s->avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 55efacaccc5..47cc8a4fc67 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -87,7 +87,6 @@ typedef struct ERContext { int (*mv)[2][4][2], int mb_x, int mb_y, int mb_intra, int mb_skipped); void *opaque; - int warned_fields; } ERContext; void ff_er_frame_start(ERContext *s);