From patchwork Mon Dec 5 20:32:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Velten X-Patchwork-Id: 1688 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1828126vsa; Mon, 5 Dec 2016 12:40:39 -0800 (PST) X-Received: by 10.28.175.204 with SMTP id y195mr11779719wme.106.1480970439164; Mon, 05 Dec 2016 12:40:39 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 123si339332wmw.70.2016.12.05.12.40.38; Mon, 05 Dec 2016 12:40:39 -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; 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 dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12ED1689F62; Mon, 5 Dec 2016 22:40:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mv-xps-13.localdomain (81-67-195-71.rev.numericable.fr [81.67.195.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E4E3F689E64 for ; Mon, 5 Dec 2016 22:40:18 +0200 (EET) Received: from mv-xps-13.localdomain (localhost [IPv6:::1]) by mv-xps-13.localdomain (Postfix) with ESMTP id 9F3BB599AC; Mon, 5 Dec 2016 21:33:10 +0100 (CET) From: Mathieu Velten To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2016 21:32:59 +0100 Message-Id: <20161205203259.2479-2-matmaul@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161205203259.2479-1-matmaul@gmail.com> References: <20161205203259.2479-1-matmaul@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/vaapi-vp9: add support for profile 2 (bpp > 8) 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 Cc: Mathieu Velten MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/vaapi_vp9.c | 1 + libavcodec/vp9.c | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c index b360dcb..9b3e81a 100644 --- a/libavcodec/vaapi_vp9.c +++ b/libavcodec/vaapi_vp9.c @@ -38,6 +38,7 @@ static void fill_picture_parameters(AVCodecContext *avctx, pp->first_partition_size = h->h.compressed_header_size; pp->profile = h->h.profile; + pp->bit_depth = h->h.bpp; pp->filter_level = h->h.filter.level; pp->sharpness_level = h->h.filter.sharpness; diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 793e356..09365f8 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -258,7 +258,8 @@ static int update_size(AVCodecContext *ctx, int w, int h) if ((res = ff_set_dimensions(ctx, w, h)) < 0) return res; - if (s->pix_fmt == AV_PIX_FMT_YUV420P) { + switch (s->pix_fmt) { + case AV_PIX_FMT_YUV420P: #if CONFIG_VP9_DXVA2_HWACCEL *fmtp++ = AV_PIX_FMT_DXVA2_VLD; #endif @@ -268,6 +269,13 @@ static int update_size(AVCodecContext *ctx, int w, int h) #if CONFIG_VP9_VAAPI_HWACCEL *fmtp++ = AV_PIX_FMT_VAAPI; #endif + break; + case AV_PIX_FMT_YUV420P10: + case AV_PIX_FMT_YUV420P12: +#if CONFIG_VP9_VAAPI_HWACCEL + *fmtp++ = AV_PIX_FMT_VAAPI; +#endif + break; } *fmtp++ = s->pix_fmt;