From patchwork Tue Nov 22 13:07:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3001890pzb; Tue, 22 Nov 2022 05:09:21 -0800 (PST) X-Google-Smtp-Source: AA0mqf67pTjn+S9tprWWW9I4QintCh45f5+ujqC1RMwH62eiLTnK6B+7qYJojkuJ8cp8fphwWHZ5 X-Received: by 2002:a17:906:398b:b0:7ad:b868:f096 with SMTP id h11-20020a170906398b00b007adb868f096mr20085840eje.295.1669122560806; Tue, 22 Nov 2022 05:09:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669122560; cv=none; d=google.com; s=arc-20160816; b=ePnBQZJ9ZYDnyUrqgTd3KruiEqJBCy3eObDZcX1xvrxpFnOmuJA7Gde/RN5QXboShs RAzJRpe1ZbekQyI6AEKYKRAGof8Fp8xuHKk1/YpA9z4wYLyOoea9yAtq4lSo9V7dggt6 jRpcAuyFdjl/yCphrIVDc2tX/ZfcZhyV8sj5hCog/G9Oy+GOS6ATpTfbMxEeu98DalyC xSwobvQFuzK0j4foXPtKNDI1eOCs+9sU5PbEcauq0wA42NskCk/dPRdbJlwUY6T4eq/n Zst1UWOsTkaHmItZNFEyWmwGgUmy06m7rvcLFOnJzAzxSliTsQEZZzq4QzGL8vI2d54Q NKnw== 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=gaBCNPc1il/ofRdxGYVMlGN5RmEE6HaFPi9z5ffqGYU=; b=Fdjt3Ad9C/knN/Ej65inycimgeeHbKiNNh+48Rl0Voq3aQgTAl9oJbeXIp1DTVfhj/ 7tjMVghbiPIlDVlFjxIxWXV+baJf1Gswmbxi7AQgwIfDvTRwExbb9RIxo0IMzSGN/fMR TNqV4hi0wj9qmX0MZOfWlCipOnmD6vpnakw/TZlJ7kwEgai5dVg0Ll5svloQeVMmyA/v ZkOqBe3nFQp6KU6e8mmN6hqjDlX7NSsYZPyOFD1XGZ8xQeWrUWKwqw8pIrzezU9xGhbX Cduv6BDOim9gwLrPKQCfZdeii2dekkmC7v1Hrv1JWB4l9GYPuEsK2gKdw3sUqhPMOqKx ExmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=co7sgixH; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wz5-20020a170906fe4500b007820e1a4302si14277836ejb.675.2022.11.22.05.09.11; Tue, 22 Nov 2022 05:09:20 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=co7sgixH; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A5C168B9F3; Tue, 22 Nov 2022 15:08:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7567968B1C7 for ; Tue, 22 Nov 2022 15:08:51 +0200 (EET) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-1322d768ba7so17186596fac.5 for ; Tue, 22 Nov 2022 05:08:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b2ejl+gFjNG1yIkaQESs99VfmYfvFhG6pckpmRL4B4M=; b=co7sgixHjdbquFwPcyYzSOq15yBHKAd1raxjQtR457yH068TfjbOVpDSiLP0mGT0ED lqBIb2gNj2r4PGkp9kie+uAFOkO8OeT6F5Gq7Yu47JkjwRaYVDNteWL11466/MrpFzRJ XKYppeEF8ACP40mG+BkF8npR6VGLEq/tr/606c8KChDe4sVsJ0X53nKA+2lWIOVq9f6l +uist6G0FOyr9BUeMYUjaS7OUeTKIvJ9+kP1brdTPtOPswkgTZibTAXycbgaT95vTVHV YAtpg4ZB2QBB8IBIfcsnHe/yTYJWLcb7EbNRViFWB0QcBQgEIuDUXyBwFn1qgu3K8azp aQpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b2ejl+gFjNG1yIkaQESs99VfmYfvFhG6pckpmRL4B4M=; b=EcOF6JYRbbVAaSz+3Qa9iHl/jHurYAXv3FCHThJFTJMnn4B5CUOa0bILp4C1pxz1tk CYU0sOPJGwoQcKBiJR6sgBFrnyZqNqEHWwiAcrRA29vLSBNxuvhwB5t7mnSSZN9V9JLs vN5lfw0uwbgE3LWM/DSKcP4iJ8vBthDF01sYNYqQHUhmADmn/jFgUxkxntvEfCTT7sla q0foZuGKHcWVuYs10Vc0kGw3CcgcMAlvgor7GyvI9p8OwqnpfIz1b30fRQtnS7qofF9/ nm1gtNTp+yhZOCNQnLqKdxmIk/GBG0YvgaPy/ZUT4x97Fvwpc5XuuW/X3xu+gXBSjw7+ VJXA== X-Gm-Message-State: ANoB5pltry2WlRA8ETp7t9BF2c4q1VY8d4O3CvVxrB6U6AWIIEkMW6hF hVv0FLkr741Xqk4oxBX4Hg2laVcuknk= X-Received: by 2002:a05:6871:4191:b0:143:e11:c9a6 with SMTP id lc17-20020a056871419100b001430e11c9a6mr1280111oab.10.1669122529718; Tue, 22 Nov 2022 05:08:49 -0800 (PST) Received: from localhost.localdomain ([181.85.72.69]) by smtp.gmail.com with ESMTPSA id g4-20020a056870d20400b00142fa439ee5sm1825258oac.39.2022.11.22.05.08.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 05:08:49 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Nov 2022 10:07:30 -0300 Message-Id: <20221122130732.403-2-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221122130732.403-1-jamrial@gmail.com> References: <20221122130732.403-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/decode: allow the decoder to signal an unrecoverable error was found 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: 5y7uVuIfDxYE Signed-off-by: James Almer --- libavcodec/avcodec.c | 1 + libavcodec/decode.c | 17 ++++++++++++++++- libavcodec/internal.h | 5 +++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index a85d3c2309..7818b6e33b 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -397,6 +397,7 @@ void avcodec_flush_buffers(AVCodecContext *avctx) av_bsf_flush(avci->bsf); } + avci->fatal = 0; avci->draining = 0; avci->draining_done = 0; avci->nb_draining_errors = 0; diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 6be2d3d6ed..04c9d374ce 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -576,7 +576,9 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) av_assert0(!frame->buf[0]); - if (codec->cb_type == FF_CODEC_CB_TYPE_RECEIVE_FRAME) { + if (avci->fatal) { + ret = avci->draining ? AVERROR_EOF : AVERROR_UNRECOVERABLE; + } else if (codec->cb_type == FF_CODEC_CB_TYPE_RECEIVE_FRAME) { ret = codec->cb.receive_frame(avctx, frame); if (ret != AVERROR(EAGAIN)) av_packet_unref(avci->last_pkt_props); @@ -586,6 +588,9 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) if (ret == AVERROR_EOF) avci->draining_done = 1; + if (ret == AVERROR_UNRECOVERABLE) + avci->fatal = 1; + /* preserve ret */ ok = detect_colorspace(avctx, frame); if (ok < 0) { @@ -648,6 +653,16 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke if (avpkt && !avpkt->size && avpkt->data) return AVERROR(EINVAL); + if (avctx->internal->fatal) { + /* The API expects EOF signaling to always be handled even with + * decoding errors */ + if (!avpkt || (!avpkt->data && !avpkt->side_data_elems)) { + avctx->internal->draining = 1; + return 0; + } + return AVERROR_UNRECOVERABLE; + } + av_packet_unref(avci->buffer_pkt); if (avpkt && (avpkt->data || avpkt->side_data_elems)) { ret = av_packet_ref(avci->buffer_pkt, avpkt); diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 76a6ea6bc6..622f5728e2 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -142,6 +142,11 @@ typedef struct AVCodecInternal { */ int draining; + /** + * An unrecoverable error was found, decoding can't proceed normally + */ + int fatal; + /** * Temporary buffers for newly received or not yet output packets/frames. */