From patchwork Tue Oct 4 14:47:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?St=C3=A8ve_Lhomme?= X-Patchwork-Id: 872 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2188768vsd; Tue, 4 Oct 2016 07:47:33 -0700 (PDT) X-Received: by 10.28.141.133 with SMTP id p127mr15818227wmd.119.1475592452929; Tue, 04 Oct 2016 07:47:32 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n196si25550124wmd.48.2016.10.04.07.47.31; Tue, 04 Oct 2016 07:47:32 -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; 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 588D4689DA6; Tue, 4 Oct 2016 17:47:15 +0300 (EEST) 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 9D012689D89 for ; Tue, 4 Oct 2016 17:47:08 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id f193so15439678wmg.2 for ; Tue, 04 Oct 2016 07:47:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=ywiS7+AdS7MHfiwhbirKf5553fCOVs53AZ4o3JaFbUg=; b=THnz/dKQlHtPHp3bifBAVNPM9JzZui5qwcLs/gKiaxykNggjbGxTfE1ynVVU05Mqvi ocvCxn0ju46oY0fTw/RuyO8oPy0Hexfnyb6HFAMXEQlZ5VyRp1Hyyb5esjSwHbFOqzMD btkgS7RKzh1/68UHcF10Ge167c/uQicPnPdFy87P7HkcUSIVVmcT0VuIyH4TTeVnoIcn IvBlJ2UFmjrEIEtHJkJR6c0+dYmu4rTNNFhZnJORENHV2b+hhy6N2PtA1SMsUlR6kbRH 5LdJeKTNkiBO7kJcJsRXBCOsFbqPoA+VjeynlCW9TxAlg7+ttg6UZnpr05pH6U+m8u12 zVFg== X-Gm-Message-State: AA6/9RnsOoe+EewgdUjmQbRB/6ANSeV4y08GbQEFxXUD1maNZOD9C0ZbFgA8hFODCdln7Q== X-Received: by 10.194.94.101 with SMTP id db5mr2039542wjb.110.1475592442626; Tue, 04 Oct 2016 07:47:22 -0700 (PDT) Received: from localhost.localdomain (2a01cb0c049e6300a5be5a9a4b3eef58.ipv6.abo.wanadoo.fr. [2a01:cb0c:49e:6300:a5be:5a9a:4b3e:ef58]) by smtp.gmail.com with ESMTPSA id g9sm3933005wjk.25.2016.10.04.07.47.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Oct 2016 07:47:21 -0700 (PDT) From: Steve Lhomme To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Oct 2016 16:47:12 +0200 Message-Id: <1475592432-8188-1-git-send-email-robux4@videolabs.io> X-Mailer: git-send-email 2.8.2 Subject: [FFmpeg-devel] [PATCH] d3d11va: use the proper slice index 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" The slice index expected by D3D11VA is the one from the texture not from the array or texture/slices. In VLC the slices we provide the decoder don't start from 0 and thus pictures appear in bogus order. With possible crashes and corruptions when using an invalid index. --- libavcodec/dxva2.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index f68df86..f8801c9 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -43,7 +43,16 @@ unsigned ff_dxva2_get_surface_index(const AVCodecContext *avctx, for (i = 0; i < DXVA_CONTEXT_COUNT(avctx, ctx); i++) if (DXVA_CONTEXT_SURFACE(avctx, ctx, i) == surface) +#if CONFIG_D3D11VA + { + ID3D11VideoDecoderOutputView *pOut = DXVA_CONTEXT_SURFACE(avctx, ctx, i); + D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC viewDesc; + ID3D11VideoDecoderOutputView_GetDesc( pOut, &viewDesc ); + return viewDesc.Texture2D.ArraySlice; + } +#elif CONFIG_DXVA2 return i; +#endif assert(0); return 0;