From patchwork Fri May 8 15:18:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19565 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9929F44A590 for ; Fri, 8 May 2020 18:20:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D97F68A484; Fri, 8 May 2020 18:20:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1DBD68A3AF for ; Fri, 8 May 2020 18:20:32 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id u127so10997789wmg.1 for ; Fri, 08 May 2020 08:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=236k9StpKfJTZsoOdEdtujEwCo7TqHWT26xHkT4GoG8=; b=h6E247P19M61S8lyxqTRAYz4xvH4CVA1+PAGMjla6wpwExqAlpQCMxrNq9q55nPuW3 YGvFNnXE7s4Lz4Du4SI9uOKlPpJfn/o/zFdTGP1Zr/VoQF8AqJ45CQhdB/p6aqWlj5iI IiZqicOIZwtuaUTAL4+CkTdqH08sXPaPepoLiZSro0XJ7I8x9ds5YI04Yit02Tv22mLk pFKA4IqO64zbpEvfF6RZUj74FuBsgrBouBIR9F8XG2WMvyMoBJosajtLoW2eyaGWtRwv 3RX62EjBdcIts6+eSNM/W3JZcWeDYGbURXLwuEADxs2HyjhMA02pSj6cQQQPw3exKvKD J04g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=236k9StpKfJTZsoOdEdtujEwCo7TqHWT26xHkT4GoG8=; b=Z6vce06Fv7WdPneHHPP0SXzzJLjp072SgARoopzCqWETZFqaQgWOSlKndxdJUoK516 kN2VCx7nuNQmh9V/ONgmcxkCbMdw/T+VoXWNIQN7+QMucC4U7AuMgJRYtYF92c/3eJ40 j/sYQ+wJ4EEwBDAgZowHxybdTD7bs9Hv3uznn6fpzyLEZkHK77Z1GmtxElUD4YtSpKxJ O5+bNoq1MWZ7MflvL/1yBawa8W+Ka532txhL040/aVg5Ykv3Kd2bZAyYg36DPW36SjJn zxhQFISbPvb8q/mIqhIxlu9z1LnBI+y3b3UTHe56nXHbaVy2Jk4s5xHA62h4b7pPkQQk QqPg== X-Gm-Message-State: AGi0PuYxyyf4HpF8QItY6jdUauMrJAd+Rq++4wDeFXTKQCaJXMJuFaqP aeaHMfhNHLNZMJQBsWcpzTfM72XFJEpSTg== X-Google-Smtp-Source: APiQypLHqaaNeWMvxw7cUO28uLGDbsToFA8/xuMGjC2sQS4PBme1Y7pR9rSZ3hH7euPynK6PFe7wlA== X-Received: by 2002:a7b:cb53:: with SMTP id v19mr16210209wmj.166.1588951231644; Fri, 08 May 2020 08:20:31 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:c904:d18e:fdcb:4131]) by smtp.googlemail.com with ESMTPSA id u24sm7339937wmm.47.2020.05.08.08.20.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 08:20:31 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 May 2020 16:18:14 +0100 Message-Id: <20200508151821.49051-4-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200508151821.49051-1-artem.galin@gmail.com> References: <20200424145219.54067-4-artem.galin@gmail.com> <20200508151821.49051-1-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 04/11] libavutil/hwcontext_d3d11va: adding the vendor option to D3D11 device creation 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: Artem Galin , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Artem Galin Example: --init_hw_device d3d11va:,vendor=0x8086 qsv_device option is still works and has higher priority over vendor option. Signed-off-by: Artem Galin hwctx; HRESULT hr; + AVDictionaryEntry *e; IDXGIAdapter *pAdapter = NULL; ID3D10Multithread *pMultithread; UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT; + int adapter = -1; + long int vendor_id = -1; int is_debug = !!av_dict_get(opts, "debug", NULL, 0); int ret; @@ -553,13 +556,45 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device, return AVERROR_UNKNOWN; } + e = av_dict_get(opts, "vendor", NULL, 0); + if (e) { + vendor_id = strtol(e->value, NULL, 0); + } + if (device) { + adapter = atoi(device); + } + + if (adapter >= 0 || vendor_id != -1) { IDXGIFactory2 *pDXGIFactory; hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory); if (SUCCEEDED(hr)) { - int adapter = atoi(device); - if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter))) + if (adapter < 0) { + int adapter_cnt = 0; + while (IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter_cnt++, &pAdapter) != DXGI_ERROR_NOT_FOUND) { + DXGI_ADAPTER_DESC adapter_desc; + hr = IDXGIAdapter2_GetDesc(pAdapter, &adapter_desc); + if (FAILED(hr)) { + av_log(ctx, AV_LOG_ERROR, "IDXGIAdapter2_GetDesc returned error with adapter id %d\n", adapter_cnt); + continue; + } + + if (adapter_desc.VendorId == vendor_id) { + break; + } + + if (adapter) + IDXGIAdapter_Release(pAdapter); + } + if (adapter_cnt < 0) { + av_log(ctx, AV_LOG_ERROR, "Failed to find d3d11va adapter by vendor id %ld\n", vendor_id); + IDXGIFactory2_Release(pDXGIFactory); + return AVERROR_UNKNOWN; + } + } else { + if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter))) pAdapter = NULL; + } IDXGIFactory2_Release(pDXGIFactory); } }