From patchwork Sat Jul 8 14:15:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 4267 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1423165vsb; Sat, 8 Jul 2017 07:16:04 -0700 (PDT) X-Received: by 10.223.176.119 with SMTP id g52mr3451442wra.26.1499523364274; Sat, 08 Jul 2017 07:16:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499523364; cv=none; d=google.com; s=arc-20160816; b=YNTRV/C7gXB4K0KV7QrQKIdRnc+5V+XC/bbljazwEOrlMjdh7E4IWMr6ftjEt/31xs kJAI7VVP9G/Ca6rqm4N9jlcb8BzK1jFu7V8X81fp9RK9ykgWgaPhVe5Ev75Cbiv81lEp DtPRy3enX79tkdoJkxpUxzp8Rq8Rgi5vom7FPolBFQLaXa3kwl8dRqaLjrX932Gy/qCI Vrh+OGypz/UwX2TREPUlgUlASQ0rxpMqPI2P/Sg3Z4kKBZtzg6GNZ0ckKTi8J/ngBLD7 zaZvaz+okev4YVPtZ1U2dlYmHFgwAu/2sQe4xZPfWTk4EeWbAD1fgY36pGfDcrjlspCA hL8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=t8lV4P57DmAzJrytmFCYbtNdj65LA+/0Z8dryvvjgpc=; b=NZFUYzdkA8aTyCp2KUNVvBai8WJIKA0unP5GrXdT6wa8dEp+YLVmkp2nQ665wGUPTZ 4DAXjE0pMpNTaJWbMO8XxBGNuinhX+bTga03CAwh8fcrdfZL2jIGVLV5ZTsrnSM/IK+Y Xl+5vNq/bk2yFGkPlk9HMnr0UmCxU61FXIcHmN6penxn+LHLnyfsgNjhklUFNqqsu/ua ZT1iA5tMy2477Sdo132HFvDOnizsUNB8CMmJWjf3pe7S94T3HNDSY/8EDg9WzmOq3mZs 3rBh0heWPcAA8xUQRDhyHAgcpF8ROjmdG0GpuTsHJWw/44bzDCz1YACA3EYKvfpj26kV rPwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.b=LY/hDKEG; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o194si2046152wmd.103.2017.07.08.07.16.03; Sat, 08 Jul 2017 07:16: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=@jkqxz-net.20150623.gappssmtp.com header.b=LY/hDKEG; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81BE6689218; Sat, 8 Jul 2017 17:15:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0567E689218 for ; Sat, 8 Jul 2017 17:15:51 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id k67so81864443wrc.2 for ; Sat, 08 Jul 2017 07:15:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=qIdumYCTK2KdSA5djlT2qpBk8mGPpwEgXoilsxDShJI=; b=LY/hDKEGkEoqroM9y4uwDjF4GOxzbgcndp0+8On0FK84d7DbYPK1O2GEWW8fJbhofy KJ3ifhRfhUA5du3kDxeGdGi/fwxMxQNRjWG76r4gxysMC7xd+xdccI7Zenznviq956Lr cNpCM7E1VNQwrpTGRkAzLW/12YC9exBeiEiCENrxrup+FNURgs/KjBmF89ZVfKWcjbLT jJ/U9NiJd9dLZNh3h4Up/OPlaqxb9jBhJ3yIhK/PALZYAob5g9fAdtcIGeQjlhaoMJ5B v3W5w1YdDbmci/Zl6sxJWVLpBICgANkEQsVGsbXs79shd8ZSxL1/FTPpcbID2alAU6EA qp7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=qIdumYCTK2KdSA5djlT2qpBk8mGPpwEgXoilsxDShJI=; b=XQ33yoGNyHD4JNlNZf/w1xxWlO0adl8i+wJv9xM1P3m0Snmgs5wb9xm1ReLsU2Kf0b L6cAX3u/zo8Wwh6++Hc2eGy4ee/GIcleEd/5RxP8vpk28qcTSflu17EBI+XtqnwRfeGX eiGB1whzc/Lzq+B5AvIbWmAf+ZULPt3J4X9iXjSxR0SQpGMFYV94uGgTeYLSWKFqSsPv /J3XATVfkRa5EL6Q+GCHA8AlKURdfqlv6Z3zhWlaAinDvl/WdvyifOe55LlB5IVNsp9T cD9cLjV+FytyK3QrTjSCSoieB+iE9rlUpwePiZXsRDVMbfguUSjQSsWdwC8IBWflu6js lqbA== X-Gm-Message-State: AIVw111ccYGQw19kbVQV8ujgqAzQXONO+DUXJtj2LTR7r38Ov9k13r19 smFpEZSL44BrMXTd4mM= X-Received: by 10.28.15.135 with SMTP id 129mr2390309wmp.38.1499523353788; Sat, 08 Jul 2017 07:15:53 -0700 (PDT) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id l73sm5010146wma.27.2017.07.08.07.15.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Jul 2017 07:15:53 -0700 (PDT) To: FFmpeg development discussions and patches References: <8ef60c68-b260-83a2-8765-87737879e0b3@jkqxz.net> <5ab6c8c6-9e2e-94d1-3a0d-7ab1cd2e90eb@jkqxz.net> <20170707004224.GN4727@nb4> From: Mark Thompson Message-ID: <00af55ec-179d-d45b-8996-76c197233696@jkqxz.net> Date: Sat, 8 Jul 2017 15:15:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170707004224.GN4727@nb4> Subject: [FFmpeg-devel] [PATCH v2 2/2] pixdesc: Add a test for av_find_best_pix_fmt_of_2() 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" --- On 07/07/17 01:42, Michael Niedermayer wrote: > On Thu, Jul 06, 2017 at 11:00:31PM +0100, Mark Thompson wrote: >> --- >> libavutil/Makefile | 1 + >> libavutil/tests/pixfmt_best.c | 115 ++++++++++++++++++++++++++++++++++++++++++ >> tests/fate/libavutil.mak | 4 ++ >> tests/ref/fate/pixfmt_best | 1 + >> 4 files changed, 121 insertions(+) >> create mode 100644 libavutil/tests/pixfmt_best.c >> create mode 100644 tests/ref/fate/pixfmt_best > > i think this is missing a test for monochrome, and maybe others Added monochrome and a few other cases. Thanks, - Mark libavutil/Makefile | 1 + libavutil/tests/pixfmt_best.c | 125 ++++++++++++++++++++++++++++++++++++++++++ tests/fate/libavutil.mak | 4 ++ tests/ref/fate/pixfmt_best | 1 + 4 files changed, 131 insertions(+) create mode 100644 libavutil/tests/pixfmt_best.c create mode 100644 tests/ref/fate/pixfmt_best diff --git a/libavutil/Makefile b/libavutil/Makefile index b4464b0d76..b2662c843e 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -218,6 +218,7 @@ TESTPROGS = adler32 \ parseutils \ pixdesc \ pixelutils \ + pixfmt_best \ random_seed \ rational \ ripemd \ diff --git a/libavutil/tests/pixfmt_best.c b/libavutil/tests/pixfmt_best.c new file mode 100644 index 0000000000..a617633e9b --- /dev/null +++ b/libavutil/tests/pixfmt_best.c @@ -0,0 +1,125 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/pixdesc.c" + +static const enum AVPixelFormat pixfmt_list[] = { + AV_PIX_FMT_MONOWHITE, + AV_PIX_FMT_GRAY8, + AV_PIX_FMT_GRAY10, + AV_PIX_FMT_GRAY16, + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_YUV420P16, + AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV422P10, + AV_PIX_FMT_YUV422P16, + AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV444P16, + AV_PIX_FMT_RGB565, + AV_PIX_FMT_RGB24, + AV_PIX_FMT_RGB48, + AV_PIX_FMT_VDPAU, + AV_PIX_FMT_VAAPI, +}; + +static enum AVPixelFormat find_best(enum AVPixelFormat pixfmt) +{ + enum AVPixelFormat best = AV_PIX_FMT_NONE; + int i; + for (i = 0; i < FF_ARRAY_ELEMS(pixfmt_list); i++) + best = av_find_best_pix_fmt_of_2(best, pixfmt_list[i], + pixfmt, 0, NULL); + return best; +} + +int main(void) +{ + enum AVPixelFormat output; + int i, pass = 0, fail = 0; + +#define TEST(input, expected) do { \ + output = find_best(input); \ + if (output != expected) { \ + printf("Matching %s: got %s, expected %s\n", \ + av_get_pix_fmt_name(input), \ + av_get_pix_fmt_name(output), \ + av_get_pix_fmt_name(expected)); \ + ++fail; \ + } else \ + ++pass; \ + } while (0) + + // Same formats. + for (i = 0; i < FF_ARRAY_ELEMS(pixfmt_list); i++) + TEST(pixfmt_list[i], pixfmt_list[i]); + + // Formats containing the same data in different layouts. + TEST(AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_MONOWHITE); + TEST(AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P); + TEST(AV_PIX_FMT_P010, AV_PIX_FMT_YUV420P10); + TEST(AV_PIX_FMT_P016, AV_PIX_FMT_YUV420P16); + TEST(AV_PIX_FMT_NV16, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_YUYV422, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_UYVY422, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_BGR565, AV_PIX_FMT_RGB565); + TEST(AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24); + TEST(AV_PIX_FMT_GBRP, AV_PIX_FMT_RGB24); + TEST(AV_PIX_FMT_0RGB, AV_PIX_FMT_RGB24); + TEST(AV_PIX_FMT_GBRP16, AV_PIX_FMT_RGB48); + + // Formats additionally containing alpha (here ignored). + TEST(AV_PIX_FMT_YA8, AV_PIX_FMT_GRAY8); + TEST(AV_PIX_FMT_YA16, AV_PIX_FMT_GRAY16); + TEST(AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUV420P); + TEST(AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUV444P); + TEST(AV_PIX_FMT_AYUV64, AV_PIX_FMT_YUV444P16); + TEST(AV_PIX_FMT_RGBA, AV_PIX_FMT_RGB24); + TEST(AV_PIX_FMT_ABGR, AV_PIX_FMT_RGB24); + TEST(AV_PIX_FMT_GBRAP, AV_PIX_FMT_RGB24); + TEST(AV_PIX_FMT_RGBA64, AV_PIX_FMT_RGB48); + TEST(AV_PIX_FMT_BGRA64, AV_PIX_FMT_RGB48); + TEST(AV_PIX_FMT_GBRAP16, AV_PIX_FMT_RGB48); + + // Formats requiring upsampling to represent exactly. + TEST(AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY16); + TEST(AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV420P); + TEST(AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_UYYVYY411, AV_PIX_FMT_YUV422P); + TEST(AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P); + TEST(AV_PIX_FMT_YUV440P10, AV_PIX_FMT_YUV444P10); + TEST(AV_PIX_FMT_YUV440P12, AV_PIX_FMT_YUV444P16); + TEST(AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV420P10); + TEST(AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV420P16); + TEST(AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV444P10); + TEST(AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV444P16); + TEST(AV_PIX_FMT_BGR4, AV_PIX_FMT_RGB565); + TEST(AV_PIX_FMT_RGB444, AV_PIX_FMT_RGB565); + TEST(AV_PIX_FMT_RGB555, AV_PIX_FMT_RGB565); + TEST(AV_PIX_FMT_GBRP10, AV_PIX_FMT_RGB48); + TEST(AV_PIX_FMT_GBRAP10, AV_PIX_FMT_RGB48); + TEST(AV_PIX_FMT_GBRAP12, AV_PIX_FMT_RGB48); + + // Opaque formats are least unlike each other. + TEST(AV_PIX_FMT_DXVA2_VLD, AV_PIX_FMT_VDPAU); + + printf("%d tests passed, %d tests failed.\n", pass, fail); + return !!fail; +} diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak index 97eae8baf4..2938b47155 100644 --- a/tests/fate/libavutil.mak +++ b/tests/fate/libavutil.mak @@ -115,6 +115,10 @@ FATE_LIBAVUTIL-$(CONFIG_PIXELUTILS) += fate-pixelutils fate-pixelutils: libavutil/tests/pixelutils$(EXESUF) fate-pixelutils: CMD = run libavutil/tests/pixelutils +FATE_LIBAVUTIL += fate-pixfmt_best +fate-pixfmt_best: libavutil/tests/pixfmt_best$(EXESUF) +fate-pixfmt_best: CMD = run libavutil/tests/pixfmt_best + FATE_LIBAVUTIL += fate-display fate-display: libavutil/tests/display$(EXESUF) fate-display: CMD = run libavutil/tests/display diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best new file mode 100644 index 0000000000..1118198098 --- /dev/null +++ b/tests/ref/fate/pixfmt_best @@ -0,0 +1 @@ +60 tests passed, 0 tests failed.