From patchwork Tue Apr 6 05:40:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26772 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 9EAED44A9DD for ; Tue, 6 Apr 2021 08:40:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86C5D68A551; Tue, 6 Apr 2021 08:40:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074024.outbound.protection.outlook.com [40.92.74.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0664E687F21 for ; Tue, 6 Apr 2021 08:40:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RPZuMO/zY46zXgnwQRGwRUSQCViBLWKu1Yqsz2iQEkhQCkAAXML20n/ZDfK/X2eLyqhrGYrxJcb4ez0mDy8W6pj1Yn91q9odhkhzUodtos+xWj1Fh2WRY+kYuKK8thXDEgJlOf+x8iqBBrbP0i+WfBcq3DCydtuVVHbzmZbDeKDxq7ykM8CLUm6Xm8e6Dl9QZ06XTlx17/ncgl8djUqH1RF6ARadPIuOEOa2NoPyqXrqtIZLnMensVzD9Mb8dcWPP82/wZI//dDKcnPbCECjMcFS2hCOop2d82d4iHD2jV5muL67l+9Q+1HG2VxFtZ6iessikw3KG+dGmFnCSHu7VA== 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-SenderADCheck; bh=tU1YnKWNkrfHEMGLIjssS/AyPieQQo0O6eZMikbO4Gc=; b=aGFKjAdYad3d2N5WkYBsbs6r9a5HyWix0bkxk2P4Ea//LQdFl8rcEg42ILCzmB2LxXQ8WaznyoFaOrZt03pC5NwBK7u/t47bYxq1C9ngSif1mIzY0AVl6MIVgYbCo/+z0Agm5czZ9ReIdA6SlOgrRU8lO/MZ5DcnSwr42iOm1DpiTCO4aofJoNblWA1hXIzRs+gXb+CdWIsEyAhHG5zajFnZAC32EveWnmDOpDrPHkGpsb6hOglZX3H+d2JRpDna/12Cu8/odEMWZxUIZAwvQlVj1szuXn6Kjad3SZhOkMKkawEDuJZ8NcV+ArVnv3mX9FiFiPu2EPVcE2m2sB7AHQ== 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=tU1YnKWNkrfHEMGLIjssS/AyPieQQo0O6eZMikbO4Gc=; b=gmW0v+v5wW9S3iH5+woUmQ1gqdKjmBQ1QHpr2fOreTlYJMUAwblPu+Rl0KYRKJO5SuM2R2ixqcZVq0aPHod98uwxU6hVvndqGFCMLH3gmGAgUn8SEk3G00z7jL2hCVfm21eOdBsNMEok9YRPDG2HSrmYokJ/xPhABG3E5wdz3EREfBZFi/lkb09vnB3YIqpQvSU1MJvldSalZ7DswhSNdVTq5E/Zbslf1s/saYpFIc0fRww9A94lPHy2frAmTXpfgA+19FOMGTGEFfeAB8/V6nrb5I1BluPUjQphKqaAeWJpXaJD765zXdbMg99Ofwgwmp7XJHpvsGNq2mhq8S21AA== Received: from HE1EUR04FT014.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04HT080.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Tue, 6 Apr 2021 05:40:51 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::48) by HE1EUR04FT014.mail.protection.outlook.com (2a01:111:e400:7e0d::164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Tue, 6 Apr 2021 05:40:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:966C4DA06FE81A69F570F28F58558154F11F82DDA2CEC33D1F58084308353703; UpperCasedChecksum:F88FCE6656F42566113F465DD24BD35E1C49D185DF9AC60CD64BD1B226F1EBBF; SizeAsReceived:7608; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Tue, 6 Apr 2021 05:40:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Apr 2021 07:40:12 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [PGf2GWcgJrMcbTMvz0UKTqvU5SprpWuk] X-ClientProxiedBy: AM0PR03CA0024.eurprd03.prod.outlook.com (2603:10a6:208:14::37) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210406054016.452174-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR03CA0024.eurprd03.prod.outlook.com (2603:10a6:208:14::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Tue, 6 Apr 2021 05:40:51 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1c0676bc-0516-4b0c-d0ba-08d8f8be8a11 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSbyvoxwwqtt9ZF5aXTIDASN8IrkvGOAwdfU3jhJZYF53zxb7/Uy0m119ifbJ/Y+K1cq7yGBivW7Vj7i8rA9ViTgXoN4IMky6NrcmozY1lrrUMa1iXsZVfBik2P9DpkkztagxT1NVm88sxrVN5rP8B7t6DHjjG4Lfh6KSJRSTSkIsRzrAFTIMFpuTKuZTV5EmBZw7iz2n4ppNyiuphA4HPW/LrdLJB00MhCwqNUyQVewJoOEp3/FFWeoGj8KtUEkD484kVzSfsmUnA/Um+Usz2B/F+PDo8EGCLXGA/KKd09lXIIwNzU8UzHO50lJjQbJYtMaaIrM12aUcusV8b4e7kmHo8LqarQsvnDZtZtTkJln8M43MhemGVkaRc81AGcckZ/hk9UBjm25x29XDpDastYqZ2Cg3y0WpauR7Fo+lNpiSQjRy+eWnGj20aJxv2K/noHMoU3xz0Xe5eR/6dIAqixp5Q8mfYFBVpi9dLH4D1ltp5++ewJqIDpH0+3iT8esWaBMRR8Zi9bNWY1W1/NpY92qtiHTSjLJ+eNJRulF6TQFRkfWB0G7+8jN07m4jsIqW8oWVZnY9rU6vad3N7hgHEc2lQ4fEqpR09v+NJTgTzQ3zB7kJGhchkOpQMso8v1ZYtMIQxm9CPAPIr0rbHhJxIirdtIWheNAtkzmvBwIfqS6Mlm5k1opQJ53wfGZnd2mRSLV/xeJSulQIUyonlKpSp/iVBQ6gJJySHabrTv6OO+xyii9gpmMSIK8b1ZDGNtuO4= X-MS-TrafficTypeDiagnostic: HE1EUR04HT080: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TiZYdXQxW6ruhZCsfLbbsNQnFkLKhXJdSzZTrT5p/D8tw56ULWZP+YoJqJxkutS9jPADaal5RjmWSdVif+cHPXCEhFGFagEQ0YZInQhtTzygYgqZTpfTxkIX/AJycu/UMhClPB2Lq4ZxemGmhcpIZe/NrE2x5hJuqq7RZE19DNzBJglTJ9pMKyIy/NqgA1ttlwo/mbwVSMVCblBdh1Cnp/5uoLjTszdAqrEqHyy2jKjrnp5qdz1xK9qLp5EivgGm6Ni83xXKjncaq2+ughuq/2lCxu7ok2/qGhtkhPKsFWNAl3Z3+s/XA1U2FzAbWfdkKvUB8Tm8c9YQvKOQZht+3Fh0NlVRxtdEPF1ETSDquI/TqMYQHQ/Kddj58RRCyzw7sW5d+TMQw6x72Z/zGRU4HQ== X-MS-Exchange-AntiSpam-MessageData: vfJLghHXCJtg8XoI5cNwoAAhhLVkiXVZtps3aPiUS2wCfLOfWK1lCYlxgd1uVN41WDX2QtIfeIeIfo+3ewTPyMe4GX1C7NJKstaOpLVt2ux703qH76nb3KlGijktwGb1LcOglh4ioT7jO7EEM1LE7g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c0676bc-0516-4b0c-d0ba-08d8f8be8a11 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 05:40:51.8512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT014.eop-eur04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT080 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/ljpegenc: Allow full range yuv420p, yuv422p, yuv444p by default 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The documentation for AV_PIX_FMT_YUVJ420P reads: "planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of AV_PIX_FMT_YUV420P and setting color_range" Yet the LJPEG encoder only accepts full scale yuv420p when strictness is set to unofficial or lower; with default strictness it emits a nonsense error message that says that limit range YUV is unofficial. This has been changed to allow full range yuv420p, yuv422p and yuv444p irrespective of the level of strictness. Signed-off-by: Andreas Rheinhardt --- libavcodec/ljpegenc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 056b80b4b5..dd91c729d4 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -295,10 +295,11 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx) avctx->pix_fmt == AV_PIX_FMT_YUV422P || avctx->pix_fmt == AV_PIX_FMT_YUV444P || avctx->color_range == AVCOL_RANGE_MPEG) && + avctx->color_range != AVCOL_RANGE_JPEG && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { av_log(avctx, AV_LOG_ERROR, - "Limited range YUV is non-standard, set strict_std_compliance to " - "at least unofficial to use it.\n"); + "Non full-range YUV is non-standard, set strict_std_compliance " + "to at most unofficial to use it.\n"); return AVERROR(EINVAL); }