From patchwork Wed Apr 15 13:07:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 18980 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 D25B7448275 for ; Wed, 15 Apr 2020 16:14:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC6CB68BB15; Wed, 15 Apr 2020 16:14:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED96068BB13 for ; Wed, 15 Apr 2020 16:14:38 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id o81so11805950wmo.2 for ; Wed, 15 Apr 2020 06:14:38 -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:mime-version :content-transfer-encoding; bh=7duDi2y32w+s8BsGlcCx5A3cK+lkx7YvhQD1FnIbbdk=; b=NxZs24uDSIOeXZUCl/Ss8F1Eo/JTnLwli0giAWJQjz5oXiEkbLMTNRc/E+Fj4joETE wpHdccncupx0EhoQI4+6OXqCz6nfjTbjky5Oq1bVHdfQqCLkrdLFV2D8raaLcGoT036C oOypuh0uKQ0pBIPakbbycehBrKHoJLADF/sUn31jhignPzb52SieLCIhi0ICNDjcoqqA xcrdE/WOglT8DhJ+Zi5m9j85bCvH35GXGBxFKyXiwWueHlAZRjcA991gN62qMuDgaAol cLiBn6RwcZg7DaHDxk0iGcUz0NfPrX9nEFsF0CbDUoH121al/F8Xv6FeKY6OOxRRVVYp cwGA== 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:mime-version :content-transfer-encoding; bh=7duDi2y32w+s8BsGlcCx5A3cK+lkx7YvhQD1FnIbbdk=; b=WMb1/TmJVcExAC+QG/X6XsUDPH78AWVcOEvHeMJ5scmYUzv8mKNgeCwySbeNzopLkI 1Za0zqwOfotI8FnR4dkx6giNK4KHOABL85RH1NY1eEza1R9AptUrO3Suo6qtI31FBF6N F/Lv6ur3sLBx/3eSJamLpUMy9RCWSVrh3dSgsZfnQObKcweKPfWTStsA7MGvSBMcOupd Xou1VzujfqGwIAoZFtsfnB5vQHpRb3DiwSUpH6dRRLuEvkbA+ualrvqCizzRjaJ4TslG F/vMvPI54HNc3DcBhlu1XGfkVMrwcVxWwg8dc1CrUNpEM8sadjmOaqeJAv/EFD6+YXua 0Luw== X-Gm-Message-State: AGi0PuYefaON4KLOP4ie6j94zP+jL+6cngrQqNrtyopY8tY0BTLFWimb qt6S1PYxBzVwbY6OE1844Ps3VDTR16A= X-Google-Smtp-Source: APiQypIfBQcpLJ7hPj2M1o6eFYduRaJgeFT5OvWlm+El7WZ917yyPeIa/YR4GYY4KT3KggC51V4Ybw== X-Received: by 2002:a7b:c959:: with SMTP id i25mr5138535wml.20.1586956078264; Wed, 15 Apr 2020 06:07:58 -0700 (PDT) Received: from localhost.localdomain ([2a02:c7d:3e2e:7400:c5b:7d52:debd:ff59]) by smtp.googlemail.com with ESMTPSA id y20sm24030962wra.79.2020.04.15.06.07.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 06:07:57 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Apr 2020 14:07:38 +0100 Message-Id: <20200415130741.27263-1-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 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; } }