From patchwork Tue Nov 22 13:07:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3001681pzb; Tue, 22 Nov 2022 05:09:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Q0QkSAJOXb5ClGdsEngJuLvWdK0qLRcHPIw2jVjDFZ8SprmKHjHK/pOvGnExxKKdpRTfD X-Received: by 2002:aa7:d555:0:b0:464:6485:419b with SMTP id u21-20020aa7d555000000b004646485419bmr6655105edr.382.1669122543157; Tue, 22 Nov 2022 05:09:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669122543; cv=none; d=google.com; s=arc-20160816; b=04PaEslpk6lLlX5yfCDyokb5sXjZDkrd7MvRms1VgdktsRgHN+gZ89GOoV4US+5DQr IDG969YgHfJt+cmb5exkYu7j8Oe7ntIcLKPbfPiJHe8zDXchGgVICV2lu3rklv++kqhr Rgy7Qe65o6QqYCwA9OOpdG28kWRX1B2rLV9XcsIdODV2Lt+dtNfMS5XKSU8L1I1aFn5L vbm7HUSBVCsLR2iEdZNnUqw/6ptmc/qm8pgeU/WRKyCgoQKUiIy1yX8aoM2nWxasZmnJ iRFWLzndMQplcjfNl5kVMDvfMPPPl5FseK+GjrjS9Mjsd4nF9vElm+09sZfkhxEIlZEk oGDw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=XvW0znSSv6chncaYwDrPs9JZe9CIlerl5u3PCoVdUvs=; b=y7ccg9Yz4qJY9l0Q8J8JTwhgs2cYtzSGUzDe0BM01N/dWK5WJx0inBu9oic88kr/wU Vufdk/V5adI+C8app9GhGwKbL269Tc04sMOhekVoo1MXGoApZMckS2F2UBxYhhuXca9d fCD2rKQHa8UfIEJojRD8kns1yMSHhZf2GIEMbbZGjKPhhZOoydxMPEjdC2VfpLtXAwiR NbZSkiWXkqboqkH/KHE2VGAkDIB10dAx4NdAbALRqEWnOvpg4MhAUw5IzZEQv/qOP5zN zC3EgNrcxv/XgRqX1+Tz0IyJscYB1nR9fsXDlB24p+qJphnsPRAPmU5W46Z6DNgy2WLz FUiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="XgRi/V8E"; 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 t8-20020a056402240800b0046154884604si11712024eda.482.2022.11.22.05.09.00; Tue, 22 Nov 2022 05:09:03 -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="XgRi/V8E"; 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 4C59E68B859; Tue, 22 Nov 2022 15:08:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77C3968B4C8 for ; Tue, 22 Nov 2022 15:08:50 +0200 (EET) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-14263779059so16346671fac.1 for ; Tue, 22 Nov 2022 05:08:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=WQczFUaLiq7dYIa0Ak93n6BRyrvOoW4XFrLJyGbfYsY=; b=XgRi/V8EUnV0JJrBAXS4vNO5JjXTEnDOVgRIKyBw9RpGVoIDMN3o1D7qTN6XB3zdLd /1TUIQUSwhzbhA9Z8XRSH6G5m8K2pizKyFSIAJ8npIclmqQUZJMhpSoKTmjWJE4jhpSi l3PYlnZ+Xup4TrO7t/56EsX/Jo1qD4z4SL2+CQn6Q8IQTUV/AXkoxwtcFHVI3Lx0WWgd nvG1M/LYQTwJy8VJmXhbbtrKOrH7WMGwLywoXDSSL7g4ao/VLznN0znhcv+xQFq4cciJ /1HJvSn86fv1cNfOzXJjtow2+vTgyMLhGqS0Re5P0SolqhyVuTA393dVxtCpyIMlPXL8 9x7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WQczFUaLiq7dYIa0Ak93n6BRyrvOoW4XFrLJyGbfYsY=; b=Os22skDFZx2Ac9Cb6gqqujcrp2rEw8Otu96PNTvbsbcU2XtlQIgW3VqfcdtHcanQD6 z/ZFPoTPDeY7XH2TMMITT6VzwBhrXgul7PsycvJxnUo00UX9lxE8zGHb7TT54cYHtLGk kKEHJVkTCUh9Ge62lfrm0rUmLrsKa87qP3HBQlMDClujIldg2fJNv4ja1QMA724Uwx0t J04g0qHxdvElKMBJrs4C4YOhWussalX6ilaH0Q0WvC/Yiys/84RwjieuO4OG0DxGykHV LZEqMWmItbjahTKHkmcg2NySajpErRGwrWaletMVpl7kujuQX6FHQiIyy0eBxAnFUI2G NFBg== X-Gm-Message-State: ANoB5plytXFvJlKUppfN1EZ01OXhSbuDg0UdGOGbcj5dRgllnmmWQ6wn 0YlSYdD1pcQPjREngBj4ZUT/BI45Ph8= X-Received: by 2002:a05:6870:9a12:b0:132:55d1:461d with SMTP id fo18-20020a0568709a1200b0013255d1461dmr1967464oab.170.1669122528442; Tue, 22 Nov 2022 05:08:48 -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.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 05:08:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Nov 2022 10:07:29 -0300 Message-Id: <20221122130732.403-1-jamrial@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avutil/error: add a new error to signal processing got into an unrecoverable state 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: fUqRhUZ+Lntm Signed-off-by: James Almer --- libavutil/error.c | 1 + libavutil/error.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libavutil/error.c b/libavutil/error.c index 938a8bc000..34970a42bc 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -48,6 +48,7 @@ static const struct error_entry error_entries[] = { { ERROR_TAG(FILTER_NOT_FOUND), "Filter not found" }, { ERROR_TAG(INPUT_CHANGED), "Input changed" }, { ERROR_TAG(INVALIDDATA), "Invalid data found when processing input" }, + { ERROR_TAG(UNRECOVERABLE), "Unrecoverable error" }, { ERROR_TAG(MUXER_NOT_FOUND), "Muxer not found" }, { ERROR_TAG(OPTION_NOT_FOUND), "Option not found" }, { ERROR_TAG(OUTPUT_CHANGED), "Output changed" }, diff --git a/libavutil/error.h b/libavutil/error.h index 0d3269aa6d..3e216ad714 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -57,6 +57,7 @@ #define AVERROR_EOF FFERRTAG( 'E','O','F',' ') ///< End of file #define AVERROR_EXIT FFERRTAG( 'E','X','I','T') ///< Immediate exit was requested; the called function should not be restarted #define AVERROR_EXTERNAL FFERRTAG( 'E','X','T',' ') ///< Generic error in an external library +#define AVERROR_UNRECOVERABLE FFERRTAG( 'U','N','R','E') ///< Unrecoverable error; further calls will not succeed #define AVERROR_FILTER_NOT_FOUND FFERRTAG(0xF8,'F','I','L') ///< Filter not found #define AVERROR_INVALIDDATA FFERRTAG( 'I','N','D','A') ///< Invalid data found when processing input #define AVERROR_MUXER_NOT_FOUND FFERRTAG(0xF8,'M','U','X') ///< Muxer not found 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. */ From patchwork Tue Nov 22 13:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39389 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3002110pzb; Tue, 22 Nov 2022 05:09:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf5myIUHfFmV5GzwDk/0wNHm0dmreMqI8QTwvTx01LDjdPdaY6FPCccS7Wj0TYYRuDoac69M X-Received: by 2002:a17:906:1e48:b0:7ad:a943:ee49 with SMTP id i8-20020a1709061e4800b007ada943ee49mr19377053ejj.311.1669122577568; Tue, 22 Nov 2022 05:09:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669122577; cv=none; d=google.com; s=arc-20160816; b=uyUXmKJn78AtHymNhyLeYWe+Ge9FEdTWHukHhy3ocqg4TzuZD7Zm14GBiTNP/p4eyk MhNlDr1Srwiqe6WtI4yzx+iWeV3h3iQ5ftzfLcBCIBQ8d1bzQpB8BPJC4WBP/ZV7mf8e /rJGmQA+NmouCqEFJI1XMJ71bzXucDmbuAU3zOCOBYdAMF+qqJplyoW5zVJYTVoPZsUv IAj+033UsZVisFNvRyyycM2fnJi2D4mN81AdogDSvukZ6CqSi3Pcm1zqQuFLytwi1iqN fRI3sIOiVgKZpXqbJuNWBUFTQJ3ZqD4tq1audKFdauj/BUhvyHgmwKV1/Q088YN4vmV7 QegA== 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=3H6VPksal86Ha0PRIMZn4M05b7cr+myZxUVTV2ZSgOA=; b=V5tmbgNXjoCiuKkVtn70hED4Hb0KMadOZx19x164bBw8ARz5a5XNVqF65RhI9gLGGz IInEAXpWRbh6+daFiq2L/yMrPCATPrepMzYz4hB75Cv2XfiCJwIhS/u/f4ixGepN97TP e2gCpdy/punJ5shx+Iymwo3UF6l4eazHv4DyWzXUEqZnmTyaScPcEi0DL/hWVWKXikQF 50RYTYHYzGyAYKx6oo1swtE4Velp2Mhui402aC6RXXKaADqUCqpA3Y8kikdbMXrXG0CM yA7E1jkLNarUF8SbCrktSN2ro3ljsHVYiCNYYVYZ1HJewjJzzXXtcrLwbc9NS0mFmZiY qsrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=KQdW2hYI; 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 f13-20020a0564021e8d00b00468468cd389si1571048edf.205.2022.11.22.05.09.20; Tue, 22 Nov 2022 05:09:37 -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=KQdW2hYI; 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 CA2EE68B1C7; Tue, 22 Nov 2022 15:09:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5B8F68B4C8 for ; Tue, 22 Nov 2022 15:08:52 +0200 (EET) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-14263779059so16346793fac.1 for ; Tue, 22 Nov 2022 05:08:52 -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=hKyQbaouTuzRiZcxq89ZV+2KOziyD2K9iwcLqn9ofsE=; b=KQdW2hYI/nzGMcak0RK4cDfPR7am2dQ2N8uCiXAVT0a2wER/yHIBTShKlzoZwmNjiw in/Q0smO8euhKxqMEw/dJoV76/2X/kjVB2uShT3hAtE5qs1N7KN6PlI3e2mYvZ5lRBja zdU1mv0V7SsOPogy/nuJVeqOdHHAw6QgQmQKAlRJf+gGIoTScV1py+6V0HlYsE8O1uIA fZGrmjtrnq8VD6sH0+Aq/AcIxvioLCdTW0xAfSNQxxYy8MsjLASfTrNe9zhH40K9a4HD qTb8ajYzGFq4w+zuNA/dVeEMb23I8Fs8IX5q08+Tc58sd2IM5fEQLK6qp52UeizF0v55 bN+g== 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=hKyQbaouTuzRiZcxq89ZV+2KOziyD2K9iwcLqn9ofsE=; b=uzLTuekhc63/6Hm7LpoL7TcPYbEl/wzGBpwYI1uSECNzlb3v6zNvzeRxY/e4YISSuY CX+9FuQ2l4YmG/0y+XyMWPZtQYNaWPew4+n/QeBshP2T003zVF6R1eljHrytT04iSFPo aWjnpV5aF9WJvxs9yLN+QT+mkyScs2P0zlayZHQkWfPjcHCnZtULPfbnROmnYNVhLGV5 gu4w9mZRpAhbsRtBjAD+P4tqOhNIU95sxYvhitLgpcq/JRJSNWKoT3O2P/H5wDkzUcGL BrHlYg8wlE/hWF4bOEgmpKsdcYWFABY1EvTjYxBGNIOTIiaTtufn3+jffejfDKAzPn+6 6TjA== X-Gm-Message-State: ANoB5pm6tH8chaGfosHrD+5zmCp+HfVLHc4d+1gZM9ftAvQXX0+3iH6b Y1lUxDhux292jsGYfKhhvrtc+dzHpKs= X-Received: by 2002:a05:6871:4490:b0:131:cde9:c89d with SMTP id ne16-20020a056871449000b00131cde9c89dmr16247761oab.5.1669122531142; Tue, 22 Nov 2022 05:08:51 -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.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 05:08:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Nov 2022 10:07:31 -0300 Message-Id: <20221122130732.403-3-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 3/4] avutil/cuda_check: propagate AVERROR_UNRECOVERABLE when needed 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: WOb0iR1mCOik Based on a patch by Soft Works. Signed-off-by: James Almer --- libavutil/cuda_check.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavutil/cuda_check.h b/libavutil/cuda_check.h index f5a9234eaf..33aaf9c098 100644 --- a/libavutil/cuda_check.h +++ b/libavutil/cuda_check.h @@ -49,6 +49,10 @@ static inline int ff_cuda_check(void *avctx, av_log(avctx, AV_LOG_ERROR, " -> %s: %s", err_name, err_string); av_log(avctx, AV_LOG_ERROR, "\n"); + // Not recoverable + if (err == CUDA_ERROR_UNKNOWN) + return AVERROR_UNRECOVERABLE; + return AVERROR_EXTERNAL; } From patchwork Tue Nov 22 13:07:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39388 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3002066pzb; Tue, 22 Nov 2022 05:09:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf6EvI3C9KOJVxlLeJI0iSGL56RqewDog+ohfimMgX0bHn09MDYwEvdHsX1dzimpMaASUJKC X-Received: by 2002:a05:6402:294d:b0:467:6b55:3cf5 with SMTP id ed13-20020a056402294d00b004676b553cf5mr21245816edb.22.1669122574436; Tue, 22 Nov 2022 05:09:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669122574; cv=none; d=google.com; s=arc-20160816; b=oyxRCWFmtvO6MV74syIKbsPcPpCZr07Pc0tLd8Kzu6HhiczIc0qpvvan2pp5ldnHnk F1aiH81KsfImHCCqPCRAcXDtHBrH0WLvEOaU1xuuN/pc/cuH7GT0r4CbNv6c53gvE4Y1 jZL+egSK3W0uXLeszCLr5KTlLGZFm6nAfEZF3pxRZXJWxoKyeNw2xPOYZgdLZpz4CuCI vXKgSaLQoypwY9dCgLYxEyl2wW0SFMSL9teG9M+qqkHk/i40wpNFe3FuD2Ld7xt6vpYk 6bPgWXm4yYeahxLwSOP+SMP00ixi32kqi0plQfphRSkGTs/aewl4qdLJFQgtR+SZl8kH 7jwA== 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=si9x9vsysWxpwaAVQ5bH4B7p5H6Pl+3Hm50vOTqnroI=; b=z3fDOJw3kgUGVvjZoaLvCW0SFU2Vo/QpnYioTGVLqPamJHXK8JP0KkuZVZAnYNCAEd l/U2EO3TvK1HVXgeH+uPPK5VLSpBr2GYNYVh9O2AAzMxr9GCVC0uL0lnvQx3geO0bijd 83QX2do1XU5ZgKDYMpWzVH3WvRRzZqmny5NXpCncdfCXqiV9dQ9+Gu7rqSbxsnhKNg53 lCIjeX/o5zP7vRoJzJio+dXAM2mXkKviNaVds0aSd4RQ2eIeHVfbldtLSYj9cjDEU44A EThE7BpqqsrsLSuduw7dwNDuE2e2+lDptJ5EfPO7g9gdNNlHukdQ2syGLjNce4VixQNE vKUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QKAS9iwW; 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 hr1-20020a1709073f8100b007b5ce4a436esi7018965ejc.513.2022.11.22.05.09.30; Tue, 22 Nov 2022 05:09:34 -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=QKAS9iwW; 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 CF39268BA36; Tue, 22 Nov 2022 15:09:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3475768B8B9 for ; Tue, 22 Nov 2022 15:08:54 +0200 (EET) Received: by mail-oo1-f52.google.com with SMTP id v7-20020a4aa507000000b00496e843fdfeso2244348ook.7 for ; Tue, 22 Nov 2022 05:08:54 -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=gaN34YRvDKic8PTGRptOruKnGUJ2Zg8gtSN1lX4X03U=; b=QKAS9iwWCF4eEyea1akvYaqPWDc8u2niJxAghQ4e+EYI4esrd5Le8uJuh4aVBqiBid s+smgIlytWXRfOPAsBrJVkNRUsweCvFF+6fAIsv4fZEQ0/l4U+bPp21KKaBAD+7McZfs Bl4KIVWc1IaBMvTms96D/5EogiR1XPTIsCIGY9cXLbbrinYihKHP/e0Xg9xDSvnfKmiP OAtwJEfPyHtBOGDOKRR36kA4wr3ePKVHzfQZKjdNHwh/wzUlr+QGZz7YVEsj4GSg3FO8 xEZ2qTZ5RuHjTGY040DLQiS5ScqxUVs5TbbgzMMGvLpY9ozHRODQTLR/VVSxV34mU05Y 8dGQ== 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=gaN34YRvDKic8PTGRptOruKnGUJ2Zg8gtSN1lX4X03U=; b=X4dJziXIcbsgfI2taUv9S6ZH1BFm2w9qA/mYPjr3aLszrYPzntS+3wcSn10gUQaUJf wX5Bn8jaPoQfzCt1ND2sPi/3nurDP4kZOoXWDzz/zxq/1i1Ack4owKjoUy4S90kmTD3p tcvVsuwlFHglEIcZ7RF1LFf6NXMduvckC4/uuLL4M94rAUCQwCPOM6RWSDa8Y9IL4h3o xPRrFetDC1n/WJDMQhzpo6lcBDz4CTgtqDFPzZFoU2LAdehEWm4I7uWYI6VRggeW+TW1 ZS1YvcHR/XqTiIQNbHueg3CjTkI0CVluwPERRK9rL5eHOvjS+lNnzGlD1Vy3ycGfNt5O Gbwg== X-Gm-Message-State: ANoB5pm0It87tuDuKoZ2odBnuHtxUqkyvY01DQueql7/5mClevA9ZHqZ EplVvOs3Ry/YqqHXn2qqpBM/gs+e5mQ= X-Received: by 2002:a4a:94a9:0:b0:480:8f4a:7062 with SMTP id k38-20020a4a94a9000000b004808f4a7062mr1630295ooi.57.1669122532423; Tue, 22 Nov 2022 05:08:52 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 05:08:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Nov 2022 10:07:32 -0300 Message-Id: <20221122130732.403-4-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 4/4] fftools/ffmpeg: handle decoders returning AVERROR_UNRECOVERABLE 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: 6yauBCf5/6kf Stop feeding them packets after this error is signaled but don't abort the process unless explicitly requested. For this, introduce a new abort_on flag. Signed-off-by: James Almer --- fftools/ffmpeg.c | 9 ++++++++- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_demux.c | 1 + fftools/ffmpeg_opt.c | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index dfdfad3ce4..6793f2748f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2399,6 +2399,12 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo break; } + if (ist->fatal) + break; + + if (ret == AVERROR_UNRECOVERABLE) + ist->fatal = 1; + if (ret < 0) { if (decode_failed) { av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d: %s\n", @@ -2407,7 +2413,8 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo av_log(NULL, AV_LOG_FATAL, "Error while processing the decoded " "data for stream #%d:%d\n", ist->file_index, ist->st->index); } - if (!decode_failed || exit_on_error) + if (!decode_failed || exit_on_error || + (ret == AVERROR_UNRECOVERABLE && (abort_on_flags & ABORT_ON_FLAG_UNRECOVERABLE_DECODE_ERROR))) exit_program(1); break; } diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index a96ff0d723..07a47d3f0e 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -322,6 +322,7 @@ typedef struct InputStream { int file_index; AVStream *st; int discard; /* true if stream data should be discarded */ + int fatal; /* true if the decoding process for the stream is in a unrecoverable state */ int user_set_discard; int decoding_needed; /* non zero if the packets must be decoded in 'raw_fifo', see DECODING_FOR_* */ #define DECODING_FOR_OST 1 @@ -475,6 +476,7 @@ enum forced_keyframes_const { #define ABORT_ON_FLAG_EMPTY_OUTPUT (1 << 0) #define ABORT_ON_FLAG_EMPTY_OUTPUT_STREAM (1 << 1) +#define ABORT_ON_FLAG_UNRECOVERABLE_DECODE_ERROR (1 << 2) extern const char *const forced_keyframes_const_names[]; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index d2a6d39703..0188b2896e 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -586,6 +586,7 @@ static void add_input_streams(const OptionsContext *o, AVFormatContext *ic) ist->st = st; ist->file_index = nb_input_files; ist->discard = 1; + ist->fatal = 0; st->discard = AVDISCARD_ALL; ist->nb_samples = 0; ist->first_dts = AV_NOPTS_VALUE; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 61aa0be0ab..91a2f88e0a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -304,6 +304,7 @@ static int opt_abort_on(void *optctx, const char *opt, const char *arg) { "abort_on" , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, { "empty_output" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = ABORT_ON_FLAG_EMPTY_OUTPUT }, .unit = "flags" }, { "empty_output_stream", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = ABORT_ON_FLAG_EMPTY_OUTPUT_STREAM }, .unit = "flags" }, + { "unrecoverable_decode_error", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = ABORT_ON_FLAG_UNRECOVERABLE_DECODE_ERROR }, .unit = "flags" }, { NULL }, }; static const AVClass class = {