From patchwork Wed Oct 6 10:37:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp237037iob; Wed, 6 Oct 2021 03:38:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2UD5Z1YpFTIwIQWRq/sGVGenufyi4w1VPdTOQT0urxLbFKNUBOHMgCzd/QOCPkaquskT2 X-Received: by 2002:a17:906:9401:: with SMTP id q1mr31073715ejx.313.1633516684200; Wed, 06 Oct 2021 03:38:04 -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 v4si10061679edc.167.2021.10.06.03.38.03; Wed, 06 Oct 2021 03:38:04 -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=PzUFUAB9; 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 28D1C68AAD5; Wed, 6 Oct 2021 13:38:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073046.outbound.protection.outlook.com [40.92.73.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EE1D68A89E for ; Wed, 6 Oct 2021 13:37:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JCd9lEbE4KkR9t6aCPPyMCNasMYYnUJCKaXWwbfVqrjNWHk5EcCMp+xAJo+/Vbp1srL5IDlcoMgE27dQf+ju2DPf8moAheUrUwbxq37I3wy1oO7r3U2dAIYVMpeByRntfIWMEnBA4IP1qZYyH4uOtdrGZAIYJmL1coQeUi1ISVBphkAZVQEfX0f5NmSMESDOHgb5Q+IHaYKDeGJZw8r8UGYVJcr0J5v6M6pbBfSfrxPxC/Tze8sOP+b24F2CvOqrOTPPkT5vGkJio7LrX9IYorpx4EsZX/duhiOc5MUFWWOROuLFqOJqZJeZo8llinhT13Kelv4tbQFkr7111nO9vw== 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=ICksBJRXUqhdVxKn14TdAurGngykKzqs0cR+0r2X3VU=; b=WbJ9AUjKWo/GyZZre1Tov/aWWe8wTo5I+1aNQsyeki8eHOkUBi7Txv031XDlJ72AwEetlxqTF931cctEvarzQDjDMiE+h9Tw8ixmT8ZnNFCFbb1m6wj7wZM7zUj0d22Sl9Au+4DPbYN8uVma+EYBn3UK+DdgnxbOsyhyocTT2xhFIghQVTYZEyqkFROIovArLZXxUY7wjArUN8O/2EXc/T76G/Eu2OkvvpjxRjuPFnQeW4On2Jgkr1JJNaDPXcgBwwm6z6D7nrT+JjpcFY68gluuD5jRCK1KTDPhdupyUxXIuPaoHO//zd7x8Jp+y2i0y7IvH2hBZcYcHzQZBjICVw== 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=ICksBJRXUqhdVxKn14TdAurGngykKzqs0cR+0r2X3VU=; b=PzUFUAB9JKopDXykwdq2Ilc4yeTTeMxeov+rg9ESAq5REVgHZldrlycoO8LcW9U5Y3eLphEHUpUMCroce0maN5AW0RcdztRGCmhkixXkiL6qGObURVLsW6IIJDEoA2WHVf/utk4wGcpBKb9C3udchGu1xAxsBws834ZW8zgZnVgIsEGPOHMfTKRKGqRQQ/3KtnUNlaS4HonmW/uyCEVvnee4E0fp/gXYxntI/gptphe3WGib+ONq9jKYHz6/KlFoMpcGjGC0lekj3YA5+uE+TasiP3HneuCu3PwHXBuiaMjrdG6ZZbjeEBRWILCrDytbi0XAtgp+5kWQSqGrD+pXvg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5768.eurprd03.prod.outlook.com (2603:10a6:20b:fe::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Wed, 6 Oct 2021 10:37:51 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 10:37:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 12:37:44 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [qObFFhxd60RKJGaMQspDiEIu28VwXzYi] X-ClientProxiedBy: AM0PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:208:122::16) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211006103744.540384-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR04CA0003.eurprd04.prod.outlook.com (2603:10a6:208:122::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22 via Frontend Transport; Wed, 6 Oct 2021 10:37:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d07bb04-0edd-4fa8-49cc-08d988b558da X-MS-Exchange-SLBlob-MailProps: EpEO96k6WolZnmepdNXRIKsBS4rQ31ZKxESuLuKIr5Pofhv/rg0hQdOz7cd6c8z24JyS3rmWVdu7qwFK9jvXAraoIaCS9Ke4nR08DNB8jvmFlhPx8e8VW9O4dbJUr7itR2NL4yNVmA0g/3BcQMaOkRRh22MJkhhMOb68gPqLXEtglzVI1KcEN665FopPjo6etCvWTS/KmWaGou9siRuy/RJP3NzpyJudy/XKsvO17gUgJGPLNOUQvd8rGScjA7peVLPLe/61zqwT/z/OsusbdI2Tmfb/XMAei9PlAnzG+fMkvRKX/sr9gX9TrBbvG8MhMP5ucfyv9qKsCzktVUNpvXAMeeZiAxL86cbtDu1bIWTVSPR1avfgfRwJr2JX0Am25RxSXCuwqeTXykD/1JegUqp/sHxF2CnCSaEEDUXyoNN+HfADcoNnw6DS0SFJ8jwgTubDAZZC7R8ei03rPFibs4NMg3p4mVKQBKh3WeeElcFldyMzy2HWWpDJWBgfdzjkccgSFDtScdQ3KzW1hgLzsCHyrP0paLF1Nwb9LHwWlyimigstqC1ucBuF4tlgb0kEevUapVWo0IJnvf7tFvSgRfZFQMeDWWAt2tFvVmBQGUBxj7XfWXwfUfyGHPiqjB3bn1uY7yDhp3o3uMH9kMIG2+cyG0yKcaAnxBvs4ocdH9e/+J3Bhly3PEwQDv6948V5TYBXrzJXSL40oMfjN/DeIWEFoUHrlSBXLH442+5Mbm/99xyhuG84qFab3X7afza4+OJCAPBwhMM= X-MS-TrafficTypeDiagnostic: AM6PR03MB5768: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6dQVj73BZCgJd5my9jy2t8kSSHe8cPf9L2Pa2E82gGY4/81oRwJQGsi8xphQGOngZJF47+YNQ70QL1SnynYuXIkKgCfbGxhpuCCNCKAk+NKOV6YFGne89dh22J6hhJ9bCkY6JjjZT6PSPymWRs1YbS8zsr5DoDD3vvgNyBehpKPMsrKf61JJFuxv0ePWanbueEMIScpwEGFjSpvzk5U3vBKRbzIGLK3fmpaiAqnUgY1qZIsamsvobd+95HZj5VdO3k7lhYOdtp8JxvdpFAJio484545VsvqhZj6/paUXuQEBxCADSZx4op9D0C0yy4jmSwZf22PxDvhVQa4qsGbjEtMJEMrVTk+Uf6m22bU1tVa1t+8lPc7GDqxdby8ere16Z8pL6qX6mkapH8tKj11iQIxndSD16XVYx9Z/fArQVObBCyel8u0zuS/GoJF7hpRi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TNBd19gjMpRl7Ki7pJXfnkM1SrN2I4PwmLaYjqvMAyV28rdN7df4EfY/TW5//kcM0rJ7AWXxtIe/hJx+jntCCg6Ug7P7wfjm9eGnFP+b7FL2pcQMzvVA1db4cDkh88CEnMmiaFhjUc9LNsrVZ8e73w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d07bb04-0edd-4fa8-49cc-08d988b558da X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 10:37:51.3562 (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: AM6PR03MB5768 Subject: [FFmpeg-devel] [PATCH] fate/image: Modify aliaspix tests to also cover the encoder 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: qJSe84k7bk5v Signed-off-by: Andreas Rheinhardt --- Will apply this tonight unless there are objections. tests/fate/image.mak | 9 ++++++--- tests/ref/fate/aliaspix-bgr | 8 ++++++++ tests/ref/fate/aliaspix-gray | 8 ++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tests/fate/image.mak b/tests/fate/image.mak index d1f9765eea..573d398915 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,10 +1,13 @@ FATE_ALIASPIX += fate-aliaspix-bgr -fate-aliaspix-bgr: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/first.pix -pix_fmt bgr24 +fate-aliaspix-bgr: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/first.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 bgr24 -c:v:1 copy" FATE_ALIASPIX += fate-aliaspix-gray -fate-aliaspix-gray: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/firstgray.pix -pix_fmt gray +fate-aliaspix-gray: CMD = transcode alias_pix $(TARGET_SAMPLES)/aliaspix/firstgray.pix image2 "-c alias_pix" "-map 0 -map 0 -pix_fmt:0 gray -c:v:1 copy" -FATE_ALIASPIX-$(call DEMDEC, IMAGE2, ALIAS_PIX) += $(FATE_ALIASPIX) +FATE_ALIASPIX-$(call ALLYES, FILE_PROTOCOL IMAGE2_ALIAS_PIX_DEMUXER \ + ALIAS_PIX_DECODER ALIAS_PIX_ENCODER \ + IMAGE2_MUXER RAWVIDEO_ENCODER \ + FRAMECRC_MUXER PIPE_PROTOCOL) += $(FATE_ALIASPIX) FATE_IMAGE += $(FATE_ALIASPIX-yes) fate-aliaspix: $(FATE_ALIASPIX-yes) diff --git a/tests/ref/fate/aliaspix-bgr b/tests/ref/fate/aliaspix-bgr index f5c6b7d475..4f55e0dcf6 100644 --- a/tests/ref/fate/aliaspix-bgr +++ b/tests/ref/fate/aliaspix-bgr @@ -1,6 +1,14 @@ +667513c8869eea09e1374a73eb21233c *tests/data/fate/aliaspix-bgr.image2 +63090 tests/data/fate/aliaspix-bgr.image2 #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 201x79 #sar 0: 0/1 +#tb 1: 1/25 +#media_type 1: video +#codec_id 1: alias_pix +#dimensions 1: 201x79 +#sar 1: 0/1 0, 0, 0, 1, 47637, 0xcb77368f +1, 0, 0, 1, 63090, 0xe49bba3b diff --git a/tests/ref/fate/aliaspix-gray b/tests/ref/fate/aliaspix-gray index aa7b4649b2..4bf9c43e0e 100644 --- a/tests/ref/fate/aliaspix-gray +++ b/tests/ref/fate/aliaspix-gray @@ -1,6 +1,14 @@ +2d7ae310710798257ebcff8a41c646ee *tests/data/fate/aliaspix-gray.image2 +28868 tests/data/fate/aliaspix-gray.image2 #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo #dimensions 0: 199x81 #sar 0: 0/1 +#tb 1: 1/25 +#media_type 1: video +#codec_id 1: alias_pix +#dimensions 1: 199x81 +#sar 1: 0/1 0, 0, 0, 1, 16119, 0x3d0785f5 +1, 0, 0, 1, 28868, 0x02523ce2 From patchwork Wed Oct 6 12:05:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp307345iob; Wed, 6 Oct 2021 05:05:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxiF9/DDStQbTXrQEb9vWmRzYz+PiSsO+gH1B5ZIRKuCnrUWGuNFR2ueBOVxW8jWYDvmDYv X-Received: by 2002:adf:c70f:: with SMTP id k15mr15771295wrg.98.1633521926257; Wed, 06 Oct 2021 05:05:26 -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 dg13si24344667edb.604.2021.10.06.05.05.25; Wed, 06 Oct 2021 05:05:26 -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="r/3ijDpa"; 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 0380A68AC6D; Wed, 6 Oct 2021 15:05:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067040.outbound.protection.outlook.com [40.92.67.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15C9068A783 for ; Wed, 6 Oct 2021 15:05:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LXT4D3346Op6wUxZmuNIoVW2WU+E9yr8aVvyBXTtVYiorPi2ODlA4vSp2cc4ZnYP3hwMY6bSKcImn0FCFlM4V+ilUIy5vAoG1OcruwMBrk2gw/3L9y2udUelEXWr1Up24FhDG+SNKtIhZuYiAy6iuSlSozDhja5wo6HBH8AK9mc170Olix0srxMVkZijcZXMgu22YgcID8IYov9/ND/ckzgWO4F+70rpIrRjlBTdzg6f9RHTZe/hlgqcPtklyHkuDcWnktOwaNXfAcSvJ64UGKb5neJ4WP1I7CXwmsJnYm0BGulGA5DY90z17t9GxPZoZmkpMt6ALDe09s6Wdm4spQ== 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=D/sw2TlH361QfrJy3XH/OeLj9zYHviYKK33fLK696wI=; b=Evg4sf/ZmN4ozaqdVFTTrYYEMu6FLKBJ2lVIxBLXKikzIwxfGqwkFgU290+3Sko+41paruFFv9JT2IcUeSXGP3SSdgZ4MsSm6Uhtlfe5N0Jm/6jNI+5ZF/HRnjgQgrOhiFBJVt/k09PPh2Z7PVwKTrKI180urAZXXFq6tX2zgF7L1cR4a6c1TOcMLrqmPsvDJNPvLNcXg3c7+r/Jp30FBg5Z3SolLBkYuZSYYDv6Ix+lX9aGqrhXgQGzGs0pYumKvEnFxLj7NCQiIj+lcUh1K3VQujog5x9lEqdb9VvxsUrngzKW6MfLc0uwCcsg4Lf6JDAzNjHAYs3q5hySxTqWPg== 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=D/sw2TlH361QfrJy3XH/OeLj9zYHviYKK33fLK696wI=; b=r/3ijDpa1jH3uiCvKUftEFU1gAQV5uFhAZH2UUCUipVhHMHEaylJnzTaM9ll/M0x4w6JfNjhvkEaPNtJQYg/M8COBLE2BeEfts98kC8Kkh7TNgCsdoktL+VaK9JfrDZDGQamkz6I8ZLOj17UuU5D5Euf16RdsnPK45TGDmGYRVlRDEvSyODsSGgFTATvreV0I8EdNWO21DP7VwXTlSIUrlhko9W2SswTCF4DV9euAezPQrETX0EjXSpbn9X447K8fo951kPpNPrKVIDPTHbcLcP+csQ70hYet1EqgTqP3XrVprk/WnMW+zrYJBQ/CVpltL0l8A1xnqF4kGN8z7Ym/w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7351.eurprd03.prod.outlook.com (2603:10a6:20b:2eb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Wed, 6 Oct 2021 12:05:13 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Wed, 6 Oct 2021 12:05:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Oct 2021 14:05:04 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [pYrQwDAxE8y+N9bTHn32h0Mh0orr8fKD] X-ClientProxiedBy: AM0PR10CA0054.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211006120504.542845-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR10CA0054.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Wed, 6 Oct 2021 12:05:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8501f6f-547f-43b8-fec3-08d988c18d73 X-MS-Exchange-SLBlob-MailProps: pxu8rxgqUgjMfRsv5IJahVV7IwzEunafOekGOl1jMBz2wyYYsS+A2mHcqDY+cDJ5LJjIy2y0sspDtLEa0KzsceaD/1e8FcMfkVtVVppqWDGTd6vByvjjMC2JOtxU6h7V0FecKRqXYOB0mhYsYzF4jzPAidqsAkJ4ub0uqeN6Kf8/TF6jde190fjQeI4GF6d7B9BXzV4MG56huVjka4C4vwsAk0Qm3/gBhjrutnBU11h2hf//H7m17aPNO56ZLBA54ljQMtIsFhtrF0kxI2g5y8J0KHVaTnjQnmIHWGnU5gRHWHU20BB/nt1dEIIxDkbjSrjtz1d/+CbZfBlH60fdaVydl4nrlrdTHORo89Npv0/LBP1EE7dcU/8rCiXqvJVH11TfOS5Q5mAYhw7ua+A9uYkK26W49Za+m//LcL/d7aL3XYvSzJA5fPZ8kaA9aoLX2cfdvlXZ5Eoh+vlRh+90AB312es1vvyOq7W2ipE1Eoyt8jCHUsAGsdrne44DeFi9PFJYYCmvAwAQcYYYl7j6La1sVdPWW6aw0kwHkqesftjk30jevyaqZPJuAeMhbBlx2XEvHy57QquhW1vPIu2Rw3Af9uujPiv2E9cdEGCk2mxiK/hx+KKNLNdMdmFz3IfJ8CvH7AMk+u6RsbswmcR/d//g23Dd4/9pPraxCic4rpFLp3lnCigVQKjJqBoZOi0Lh729uOmDMdys9cBS8AEABQ== X-MS-TrafficTypeDiagnostic: AS8PR03MB7351: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: di9h10cX0j0kdRIvTY8j6yLvJjokS/2i2cXno2m4S153pR8p4Er3I7TAxYeykXmJbaZu5/kYPNv02T7EQbjxQLdHe/dIBEIbXkgRUrYLau0H0m0OiH2JLBVizFJAmFX3qvBUUWr3NyZ+1P8iIeWXyuqz0xjW6xIqPm7tFTA5m0iThgP28JOw/t7MoKpHxx2VILnge48vJL8GoghJqagm25kGb+5edqA2VbDTKcxLtJmylCGWj3nYhiropaTPLGjyfwJWw3LHwJtD97/GsSfm9A95vAosKK7j1oeHNo2hrJ3nTzofzVR1iL9RSyhiWp2Dm6H86FVPI4zXtA4AuDcG/qSyLgnm+iLZH+rotC1RblhgXsVI2HZKfk7aUZmrWkzUJ+BqBV/g2y0xzO+K2OT0B4ITABRd33WZh0WK5fIQx+dL0ZjIEl0813B8trKm7KvZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7cFFwyzwU+759HWIPU+NAMmikxLaZ7mRMF3Nocqwo6V2zdz/JQY0+oP/tFNPn78UNnTN7UqxbMZdT53/dyrTP1PHUae77hOlj6k6VktOnlTSGKrS4FVaYO3iS6xemWjjO50H1rkQpS4vrCvWobABVA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8501f6f-547f-43b8-fec3-08d988c18d73 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2021 12:05:13.6166 (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: AS8PR03MB7351 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/aliaspixenc: Remove redundant counter 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: iBfIL75xSPVE Improves performance by 33.8% for BGR24 and by 26.4% for GRAY8. Signed-off-by: Andreas Rheinhardt --- libavcodec/aliaspixenc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c index 01461c984b..fa273df9c2 100644 --- a/libavcodec/aliaspixenc.c +++ b/libavcodec/aliaspixenc.c @@ -31,8 +31,8 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { - int width, height, bits_pixel, i, j, length, ret; - uint8_t *in_buf, *buf; + int width, height, bits_pixel, length, ret; + uint8_t *buf; width = avctx->width; height = avctx->height; @@ -66,15 +66,16 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_be32(&buf, 0); /* X, Y offset */ bytestream_put_be16(&buf, bits_pixel); - for (j = 0; j < height; j++) { - in_buf = frame->data[0] + frame->linesize[0] * j; - for (i = 0; i < width; ) { + for (int j = 0, bytes_pixel = bits_pixel >> 3; j < height; j++) { + const uint8_t *in_buf = frame->data[0] + frame->linesize[0] * j; + const uint8_t *const line_end = in_buf + bytes_pixel * width; + while (in_buf < line_end) { int count = 0; int pixel; if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) { pixel = *in_buf; - while (count < 255 && count + i < width && pixel == *in_buf) { + while (count < 255 && in_buf < line_end && pixel == *in_buf) { count++; in_buf++; } @@ -82,7 +83,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_byte(&buf, pixel); } else { /* AV_PIX_FMT_BGR24 */ pixel = AV_RB24(in_buf); - while (count < 255 && count + i < width && + while (count < 255 && in_buf < line_end && pixel == AV_RB24(in_buf)) { count++; in_buf += 3; @@ -90,7 +91,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream_put_byte(&buf, count); bytestream_put_be24(&buf, pixel); } - i += count; } }