From patchwork Thu Dec 7 12:25:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Guillem X-Patchwork-Id: 6585 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp8205878jah; Thu, 7 Dec 2017 04:25:50 -0800 (PST) X-Google-Smtp-Source: AGs4zMZYFUsGZ1+39E99Eu6xGGYh88XkfuCa/npxZR/EeXHgkmhGIgvO2YyZBeyKYgMEn9dzkGhy X-Received: by 10.223.145.80 with SMTP id j74mr23832326wrj.250.1512649550754; Thu, 07 Dec 2017 04:25:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512649550; cv=none; d=google.com; s=arc-20160816; b=kTFM6YsPTpLFKuBU2KWvOKJ0a96iyL2/jrQ3WFTUPmaUEPHl7TxnEFiNbGDD+WsOj1 bqBXDPGivZPXPUv9Te/0SeMhPANCklBY6nj2/m5V/A0s52+gr1Vf8KR8uhMdr+k/ERI1 SHELMAGeuBg0o/TWTDv49Y77rWdmP6KtWjFEj9XXH+D2IYvEiHllPeBFYIQiOyO+Nv4w H3AQ1AqDKeV+D79PnTdWRm9icEP0FQJdCe5oWM1ZU1LZMrohitTmTzK/YQ0eC0yPL3oA rLGhJB9lcGpAOVU/Q9auTOA8BGUVGQH6m2ArHsJ+IX0d3I2zN77WYb1OkT5IUQ7YI04L 5Npw== 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:dkim-signature:delivered-to :arc-authentication-results; bh=szHkU5KURfZh18HcBqdTvukyXjhcfHAaogQL0VwklwA=; b=sO2gB1R8KtHdh1qS6tNNKixYXuhB/PSGWEFJLzv+Vqu4DCoFb/ruXN1aY/PxknFK+P 9WSafnjXvYRODejffELcz3M7ABNc5LuyX1TVO8Pqwpktx+ONa0lHIgnXcq1p3HGWFJlp ydu/UxZop//+C82vzZ7DH+lA7xmwpKCUW8xLrkzpMRKzkoqLeL2hGI0n+XBYMgDl14qO KdbnBXfMDR77dow8dX7Gg/Q63haPdh/a8I1uuEX/8qv2545I2lenb403peX4lErO09d3 okuJPgYPnjaYihcN4W/GT5sUpcVEnQQj14PtXqH6ujVxA/L7Sq5ZFmIn1rPk/UQQpNDp TbOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gllm.fr header.s=fm1 header.b=VuFuks7v; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=Hbjf2RKh; 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=NONE dis=NONE) header.from=gllm.fr Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b193si132920wmd.4.2017.12.07.04.25.50; Thu, 07 Dec 2017 04:25:50 -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=@gllm.fr header.s=fm1 header.b=VuFuks7v; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=Hbjf2RKh; 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=NONE dis=NONE) header.from=gllm.fr Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0AC868A0EB; Thu, 7 Dec 2017 14:25:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3517F6882A5 for ; Thu, 7 Dec 2017 14:25:27 +0200 (EET) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E94AA22522 for ; Thu, 7 Dec 2017 07:25:31 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Thu, 07 Dec 2017 07:25:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gllm.fr; h=date :from:in-reply-to:message-id:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=8SltB9EQN02faW6AQonXlTloi13AI gmA803JjkD6s9c=; b=VuFuks7vJodTH2DjkDYkti9L23vTZtN2DKZXyMgeusv18 +UGJ6WV09qrtFu8znOswF2/q8tmgjsuHEqnXV3gkuKvgmCS75M2G4yvXF7oJ20vP zQzp77JQg8Xztlsc+1VM9yL3ByFb7jXG2HPUsYFgeifnZLUVuB6kMUDFoou41mb7 HGq5DFwWQjKstHI0ENgULwUqStwdqYVjNBnxwcxN6UFWVkz4HgDMNfv42M/QcyqM 515tAv6wAyE5JLMXHwa23gNeSL7w0pMcitxis6kIl6NdtDc3Ppns5LMp5OcatqBY ATvt/Fk44vGjv9lNFkF4TxG6gq7GHsjC3kv3R9QBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=8SltB9EQN02faW6AQonXlTloi13AIgmA803JjkD6s9c=; b=Hbjf2RKh 4qHQmXilujUdRJtVz/DSd+khB5kTx/Vdj50cDiyY4ANWdyK2Y+CNQe0jBjVrXyOT SbmBxKV/Vp+M1modAjigb8tJ2o8sKyRGNneuVfYL99Ng0zSc1klBicXaCK6pop/a uzLVKm1BTeuLXK3kvLJK1KtAW2yQUeS7kDpqPqQn+bGZWcpFDryQfF6Z8Jj9/IL+ J8aWFh4C15Chg/E7extQgwrIJ20KTE8o0KXAS40JmTHFfZdNCpwajB4jaSUHtlmf eVzGgPnjVx0A+3q8R+kxKUPfHwhhuBbEoyhOex+VnWvUEeWzQISpgjzK34ylAfOD FNVPZYd3Colnnw== X-ME-Sender: Received: from localhost.localdomain (unknown [78.194.250.245]) by mail.messagingengine.com (Postfix) with ESMTPA id 6EBF52469F for ; Thu, 7 Dec 2017 07:25:31 -0500 (EST) From: Thomas Guillem To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Dec 2017 13:25:28 +0100 Message-Id: <20171207122528.16411-2-thomas@gllm.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171207122528.16411-1-thomas@gllm.fr> References: <20171207122528.16411-1-thomas@gllm.fr> Subject: [FFmpeg-devel] [PATCH 2/2] lavc: add back AD_HOC method for DXVA2/D3D11/VAAPI/VDPAU 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" --- libavcodec/hwaccel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/hwaccel.h b/libavcodec/hwaccel.h index 16ee822920..292a87f6b5 100644 --- a/libavcodec/hwaccel.h +++ b/libavcodec/hwaccel.h @@ -75,15 +75,15 @@ typedef struct AVCodecHWConfigInternal { } #define HWACCEL_DXVA2(codec) \ - HW_CONFIG_HWACCEL(DXVA2_VLD, 0, DXVA2, ff_ ## codec ## _dxva2_hwaccel) + HW_CONFIG_HWACCEL(DXVA2_VLD, 1, DXVA2, ff_ ## codec ## _dxva2_hwaccel) #define HWACCEL_D3D11VA2(codec) \ - HW_CONFIG_HWACCEL(D3D11, 0, D3D11VA, ff_ ## codec ## _d3d11va2_hwaccel) + HW_CONFIG_HWACCEL(D3D11, 1, D3D11VA, ff_ ## codec ## _d3d11va2_hwaccel) #define HWACCEL_NVDEC(codec) \ HW_CONFIG_HWACCEL(CUDA, 0, CUDA, ff_ ## codec ## _nvdec_hwaccel) #define HWACCEL_VAAPI(codec) \ - HW_CONFIG_HWACCEL(VAAPI, 0, VAAPI, ff_ ## codec ## _vaapi_hwaccel) + HW_CONFIG_HWACCEL(VAAPI, 1, VAAPI, ff_ ## codec ## _vaapi_hwaccel) #define HWACCEL_VDPAU(codec) \ - HW_CONFIG_HWACCEL(VDPAU, 0, VDPAU, ff_ ## codec ## _vdpau_hwaccel) + HW_CONFIG_HWACCEL(VDPAU, 1, VDPAU, ff_ ## codec ## _vdpau_hwaccel) #define HWACCEL_VIDEOTOOLBOX(codec) \ HW_CONFIG_HWACCEL(VIDEOTOOLBOX, 0, VIDEOTOOLBOX, ff_ ## codec ## _videotoolbox_hwaccel)