From patchwork Wed Jan 4 13:36:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Lhomme X-Patchwork-Id: 2045 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp4836637vsb; Wed, 4 Jan 2017 05:45:06 -0800 (PST) X-Received: by 10.194.87.230 with SMTP id bb6mr66257705wjb.163.1483537506279; Wed, 04 Jan 2017 05:45:06 -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 f19si81384929wjq.287.2017.01.04.05.45.05; Wed, 04 Jan 2017 05:45:06 -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=@gmail.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 D7A98689FDA; Wed, 4 Jan 2017 15:44:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD0EF6818DB for ; Wed, 4 Jan 2017 15:44:52 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id c85so53297230wmi.1 for ; Wed, 04 Jan 2017 05:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=QMtGWO2aVbkCqdawDHvHciLNP0h2clGrP/n0lSOa6mo=; b=P4lET/0Wln2rFsIVmq3R+rmpUmkQ8zBVlOscjVEEp8IibOgElH/vg7Kon7IBNFfzSz LvPy7cc7t7pYeLQifK6ub+0tWC1ScQZq1S8HEGc3ghrZ6klMZ962FSgsWUmyD1OPLUXX b1fyBSSom5wjrfu8+x1IlblmnoPN35GbEVwMdu1e0j9t/7qhc+sJRuAGUjHxH+XHFCxO lICq51GXGDuyAIv0r5JRWnRxrBEor2t7A3RdUNyuN49TsW/I+NoEPQenC7owb3pGfr+0 PcQP5tude1vlAjGtH+37BeVYOsh+Qt8//G4ZZ5jfBxd/ESTaVpyV9Kevmebf29x5zK/F /grQ== 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=QMtGWO2aVbkCqdawDHvHciLNP0h2clGrP/n0lSOa6mo=; b=t9DxjjB5hQOB8LUnMdX1iLpZr8hIL21Npq5RhLwwjQbL9ZP9MdExym7ObEz7/5P4st CFYatCeli7ulBFxwEc4IvVe4bsiU9wNKa47cdC2yTrbqGsa2TyS0NWGQUOXbEnqIt9i0 4SOLkGkXBLs4rbmaMvEQ4SVGfN8EqcP5vZR6tHzFbK6RQx61qsju8t9fSTC+SrC/z6cj 55hEEbq+qTRNGfu9PlUq2yjsndA1sRerY1+ZBMcowh7zcigtL2IHCWMipqyS+4UEcWOV jGU2VMjk+CYCMWdtA8ZadHekvUTl/UgEelKj16O75TMEDKqT4AhAH7tpnz4ErgQZ/+R3 qsjA== X-Gm-Message-State: AIkVDXIEKIQr0j1r+G2Ug0LHONatNdTAO8yQ6tOyWQHZ7B3k+aTGMTJ5pPZy2TYI5PYYHQ== X-Received: by 10.28.48.7 with SMTP id w7mr54466015wmw.115.1483537016503; Wed, 04 Jan 2017 05:36:56 -0800 (PST) Received: from localhost.localdomain (2a01cb0c000ea9005c35e70f116a1c8d.ipv6.abo.wanadoo.fr. [2a01:cb0c:e:a900:5c35:e70f:116a:1c8d]) by smtp.gmail.com with ESMTPSA id 81sm94943124wmw.7.2017.01.04.05.36.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jan 2017 05:36:55 -0800 (PST) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jan 2017 14:36:41 +0100 Message-Id: <20170104133644.6720-2-robux4@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170104133644.6720-1-robux4@gmail.com> References: <20170104133644.6720-1-robux4@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/4] dxva2: make ff_dxva2_get_surface() static and rename it 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/dxva2.c | 8 ++++---- libavcodec/dxva2_internal.h | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 04a9c11..2ac3f3e 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -29,7 +29,7 @@ #include "avcodec.h" #include "dxva2_internal.h" -void *ff_dxva2_get_surface(const AVFrame *frame) +static void *get_surface(const AVFrame *frame) { return frame->data[3]; } @@ -38,7 +38,7 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, const AVDXVAContext *ctx, const AVFrame *frame) { - void *surface = ff_dxva2_get_surface(frame); + void *surface = get_surface(frame); unsigned i; for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) { @@ -159,14 +159,14 @@ int ff_dxva2_common_end_frame(AVCodecContext *avctx, AVFrame *frame, if (D3D11VA_CONTEXT(ctx)->context_mutex != INVALID_HANDLE_VALUE) WaitForSingleObjectEx(D3D11VA_CONTEXT(ctx)->context_mutex, INFINITE, FALSE); hr = ID3D11VideoContext_DecoderBeginFrame(D3D11VA_CONTEXT(ctx)->video_context, D3D11VA_CONTEXT(ctx)->decoder, - ff_dxva2_get_surface(frame), + get_surface(frame), 0, NULL); } #endif #if CONFIG_DXVA2 if (avctx->pix_fmt == AV_PIX_FMT_DXVA2_VLD) hr = IDirectXVideoDecoder_BeginFrame(DXVA2_CONTEXT(ctx)->decoder, - ff_dxva2_get_surface(frame), + get_surface(frame), NULL); #endif if (hr != E_PENDING || ++runs > 50) diff --git a/libavcodec/dxva2_internal.h b/libavcodec/dxva2_internal.h index 24adb99..c962810 100644 --- a/libavcodec/dxva2_internal.h +++ b/libavcodec/dxva2_internal.h @@ -96,8 +96,6 @@ typedef union { #define DXVA_CONTEXT_CFG_RESIDACCEL(avctx, ctx) (ctx->d3d11va.cfg->ConfigResidDiffAccelerator) #endif -void *ff_dxva2_get_surface(const AVFrame *frame); - unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, const AVDXVAContext *, const AVFrame *frame);