From patchwork Mon Dec 20 18:22:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4634247iog; Mon, 20 Dec 2021 10:23:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRaLjsee95QSkoWC4rqgfwZDLMmU1Ax7qlM2eR/P/6VHOo3gStwicH8oK7CbK7hu7R8tim X-Received: by 2002:a17:907:1c8b:: with SMTP id nb11mr8471722ejc.72.1640024599758; Mon, 20 Dec 2021 10:23:19 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c16si3947131edv.483.2021.12.20.10.23.18; Mon, 20 Dec 2021 10:23:19 -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=@outlook.com header.s=selector1 header.b=dGVuFVXg; 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 1038668AFB3; Mon, 20 Dec 2021 20:23:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075081.outbound.protection.outlook.com [40.92.75.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B262868A9A8 for ; Mon, 20 Dec 2021 20:23:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=haq/3NBGZA7vxNITLQPRz6IQZd7XZpVvYE3r7gwaGWGSFgcNfrZjEf0GBiYal+V4C4H6NFP8FwT1IJh/rXUoE1E/5WNBC7MGc//17Y53zIEzT+jpbnGz3UuZyQgrkktv6VL5oaLu0964yJXY10v776Aez/O2C2CUmVeNpWVJTuO05hCI3OB+6pF3BbUOjodMX5xpuLlL2he5/VVf3Djgl8Sed48z8QZ4cvKqmJQ31KpWmghb4fAm9QRkCI7oToE62dhWYQ1j0qW114Ne0Jb3ufO9zI79eGXhOv7XF55RuKI7KjeP5GENiRVx6GmEg+LaYgYFzlLgxKbdSHffMZmuTg== 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=BZFBFsrbB0hyt3yEa+eCiEPxsEK9z4IpU2XE0zFwWHg=; b=YbJ0Scq5coGc+THW0Oc0gWevRPt+qDShM08XQhRztA1IXqr34WJqHyH1HrVAcGUeytH3kL25XMRbdVQ+9LcSOsCQCkN5JV1xckwJefqSuuK5dUWLWFO0UDKXyM4LRqUuGVunfKZdxemrixO40avF+DdgITG0ZLSyP0jLg1OrKQ0lJoQ+aGDfk8yo6MnNxQnArIeSO9VEKZk8bkAc7NhKL+XxYB56KJVqJ2Kg16Vp9g8CfN0S5zZijNaKbKGOJoLFyAVABYO7r9cKX1O+gZ5duXng67EWk+KNKeXZT+vVd0TvMbl9qqAmdxdrtmvj8kA0aCPadwUt8oishxvESSm6Cw== 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=BZFBFsrbB0hyt3yEa+eCiEPxsEK9z4IpU2XE0zFwWHg=; b=dGVuFVXgl6+9hQOQyVwnRuR2s46k1r9XHo3sgp38TKkbWIA4NfLAAIGmMUo1flOz9mla9A2CQ7in9xpokuLe6B4DCu5sX3WcVyzRsUvY9PZiYrnQHOUIFbSYvViCKpVB2Wb2Now7PZwlf7gW41/fCwfCUY4wl/tqsgsAlK367MiAZYmft/30PW5y3oLLm+99wLvuLxpLrIfzLg1uIgqHv0TZfDtd06E+4AnTwzdYd85CfLmQRZDWcwdOP3rWuRh9UCUnaQtqXqoJJC1WWJ+GY05CQeHYCL5hVCllUxZypV5qBHnpo+kkMKBbxaBIstSpVQqowbeVO7SPhYnyikYxkg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4295.eurprd03.prod.outlook.com (2603:10a6:20b:a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.20; Mon, 20 Dec 2021 18:23:05 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4801.020; Mon, 20 Dec 2021 18:23:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Dec 2021 19:22:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [dXTmWNDNW74Z7XhoWFHZQMMYtpmO6Q4D] X-ClientProxiedBy: AM4PR0302CA0029.eurprd03.prod.outlook.com (2603:10a6:205:2::42) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211220182257.194071-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb29e70c-17e3-42ff-935e-08d9c3e5c380 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1J1bOOsLJxbiUlt95co9XpFHdSTvgAXc6qgUKHcXf+2MmamDwcouE5gjN8//Ocmbk3wld+PyeTtyjvh8ggtYu0+EQgcWcoc0gOXdC82NmM+xEQ6gzDjTb0LwDS2vFciO2Imj/I0XmfUScVT5qgmETJfM5Tp9AqfOTp/cqdKFXK20wYYV0cGR1O5i7e+Ayci1++YpTqznc700AfZ9BdjwGJJM79HoSRiBnq1Jmzo15XbAmdJbpD963BBzqo2akOlJKUN+0nE45HE88Egi2wgQ/zRXOqPXBVT6KNOXnCIxFDC9UNKgOChjpgujFzlohkentvYNYkVx5SretDMN+dSUmKE4YPttnbQlPUJAj0cm/XVy6leoxM2pQ9bjk+nL0cdbbxeFH8HqYZpfdzADe1CLb3qH4CnLmudLwqfbOcpAmboDSb2xDAWyGwtfPQLLDq+adMwvNFNXsPpv5jA1QpfyfS+QD+qAglVzGiYRvoxkHrKgxvreea7bGP+8KzNDpxhFB62UK6ZFokrK/qdpEj0u3uivRpPbAcSt0mUglozO5Kpc2t/Bz7f+z4bJO6HUfOIfEsAtoPUIusgrCjY57xh3xtMQRD34AvX71iG3QYI+fPuO7jaVN/YsdNN++OiI3l7+6+zsjIGahl4sLqjJvNuFaX9U4QjDYM1QuBpmZxJGimPdY7bj6IcZ3QuDgmgGfAfFL5dT2E4aWpK/txzbkbp7jjr0B7V0PEQUEsR4J1Iedybnw= X-MS-TrafficTypeDiagnostic: AM6PR03MB4295:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UbDf1x39rw2LccaZu1jZ+VirRlD90q3O/wXqTNvz60e1sHB2W1N871xRa7d3+aPCUwPWaTftv1t/Dm2Jo9JAm7yBcVvaM91EOap7PoP+4jSFMxBN3yNIKzsTn4F5o4EvlrwTvozfQ6G1xWenGQb7+29eX+VGytxRRRJE8ov3hzOdA19CafzzV4hMCmPRyuHxVIqzZriKphvrzHuLc0egOJr2fY3/bc9Ac19uwcVsqs7/IiMsw3ekL5jkUc4uL8Xanz/QLsXh/62krVe6kqwsTERAE4lHIImhMvbks8L+sW1500pOnVdZq/5G4hpqB0ibtd7VY++ebQYwv48WQ3Bn5Yeqg71xvad0CQv+q0QmHemk80vrgqh8+hZeGDUHviO+ji+zIdQcBSgCPolWQwS85p2Khw2B0v874bg8FQtjNY3A9ty4pTVXHgq/8WDJbHgsBDL49PA7MV0Oh/WsVWNL6dZUCrICvzkrPE0XXIrA+tV3vQDSWihGTYxMyWQKDGDdbubtRC1EeJPgGt/6iYrjYE3H75Rgue7uacXiCqG5loRioDS4KaZr1t9UFG9oYPXdBav+5bpEc8RZ8cgSG4dk2A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7x91EHfXqOjHe5jJal1Fe5iqxFgtP84Rd/ckoxni3c6p0iBDm6uluw8xPl6TxhyOdg7ppiyiDYk8+py1EsuHpUa5vfsy4RrhP0sIp/cysaDntuUvgTbdWBqASNwidwDH9BdPA7+1slybe/5SZ7lcWz9qU3k4lz0mO8/oLGPuq80uhcM1w0SeFwGN/CZv74UaC6QjE05Gm4E+UDgeHcau3SUEMXtKsODWnq/nHErOdEdvVtpnGdMEhbeBbBVMOGtHwXrlF8R+2nNOsfevlb2ADdgEYeiKNULfxVS2jeWAJ9DM5SH5npqtahzXmFawbP28wwNob2SjcfDzHmTT+ByDakm0xmOgwXwQ1/ACjO180mv3GMI3L0SWjnyCTw9xT+n1Ed88hXKUIXAvZ53yG8hPzIaMby4o7GqoJAf3k/jIZCqONjLkpY1uZT6c13vJI5PJFEdeGXhdHHeS9pY5CehOQBsFrI/Rrqv2L7Q7SC6OlVbFsqhT+y/DAq10m3FUW+cD6jfWPqGX3KgrVy9xxrTA8+BAKSTow1eDeALqi800MQsvZP+RB2ARX3+/7tuqfuE6Llt8XgYn2nw9PbkKEj9K70u03DXjjiiKl3/zTVQs+IlWch7I1gnFe+uBivSP1Fk127qyZPUVUpcnHZ18sYFuebE3h/JU6cP+BUc0A9Yo2SVWDZ/hzKvRtn+d5ZKFN9vrY8ieLvcSMs/YQTvSq8UyJuHIpsn/JpBYtikJqOCD1q8hPA6sjf6vjnn/KTraoDjFzmUjAzgFT0k910h5bACbV0Ri2nnroTEva9FtVpmnuQACNdl7tR2dKfpq5dfbK5Vsg0Tr6PjXJLPWJTzIiS0r5ArlWBTgbd0oAPVKq7utBa6vIGgBy8pWEm9RwNorOj4H4lAfl54A8a8VPLRAT/RVcWoNafS03Z2cciN4OKSuf8jeU8MkVtFAsNLWqrPTig57+aOcAAb/mPV6UIwRJdJwUQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb29e70c-17e3-42ff-935e-08d9c3e5c380 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Dec 2021 18:23:05.1588 (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: AM6PR03MB4295 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libx264: Don't unnecessarily add in-band extradata 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: ocAMq2g/omw1 The check here is meant to check for whether avcintra-class option (default value -1) has been set; yet it checks for the x264_param_t value where 0 is the default value (treated as "no avcintra-mode" by x264). This meant that in-band extradata has been added unnecessarily when using global headers; furthermore, the first output packet had two x264 SEIs. Signed-off-by: Andreas Rheinhardt --- This would have been found ages ago if we could test external components. libavcodec/libx264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 5f62c7b1d8..2b680abf21 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -944,7 +944,7 @@ static av_cold int X264_init(AVCodecContext *avctx) #if X264_BUILD >= 142 /* Separate headers not supported in AVC-Intra mode */ - if (x4->params.i_avcintra_class >= 0) + if (x4->avcintra_class >= 0) x4->params.b_repeat_headers = 1; #endif