From patchwork Fri Nov 24 00:51:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 6321 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1465572jah; Thu, 23 Nov 2017 16:54:08 -0800 (PST) X-Google-Smtp-Source: AGs4zMaQpR447VwkZl5K38ZYpkblBuAU7yR55cu4z02sIiIHi2LmikNK9i18/MEymT2S3pK7sReX X-Received: by 10.223.195.103 with SMTP id e36mr23441455wrg.10.1511484848405; Thu, 23 Nov 2017 16:54:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511484848; cv=none; d=google.com; s=arc-20160816; b=EE/XreaITVdTcQbbVxJq1JkFCr6CmEvcGKL4eQTXxtXmW10DJh1nf97Tf5BCTzvw8V FsUidmnxyflmkJ0gnHZ1DR3Ug1MgyNCUeXxsBJejjo4p6RSYYM3K/juqFwqTg75IyzUO q8HFLi7fZAO6RsRzJWV/aP4PUNq9L9B8mZ85Ch6uOkb8P40RwP9fVp97r5H4GMdWNZPC WIMrBs8ij0grEbJ5XW7dkeM6x0CU4d3H+w4U3BAc7hOIOV7IUscLRUPGvB1accTWsAjF UL70S6y7Q+GD2du/xijBkzDKC2+5pIRqC8bvksILSA8+33aKIw37V9agbR1KIvjBBLuf 6veQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=/xKqwHBgo0rbm3UCxzp8dPvNYE9D9yJYtquhz+5SxFA=; b=Ln7fJLD5VsUlZPHbxK6susDCio9BP0ybiR1yxOPZd2J5CNEus8R9OXtxJ2rw84gKJK U8L2UuapZse37X6UJ4pcVIhqDfevQWz58j6MeJaaQZE00AsVr/JduqzYqKkoyIHbMeQT vPGaa8stQ9YYUKtXUixYI4Te84hpsj6TXEQzd979IGFhdHum52Y0JhUzfq0cTsACRX9F ScdsKCY0DPd8kAGk3SHvGLzDGTNWuWgY+Vp5pQXMYowYgQ45WX6zkKmssiyp/ZEKIpd6 ZJvVEV8mLSk8qMFWDPPpS105Bm3+nIqg2vcFODBTKSquylstuBJF7Ba6zAtRyhe/0SyB KjSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=VLXvzdpB; 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 v7si16098107wrf.198.2017.11.23.16.54.08; Thu, 23 Nov 2017 16:54:08 -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=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=VLXvzdpB; 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 68F2068A28A; Fri, 24 Nov 2017 02:52:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F13768A261 for ; Fri, 24 Nov 2017 02:51:54 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id y80so19528126wmd.0 for ; Thu, 23 Nov 2017 16:51:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=AZusLiTFAoYOmSXqzOB8r/D3dljYLx3gIRsQytf3SFE=; b=VLXvzdpBts9OtOrS41YtLep0SkS7VIQkOMRz00crdberEu5+h+xYZJMr/cjEAv6PeM WbT6GWLerfJQyXcYKWXZLH7afvLjdaFr9w+FiEZiom2U99BcMvUfJyevzdquARJd5Xnl d6ea/h37Oxv0bmFxhCHvW2KijfC0K5rkPNyRMXP2TJpxQH2vbwmoELriJ5pOexSUiC7X V5+DqlZjDtuEzQzGD+00AdJfcchI4ZjUa//j4U45dN/y/lHzGjYXnH8msAYYyhDcMhFy djGkWjvl1e+gkkUU9TCgmAzfLUB9zf6qxQlXphnJ2apCuX3XSPH/+dvmeVbiD0cowhQq MtFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=AZusLiTFAoYOmSXqzOB8r/D3dljYLx3gIRsQytf3SFE=; b=nONtHgZ3xJnrtcDox1y4i+LyrZQVOchnfHuL4/K1cEzeYnXOSDHjY3UEZ145zslr8A +1GtF5AK6Yko2G+AIoR2V6R+foBXFZcFzglKz/VOzP/f1bxrB+2UwVZI6npW/+AFGLsC cDjP681zSlX11s9SPlbrFW0v923Qh4rbKXhh9u6iiHkGtTEEsPNeXi1mJil/ZtcW/FNu L+MQbPfkMCgT71pvy6nOFMzSDtbjCvFa4kvvjm3dhybuNqmtDltr19NWgQEID5A1DhGP TUM6lx85YkBE50NlAAHcKvgAEFVDXak+RKLfTUsRveQZ1uj7Jfnkb7TXtolnhcbZWIYu o+vg== X-Gm-Message-State: AJaThX5q/q5abg4znQKx6hBQDYabKWbkrkPE/7pN2xMSDh77Pa3NxZuI LAwnOzYzaFV6K0llkiIX/sAtd2j3 X-Received: by 10.28.235.22 with SMTP id j22mr8736026wmh.68.1511484714502; Thu, 23 Nov 2017 16:51:54 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id h7sm4489655wrb.35.2017.11.23.16.51.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Nov 2017 16:51:53 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Nov 2017 00:51:33 +0000 Message-Id: <20171124005134.5683-16-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171124005134.5683-1-sw@jkqxz.net> References: <20171124005134.5683-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 16/17] hwcontext_vaapi: Move better-matching surface formats earlier 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In particular, avoid selecting YV12/YV16 when I420/422H are available. --- libavutil/hwcontext_vaapi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index fcff25dc9b..2f47162a0d 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -99,15 +99,15 @@ static const struct { enum AVPixelFormat pix_fmt; } vaapi_format_map[] = { MAP(NV12, YUV420, NV12), - MAP(YV12, YUV420, YUV420P), // With U/V planes swapped. - MAP(IYUV, YUV420, YUV420P), #ifdef VA_FOURCC_I420 MAP(I420, YUV420, YUV420P), #endif + MAP(YV12, YUV420, YUV420P), // With U/V planes swapped. + MAP(IYUV, YUV420, YUV420P), + MAP(422H, YUV422, YUV422P), #ifdef VA_FOURCC_YV16 MAP(YV16, YUV422, YUV422P), // With U/V planes swapped. #endif - MAP(422H, YUV422, YUV422P), MAP(UYVY, YUV422, UYVY422), MAP(YUY2, YUV422, YUYV422), MAP(Y800, YUV400, GRAY8),