From patchwork Mon May 16 18:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35795 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674584pzb; Mon, 16 May 2022 11:39:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXnOduhbUtEyN6QJ3TgVl5+rQFV/IIEckhaOb1l4Xnhp7m7Cgx4/w8uUXefhsw0I6xg1wF X-Received: by 2002:a05:6402:335:b0:425:e3e0:5a90 with SMTP id q21-20020a056402033500b00425e3e05a90mr14702732edw.14.1652726377360; Mon, 16 May 2022 11:39:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v20-20020a056402349400b00427b5cd456fsi12296645edc.0.2022.05.16.11.39.37; Mon, 16 May 2022 11:39:37 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="W3/OW1J3"; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A65F968B444; Mon, 16 May 2022 21:39:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2016.outbound.protection.outlook.com [40.92.91.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1703168B42D for ; Mon, 16 May 2022 21:39:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UDB/B6TXnTaOd1NtuNSpgEcLhzrwZD0+hsDBwMsxjUMULzl9twEKdd8NM9aMbGPWB9hNglmSaldUChmGv4C6owUJNplSbV/d9VLfmjgy9CLUJEbIm9u06VsNnvmxiq3jrEJvD4o/0+QZPHPO1ntLJVQidH+lPswYbhNEbwdhjQyKAVmsWdAxR6IGVJLa/B9UB1VNiKQRuMkfu92a6Fuxdw0SKDFaGLe1CHAtg+pR9DP8gzcIFT9hZmDiRA5Ev17pW/RJEQIGP8nLaI46dUDcLrKUQslqz1JbpD77Uu/5JlXKv+5vCs4r+xVz7rDp4OpsWLB9XLHp/hv1ez7VM/Nuag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HzBHCsmhUly52nY7KCH5iQm/aRIsVlr4dUy680iCvO4=; b=U7/XTIrFd130rgUuc5v0WyYn6YOTtYqLYj2y2RV3uip4ZLy5HWCYNnt+r0+79cRiZN2mMNa85GmndGVlp2ZmV0cUKEYRF+Bu1wxMlBMuvNdEucN9NwJTQhgoZueQsFh3fxlUWozz1NoGdTaFUidC/nmK5VEC5d1WYJVAVOsASpJmc9/a/Yiw1WSdme59rlpQFDp63GN/QC4le4MPYTe+64X3Zk9lxaZDWFtEGAgdfG3jaeb1Av8N6ggzUeN1A5CS3XCJpdG8p7E9m+iEsEcRnqLqugmZbzWpmdeaG/hX3ycJbuLxbDbmsfwdJt1sBmyyfDYwNonv9Qe61K5w8K175g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HzBHCsmhUly52nY7KCH5iQm/aRIsVlr4dUy680iCvO4=; b=W3/OW1J3DwRUZhxPuH77r674EDM1OFnx2LJT6IKXg2cZzd+9gnamOLmw2LKdcZyao4jfgVxJ9hZZLV6KcrCFX2di7HxXsDd2MT5k5dmqwtSxenG5J+rUalqxkqUPS8P1IaZgYiPIfBjeu8Z8on0+Op/Nh9DqiVyvck+oe5yuHsnw+YQ4MTrPB6+Y6h3MdrCz5QUJJGIlw12bmhmwW05cBLkeMnEj0qPN84z8hCx2IC5ct8dHOP++OifQCL46WMWA4P1oNOQPLFAnoBZm2dEDnWAs0riORticksMKTxTFJTM8+eBf1quJUeO+zT16I7iqBi8uv6raA8sTApoXVQwW4Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR0101MB2414.eurprd01.prod.exchangelabs.com (2603:10a6:800:4f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Mon, 16 May 2022 18:39:18 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Mon, 16 May 2022 18:39:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:38:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YmaVCxYy3sJx/uGxNy9/bXrNdUFLWeMh] X-ClientProxiedBy: ZR0P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220516183900.616390-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d02449c6-4a6b-4bce-fc77-08da376b6273 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UI47HzvBIDxi2oCcBJc531jiOpQwxfv+LGUj5uC1QoqeC9lPtoReyZOvinpic6+ZTqIKklf9EY01DTS7Dn9N8kDeL5XBcz55FA2kbhFva5gF4liDPsLvsUwRkrMahgfel4RxdqDjOY8o76oj+lM63bpBkYzMa+5LyAiddJB1H8N2oa0S8his084Rk7qwQBS5IIsG4bRVanPIrRcXA2y667Ly3RAyb5dSqJv7Od7+ZS49MB2EncglOBFcDrzRu2PQnBHffgGX8+MTTr5SJyLTWfg4+QWrTS77stI7DCrElecn3kQECXFW+N82hkg1Kbn0BOPXMfQAh8gOP2AdI6zSvS6d/gMA8DYb6Nnh+2O19Z9e0zGW58XirjDopCljGMH7GVnZsMC2x6HAVg8FEJ1AC4bJTw6w6K32bWCsr+3lXN12VabdPg5AgGeJ+YeNv4DzdImGB09OEcIuviwGR2gX0vkN23/T83Dq4gDaXnvT+EmTFXJLA/YyBenMuAti4JgwDj/vpE51Mlg9M848RSqD3o+ySUq7pUZw2KJbeh2LZAECRAc1UDZt3pSTyAW7Yiz8nsH++86BxPIf36A7rBLs5IFtNrvqQd/9jnZzOFjsJrHEx5vRWdwC9FL6+rF9xLeQyflUKpxOh/ophpAzlbj57Bs1XE7LtA2eTh03Vp/xBqK3+xCXMoKZHGeXjrTnP5dp8OtJWC8w3nRKQ== X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x+OxPdMaszWsCI6orufSHeszO6jH1xP9tU+HGzyu7u3R3eIV8gJpi1dgd3YxwcujpjF8C7S5+ZFXiFqOFGTXKiG5Gdh2ut3rfNgj6YghLmspSKQSN1ZiM93okZtHoKahXjo9yl7my8vrmQj8jJlGeX77bS3vsf1TUIKH9fRD7PcwrEPm5bQE1dWyK+Lv/Y5IRqfGiKDwaqPZA+40YKe6eHVUXse0nRhfkQ9U118HJCnVpeQQDqpue7nneilpfewz/h0Ucla58+K2NYP6aW48iBKnSXGs2cy47KgmRkC64M7nxEP+cbnEK+T5gGbRAkyCwUaUeg5hsqzR1XwvQqiFC3yXzerMw7RlIeTXVK6qcfNuaf6W3MQ9W9dmwNU4EvsvQSV8jRvo83iJIQAc7RkU9GhK7LBt9smnx8AZumyiLadUrmCWTkSmTPSiknr+PKS92o/y05W9B4wH0OvKasF9ZDpy0Ne/BvTTIS/ifJ308dAiL9T5pkWStLI61/WqTNr9yxOmi5L8cFWWVUI/kqYfY4w5s2ktm0b6mjd4cu1Zk3xM6H2hEstYAyn0VcwKnV/FykO+iseuUYvY+7QryXBPzw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Tks3qo8zm7CggSkR7tau6yA9btUlAZoKoSVvjp+lvyINlRD8B6nn2xVozl+6Fui/f+bwcclp8Yqk+WlRqTonrn4yL2+G01kFaXkd0Sp0fDYhrALdU6m0RDv90+N2NXjJk6NQ3AurqYQJLHord0pdX30lNP0AG5Zu/OUmxgAovf5+9qrX9+m9r85E7601d1unLahFhmgqfjDkwURjVPosm8NUfIPJmiqP186eXnpWez9RUdh7Xb+jKQGL95X2kPlnCI6xZoURyxWwyV4iAi+WSU+JavrAxnjKiym6fNN/znvlKdbGaLA4cR0oISdIf6fw2NB9q35R4ETMl3HVZcMKQlEFnIT70j/UdLp+VJH7F5NxerW6f6I8LyT6oor5QDX5eB+g9gBHlmZeJS2ee2H6j4lX8m1vADoxwUgINE1U/vh5VcXPiZCuOO8IEu/zY/MXeZ1CHYMyXZkqFET5AGdRT96oDV/6kh2g05QJcqajJqLHq10LBSRj2bxIOOX7/G7WVkq7QTLGXC6NQ9kK36zwUYjirFEIsjOtqZ1hgKIKTxSstCGtr1SMrGoBuhsjiCq7fboc70Ho7khLFmPHWuApnIVk52v3Ikua9VUpNLKABucPOClRM3wiHQ94Rf1WhZsbMO7bVxxNlTVbYGZvhhEXr9T2QJo/Q5WfaHgfIqEPXnM5apckT0OKiLVmLldWpl/Y9BFDF/KGFtKV3LDp7DN9/HK8H/YdcJ5obRFWhKRhnTJndENLU16mb9fRL7sVGRCVp+xFVaQpy1Y0F9lElkalcVgKdvGTEc/rWwGUqtYLWA5LQHTvR+ioWjtQBUAdNKwhx1LaceEhvNVmVU5oXhGqhnykzcekYYuBSrKrtNq8P66b/mcQ9ELqqx24jJuW6Z4atpFQdvBsl5FQK1atbipsN9CSQ4gKoo/T3Ji9hXcpN8bnKSCaKRg0vvouoRAyWtM962WUubvj1Lc6Pmi3+gNlX4ZaDlU5i2wVO5VjNTi+nPRVCJ3SdBEUTpqfbod2VhIV91skaW5hEE9S4Zp69/ENpziF9mnjfLU8bA57RSij5s7FfyfN8cgDgKWBhLl0B8Uj/q/8SMPHxP4c7FuzZHtG8jphAk00H2BT5Kj/ov3EAyiY2ZJsksyUeuubRwFtbgB1JeNfgIdQMInCVJmQ8jx9ZkysT8lA8YpQ65QnbgFfHMcboQozx79Nf1u4ayUMSQ/CcqJ2p+dTCiSgWK0vFJlKgnchNJF/+yw/LAzN1SUJ436rabI52RXvy7etiddqVL5eUB0J4L4n6Na89bW3Rgg2qk6Dra+gHh/Jg0IL6FrqXQRWUeGoC+e4fbAIK1IJdU29E8gR2K7VKpUsAUoyvw1of+Pi4WulAaqVp1/ozDJdRNAcHKali5zfcyCTMFW0qAPiwdlgOn9rQs6ndtQhZhLgQdt8r38oOP0TATy+0bRxhY1d4b+4HzmYat2lk0lQEO4R X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d02449c6-4a6b-4bce-fc77-08da376b6273 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 18:39:18.1330 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0101MB2414 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/mpegvideoenc: Remove ineffective [pb]bias options 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EoAJX4jRkrxU The user-provided value is overwritten in ff_mpv_encode_init() without having ever been read. (This has been broken when making these options mpegvideo-specific in commits 910247f1720c6aae422723c05dac6d0b19f20bec and cf7d2f2d2134c0854edf2db91e7436ac2bc9874f. No one has ever complained, so this commit removes these fields.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideoenc.h | 4 ---- libavcodec/version.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index a0e8913ea6..ecc389a6d3 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -43,8 +43,6 @@ #define FF_MPV_FLAG_NAQ 0x0010 #define FF_MPV_FLAG_MV0 0x0020 -#define FF_DEFAULT_QUANT_BIAS 999999 - #define FF_MPV_OPT_CMP_FUNC \ { "sad", "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \ { "sse", "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \ @@ -94,8 +92,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"border_mask", "increase the quantizer for macroblocks close to borders", FF_MPV_OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, FF_MPV_OPT_FLAGS}, \ {"lmin", "minimum Lagrange factor (VBR)", FF_MPV_OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 2*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"ibias", "intra quant bias", FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"pbias", "inter quant bias", FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ diff --git a/libavcodec/version.h b/libavcodec/version.h index 87b7284a95..5183deb68b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 28 +#define LIBAVCODEC_VERSION_MINOR 29 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \