From patchwork Sun Sep 10 20:53:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5082 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2356902jaa; Sun, 10 Sep 2017 13:54:05 -0700 (PDT) X-Received: by 10.28.30.13 with SMTP id e13mr5765807wme.72.1505076845075; Sun, 10 Sep 2017 13:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505076845; cv=none; d=google.com; s=arc-20160816; b=ShbHiHdSfJF79enADSpcuKAOf2RrVAPIyfb7MnvhhojzkN8O1nkP6IXTMx7r7/3+EM GukAaREjeevxoYWCp60Hc47xc3X9Xr4iMFK2rlGazz3O2wj4gACHNSrffQ8o/BD8GQkY wnEHrv3qVf4dqo3eyqI5fpnBGpo93vUvmJLMFR6l2BsisZHoixqu7Ikn4KHAGKH1yGjz l3zjGon7HG0gDXMGga6NhbpNrYB/IznhTLavq7dqTqqF+YCfSL1Dxa3BOsd1u/QITPLi xJLjSe8ZXyAnIJj9R9u7SRPihPdeYlSezqcnPAp4GShefgybey8hbw978O+Qbazy628e maGA== 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=lPSUGWEHrq3yfoUa/TH8XP5YpX3LfWaVsed9jjb3bIQ=; b=GRfbiE5HouAUyrlhsybAFoYH9sjJBwdJOah+80Zz4piURnJrYaNfx/W24MQOUlzeRT 6g6ujO6U8oims+1felKSRS08Sj+aawSvPb4Wf9I7es1z3TSO3b51L5u9aOKJ3nBaaWui ohH1L7vHEw1IZkaxBdgrJNh0NOWz0i3oKslsGTNLtAaibBf5UGctn1HqVMEBHnVGlWfr 4SEXZyOh4O3UeZqvtWGlpd+sv8LL9PZKJh2eYatdduBYB81QC7PTF29bAWs039s7Zx/k jhqq5Ayo05ebkV1z2SMJB7tpVmzW4Ej5hD8bIaA/WzEbyNs/G5uMG3tYJ37nDPDFabyN 21RA== 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=atJJKSoS; 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 h5si5595408wrf.115.2017.09.10.13.54.04; Sun, 10 Sep 2017 13:54:05 -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.s=20150623 header.b=atJJKSoS; 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 93089689C39; Sun, 10 Sep 2017 23:53:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C3266899D2 for ; Sun, 10 Sep 2017 23:53:40 +0300 (EEST) Received: by mail-wm0-f43.google.com with SMTP id f199so27700961wme.0 for ; Sun, 10 Sep 2017 13:53:45 -0700 (PDT) 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=+qDn/xM3+vqEGNuR+t8JEq0xlhzCNeqUv/Ad6hTkHSk=; b=atJJKSoSx9l39zTBKf0+RoASI7KBZFeUK2W9iAbOpCAMSaeXJQkPiIwlJBZPhcFnfa GhdX7afsr/kzZBEwxlmXcLEOQPXECtCju3VFFQ6dgMbN7AAy1+FRQ8FnVbOEfZVoL6ag xsPpSUv5D2K4Dgrrz25IEUMRDBXKcoiotZXxQordTAvoNOn2xsFqt0/xw5Z63Xobn0vX N6Zg22smHh5NbnQN+C8hlk4PGTP+NbZ2FHmSq1O8EPaEj6y9FJLxboCXHWCcvkNXci/M 3A6knbPeVC+xzA4Wo8CBXSvW8fTvZyt/pnydkt/2dTUsbVgRN5V/a52wOvqzRpZMtgEB rZxQ== 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=+qDn/xM3+vqEGNuR+t8JEq0xlhzCNeqUv/Ad6hTkHSk=; b=hkDpkVldhzcdPeoWOygLqMs84R/Qr/WxTZK841c+eX77QhiedNMLj1bvURH/mIhD1V Zppqm9uBHQaVkdXBsZ/mak3FIpy03lFF+JMGsLg8iPtt4oPOMVJSgigw/jVYw3DIQll+ k03lIBXHTDQUMnVXAoDEZ/drUAw9r4S5iFtI2zQ1wEF28HrtdbvmC4HjVL/0uZRZnvqK v36p0SzBpMslCa4acfj6n3FxR2ykWSO9q4ud9qKLX4iGNhHO7YOGo1LdtY+VROB3mE52 MU6l2JqvbB+OMgXtdw1ooDBddR4JR4mESGkS4A24IPAS6Nb42wnpBPjkBBYJhpwGP2cV GPJg== X-Gm-Message-State: AHPjjUhXJ/aauftj39qLT73psbqW0IBiTfnsFYaRnQHCHIlGWHBfpzw9 uulxGw+qZCB/SS3UVW0= X-Google-Smtp-Source: AOwi7QAhPLn/nsX42mVUG+H8/v+1suzzYmuTmlU9InICo/n/6p2H9vTc5GdRdu2I3rVfrXHM2XseSQ== X-Received: by 10.28.152.70 with SMTP id a67mr5726651wme.132.1505076825147; Sun, 10 Sep 2017 13:53:45 -0700 (PDT) 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 z51sm8742868wrz.80.2017.09.10.13.53.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Sep 2017 13:53:44 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2017 21:53:26 +0100 Message-Id: <20170910205338.29687-3-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170910205338.29687-1-sw@jkqxz.net> References: <20170910205338.29687-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 02/14] lavu: Add OpenCL hardware pixfmt 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" --- doc/APIchanges | 3 +++ libavutil/pixdesc.c | 4 ++++ libavutil/pixfmt.h | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index cc67cbf6f8..0cea594f25 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2017-xx-xx - xxxxxxx - lavu 55.n+1.0 - pixfmt.h + Add AV_PIX_FMT_OPENCL. + 2017-09-08 - xxxxxxx - lavfi 6.103.100 - buffersrc.h Add av_buffersrc_close(). diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 33aa2d705f..0c328bcd5a 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2241,6 +2241,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .name = "drm_prime", .flags = AV_PIX_FMT_FLAG_HWACCEL, }, + [AV_PIX_FMT_OPENCL] = { + .name = "opencl", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, }; #if FF_API_PLUS1_MINUS1 FF_ENABLE_DEPRECATION_WARNINGS diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 24889c8e52..1469c0e8ff 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -340,6 +340,13 @@ enum AVPixelFormat { * data[0] points to an AVDRMFrameDescriptor. */ AV_PIX_FMT_DRM_PRIME, + /** + * Hardware surfaces for OpenCL. + * + * data[i] contain 2D image objects (typed in C as cl_mem, used + * in OpenCL as image2d_t) for each plane of the surface. + */ + AV_PIX_FMT_OPENCL, AV_PIX_FMT_NB ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions };