From patchwork Thu Apr 9 17:50:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 18799 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 D87EB44A892 for ; Thu, 9 Apr 2020 20:59:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADB4368B884; Thu, 9 Apr 2020 20:59:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB35068B636 for ; Thu, 9 Apr 2020 20:59:46 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id d77so668989wmd.3 for ; Thu, 09 Apr 2020 10:59:46 -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; bh=kcpQRpim++WFb4IEEF0vf1NYi4Uq9qxxo7ScS/yPuSU=; b=N29opSmoZos06NXZqRaIBCh9z5gbeDSd78wp4dweA9cgolhMuQc6lAGHpKLdsIGj77 bF2DmeXw1N1we4upu+wHZ2eYnfZA51sHYGH0RuGFA9ReM1ZuHSzNmXs+/RRMm7K2UUWR Egd5uRmylO6XVAZB7Z0pc8i1+PKzdWMFtD9kSUczNKJWIc58I+fMeUOJdfs+BRRNNGz3 HvXKYr4oo028PO6IpclPfec3biYkekRJ4M/SMCivVujuzQDe/+aZmQT2kVjTb6uxcLy2 y9oxywppLuaymmPgl5g4uAIAoX+QNwX7Dpz0XPrN51EpdDeltgjK86MYqP03UOZQTIbC pUzA== 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; bh=kcpQRpim++WFb4IEEF0vf1NYi4Uq9qxxo7ScS/yPuSU=; b=nVGKHNVY/iBpvWyHriRFND/9ysSeSu4Ek8gPM1nxXpoI8dGfkx+sY3Xaz06MdXPBUH Bqau8M567iG90vz7GB7EG8Dez5QQZkXxmIrAt7j91l9Xv/vDb23ckkEQiUewLi7C4Eni 0gRQmXe1in5yvEkIfld7b47Yb2rtmHY7nxlswT0+ejaEbLbfV/CSlQqiLUbM0h36L96l 5jiYm4IwrMtdurl6t0w4mni4WffXR6qFWNQ3A7d2/c2CAb5o7TCjZ4xVapf0GggV6oHe ZjjkpLiXVpP0V8VoBH4JGCqU9f4Ka8J/mxEzw+ZhYXUsUOhAjstWBN7VMsaKGNKmc/q3 E2XA== X-Gm-Message-State: AGi0PuaydF6D6lCuvC2Ff2Mw0KPN47zQMb3qCk8jBc2D4shXCdBYP48s +k6blT9wfMqRmdAdXoOCXWfzgCI9SGg= X-Google-Smtp-Source: APiQypIyk6Hb/CLp5KvAZ6ZyK4R022Mf78qRStsfUFvQiA2uwhmuTnfWoO/lSQYu/EHkQ5uvb0g3Sg== X-Received: by 2002:a05:600c:2284:: with SMTP id 4mr975629wmf.103.1586454680827; Thu, 09 Apr 2020 10:51:20 -0700 (PDT) Received: from galinart-MOBL.ger.corp.intel.com ([90.219.218.77]) by smtp.googlemail.com with ESMTPSA id z11sm25622574wrv.58.2020.04.09.10.51.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2020 10:51:20 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Apr 2020 18:50:51 +0100 Message-Id: <20200409175054.23468-1-artem.galin@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/4] fftools/qsv: enabling d3d11va/dxva2 device selection 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Artem Galin child_device_type argument is responsible for selection. Usage examples: -init_hw_device qsv:hw,child_device_type=d3d11va -init_hw_device qsv:hw,child_device_type=dxva2 Signed-off-by: Artem Galin --- fftools/ffmpeg_opt.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 95001a963f..82232c60b3 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -568,7 +568,17 @@ static int opt_init_hw_device(void *optctx, const char *opt, const char *arg) printf("\n"); exit_program(0); } else { - return hw_device_init_from_string(arg, NULL); + HWDevice *dev; + int err; + if (!arg) + return AVERROR(ENOMEM); + err = hw_device_init_from_string(arg, &dev); + if (err < 0) + return err; + hw_device_ctx = av_buffer_ref(dev->device_ref); + if (!hw_device_ctx) + return AVERROR(ENOMEM); + return 0; } }