From patchwork Tue Nov 14 19:47:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 6055 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3720801jah; Tue, 14 Nov 2017 11:47:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMbZYthSZm284Aj7z85iqexXm3le3Q9LI/6PKQpcSCI/Mi6B4XAtTpJqDmbSScBp93ssdzLf X-Received: by 10.223.186.202 with SMTP id w10mr7765085wrg.132.1510688872298; Tue, 14 Nov 2017 11:47:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510688872; cv=none; d=google.com; s=arc-20160816; b=ZQX+MzXRM57M0m9ZeDgb7xMyH67yEd6cCoqE+BRtQVz0fTk4BOtJjnjkyHxr0ONDcj /XOz4ViwvmL3EDeEWqJVx6umQVDEVRIiGv5pqEX8+IPI+kCo2ss0ygXCuZJossv2hena 6OTw5on2LxOllnzFvu59l04T3ZkAhek/6SMmIkChJDSrsGrUOhpV9hwA3a6V6gahfHdv yiIxoYeTgRuxko4J7lCIfPyx9/gO9LqL4UYUkkiux/wGQ/ZBXr3TmUKuSSa8+vPS0YCm pexEjNBoyYKrKsDJBBveKuGgI1T8qcHugJprK2t9Py+YPeingVEZ3a2qNQscoYSFEnLk 6S8Q== 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=Lz0DpUuRCd4rJqPV5LRNH/YEjrUHmyFPkDIkRaMs+Hk=; b=FPdF8MlooeQA1SN7/pm26hK9wHxtyAFfZ7m3iuL6lFIMVLPnLIye5wfErJkeWPvHEf pccdr+6aBpTvThUQ5uv0GOA1PF0yGq3br5+F4KujZYPFysZai+phNNEOTb9qyuWPpj2X c6j8DlqJ0qACrBqRDuc9wfCg4G8jixk4eymb5ggZ4wvH+UEENijFj90L5Gm3KnTxyQjy SjuUFFT1nxoFtOS/a3oedZxQzzLgHOufQEjhDgM5ZyPe4v9eDKI8fdZY0W4T07qmjsqL c0wHhoewQ7QmKfwYXVA7hUKaC7WyKAUPcUWvJ5vGEm2naGcFk3yPtfMwgOM1SWLBBxwH a5wA== 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=1dH65O3g; 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 w10si15945574wrg.270.2017.11.14.11.47.51; Tue, 14 Nov 2017 11:47:52 -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=1dH65O3g; 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 DDD1768A110; Tue, 14 Nov 2017 21:47:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3351468A0C2 for ; Tue, 14 Nov 2017 21:47:21 +0200 (EET) Received: by mail-wm0-f45.google.com with SMTP id b189so16946542wmd.5 for ; Tue, 14 Nov 2017 11:47:36 -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=MwiUo4R+lh/6JkfTHTyTNWzn/g3XpEkFHRbz+lwq9k0=; b=1dH65O3gVLHldFqnLvjLuZN1RSM8Ax/4WfDg7B8UC0TlsjpTd1RJLnZ5YYkN4WoK69 KEGc6qEJ2IgeQLO5REirzmpFsDOXAdDjF506MSHVDWUcZ0WWMzgn0r8j+UmVsNBBPFA0 FK3X88Z/ndusFC3btK4PCMZn5H1L3JKrrSnYPDoIO1jTVtjRBm+DhC2bxXOFuLT0hCaR eBt+pCvzIUmadPxNio8Mh0gFI4rG63eGt/w0PE2oLCXWotulPpsZSSD4oE0lj5Nog5vJ s90PxaUB0ZIi17bFAk1U8ZeTT869RpvLMY8g9DsDNlKxHcZb7RA528U2kM2qzII1u31R nOhg== 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=MwiUo4R+lh/6JkfTHTyTNWzn/g3XpEkFHRbz+lwq9k0=; b=eXwBsd6f0ImVmwwoxZTC1wHjtczYwyvhQW1W7OGz8zpMpufvg7qjXo5azExv3d1tza KV3B6z7XxCrgKb4enahrStqRouiwKqlb1B3zR5OrM74T2KJh8NEkl83pEWlJcmXFBP5o ZK7DNwv5rg3ucXS2KzfW35ThdOl+Wh0JInISxsf2WUMjsB5NW0DxtktJxBj7sRqOXcrQ z5u4MIF+4AZaXLkqA8qz/Gac1G1r+yjIwDT8l5qViJ0R+b5jg7MVotk15Xb/Lc/yRrik r48Efqx5NSGCk1TWlHYVA1u010TJ48TmryUpMOt+F7TNF1tTg9xbYX24AC31TOT5f6yh Sg0Q== X-Gm-Message-State: AJaThX7NVN5vtRAeqXZyMcIg+BKATJSoIlcNKIUXakuu38NXZMxzSUrp UbE8bo/3NbD2T27j5a1KglMsSoaz X-Received: by 10.28.1.80 with SMTP id 77mr10312121wmb.51.1510688855610; Tue, 14 Nov 2017 11:47:35 -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 v35sm38938226wrc.13.2017.11.14.11.47.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 11:47:34 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Nov 2017 19:47:16 +0000 Message-Id: <20171114194730.11052-2-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171114194730.11052-1-sw@jkqxz.net> References: <20171114194730.11052-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 01/15] 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 d336f6ce22..3f68bcccd2 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2017-xx-xx - xxxxxxx - lavu 55.n+1.0 - pixfmt.h + Add AV_PIX_FMT_OPENCL. + 2017-xx-xx - xxxxxxx - lavc 58.3.100 - avcodec.h Add avcodec_get_hw_frames_parameters(). diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 3d21e67a78..e77d5f44b9 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2181,6 +2181,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 a520028962..4c530fead3 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -322,6 +322,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 };