From patchwork Tue Mar 2 09:00:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 26053 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1486144B171 for ; Tue, 2 Mar 2021 11:07:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAB4F68AB7C; Tue, 2 Mar 2021 11:07:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94A1E68A831 for ; Tue, 2 Mar 2021 11:07:42 +0200 (EET) Received: by mail-lf1-f41.google.com with SMTP id k9so10208996lfo.12 for ; Tue, 02 Mar 2021 01:07:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zLhFRpaqPdzi2eBAPKZ7wli7MTHV1yiQ8gbxwR/SV5A=; b=o+fr8vPiSwDs7XOKCaE/YwOcZeWjmGR+wayFbdFrDy61siicyF6b45kJnMJN9IVP+1 KVZfqfC3n6KOIhDDGzyHpOlZF32PkfbuiEyTPCYK4ZdYfJiLMOcg+p4IIaoDHJvflLO1 XqIfBeycfWH4lEEAs5wFAmNa5chO30GabXRh/bG4J0wjX3ocbkkYB+23i387JV2C5J4Q UN0qs/C+1n+267zT1VnvorgKrS8E6CSnNZFtA/wd/bmS8u0hSu/A5L9hO34g2WRXGXAA +bhgp+TfjI+NL3tPWkHXp1iJPmeuZLBpJoIfKLJLv8Tx+5s3tzos4w//0UX9gzh2OosC S/jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zLhFRpaqPdzi2eBAPKZ7wli7MTHV1yiQ8gbxwR/SV5A=; b=SUQKVDVJgFEQIuSiT3ubpKx8HKSe/PXhnpw5X7iOIn2IolledOo+2qL9LRm7q1xTxj Q2BWlb0PB1HFhy9+KEm7dy1Q5tkjLxdHr7kZ1B0PIGS5owbJGYoHc/ZShz5ZRQD8365a cTxEpJHQ8J4o0gPYopH5s7VXvgP6+xMugrUGWc6q8GlfI1F01SeLhtnyB2bwQAziYaUf N5SQko9RTxnyTMXTg7Mukiecv7lwUuTDsJSuu/K6Dgpaz0PAMkzfvS2xKz4IHZ/WgDQb hk3O3j83YrzaZtooJfVqCXHQ+5PKWjLMZeH+V6487rGtUX67KVlymqadzK0rbZ64lVQP pbYQ== X-Gm-Message-State: AOAM530yAUIjh2JefeB2fEKnHEjJULNklDtjkEMCcMvEoi6mHk637Pka uey4vdGUwJVA9cjKy8rFFskekrD8cDE= X-Google-Smtp-Source: ABdhPJySVZStWwTcqecc/ptgvWmtkR8ARyyrF3ypiJkY4ICNC56xs2fpDLJ5/cu6aF4id2dWNYyH7Q== X-Received: by 2002:a05:651c:2050:: with SMTP id t16mr11579565ljo.109.1614675645981; Tue, 02 Mar 2021 01:00:45 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id u9sm1791626ljj.0.2021.03.02.01.00.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 01:00:45 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Mar 2021 11:00:39 +0200 Message-Id: <20210302090040.10484-4-jeebjp@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210302090040.10484-1-jeebjp@gmail.com> References: <20210302090040.10484-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 3/4] avcodec: enable usage of err_recognition for encoders X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" From: Jan Ekström Enables the usage of such values as AV_EF_EXPLODE in encoders, which can be useful in cases such as subtitle encoders where they have the responsibility to validate the correctness of an incoming ASS dialog line. Signed-off-by: Jan Ekström --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 2 +- libavcodec/options_table.h | 18 +++++++++--------- libavcodec/version.h | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index a49e181c13..a4cb3a5d63 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2021-03-02 - xxxxxxxxxx - lavc 58.128.101 - avcodec.h + Enable err_recognition to be set for encoders. + 2021-02-27 - xxxxxxxxxx - lavc 58.126.100 - avcodec.h Deprecated avcodec_get_frame_class(). diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cd6e6d19bc..ecc665677a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1634,7 +1634,7 @@ typedef struct AVCodecContext { /** * Error recognition; may misdetect some more or less valid parts as errors. - * - encoding: unused + * - encoding: Set by user. * - decoding: Set by user. */ int err_recognition; diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index ded9de4d67..e12159f734 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -140,15 +140,15 @@ static const AVOption avcodec_options[] = { {"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, A|V|D|E, "strict"}, {"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, A|V|D|E, "strict"}, {"b_qoffset", "QP offset between P- and B-frames", OFFSET(b_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, -{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"ignore_err", "ignore errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_IGNORE_ERR }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"careful", "consider things that violate the spec, are fast to check and have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"compliant", "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT | AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, -{"aggressive", "consider things that a sane encoder should not do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE | AV_EF_COMPLIANT | AV_EF_CAREFUL}, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"explode", "abort decoding on minor error detection", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_EXPLODE }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"ignore_err", "ignore errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_IGNORE_ERR }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"careful", "consider things that violate the spec, are fast to check and have not been seen in the wild as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"compliant", "consider all spec non compliancies as errors", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_COMPLIANT | AV_EF_CAREFUL }, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, +{"aggressive", "consider things that a sane encoder should not do as an error", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_AGGRESSIVE | AV_EF_COMPLIANT | AV_EF_CAREFUL}, INT_MIN, INT_MAX, A|V|S|D|E, "err_detect"}, {"has_b_frames", NULL, OFFSET(has_b_frames), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, {"block_align", NULL, OFFSET(block_align), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX}, #if FF_API_PRIVATE_OPT diff --git a/libavcodec/version.h b/libavcodec/version.h index 2b3757fa07..dd15ae341e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 128 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \