From patchwork Fri May 8 15:18:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: galinart X-Patchwork-Id: 19572 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 C129544922A for ; Fri, 8 May 2020 18:28:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB2EB6880F5; Fri, 8 May 2020 18:28:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A4258688044 for ; Fri, 8 May 2020 18:28:38 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id 50so1836661wrc.11 for ; Fri, 08 May 2020 08:28: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=yDNwvV8lo+fyDi9SdPnA+4VoQxg8opal82yG46KpIv0=; b=QEYJQvtir3kqrNxMMou6RoV2OakgjwnQvdfyMsMuQnD9aaALwDTM774ORmL+98DNOb gI6mNdsyRyhUrFptI7XJL51zWSfBB7T6N278NEtnC2jlN2/OpylHVXk63TvWmX33DNjb mhqkxnzgfeZppnRblHZrYPqW6IoStk16W1jKxjhWhelTEqcdOHHmPVSt9Ra5GyYdJjb+ eylx8P/aJnCrYt2kmxtgyomtdOUr8G7F0VO4WZMIj/Y54tNZjHpZLQE78QJXWlAqCXga Dp73OGUatsaLDjaQx0wIsk5+h/8zq0LsFjJKuADtATG3sp6+eFdHSrZrk9GHGiXWlzYE /j9w== 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=yDNwvV8lo+fyDi9SdPnA+4VoQxg8opal82yG46KpIv0=; b=n55ybv2cVsTNHysYSo8nLWQn60pjOFPeqTxohHmtNW1kPhPlmvqsRZoOgz+r8JkqID 0sUfr21t+9q6fWT81KIQMnf8yZLfbUSD0C0yBYgVu0gBjYr1Jd5StMEpFYoKieYQ3wpS ql9vNmKO2UP6Hhm2rPjcK0R7cWrDnqRp3S44Kxt5ofSv3RGgw4y8aHBjiZfeeuuBx0FK W+OTN/5xEn3ICPjGGaqFNMpxYLHD6tL7yRx2cSDesqBdY740Dg7sXgTzpbhB1/MLlLKM 9I4kxlajEAqdmdBVsZG2J290Y4aXfqtGRVX5TJmw/K2WAw8NnKN2rSRJmCrjc7BWKCWl n41g== X-Gm-Message-State: AGi0PuaFTGrhLG5Zc6qwH+VhlXzXXhamYyGYMEi01Df3bTyM//kfA8QU kmqJ7dsgWu9BoXGtUz7xxdch05l6FtzhzQ== X-Google-Smtp-Source: APiQypLfNEie7I6KnZipuwIwnTsozaJtwZx+BR4u+O/Q93GsgQ4V5Bhuda4T9k+HU3q5K2kWgYsXUw== X-Received: by 2002:adf:9d8b:: with SMTP id p11mr3486111wre.322.1588951221935; Fri, 08 May 2020 08:20:21 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2020 08:20:21 -0700 (PDT) From: artem.galin@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 May 2020 16:18:11 +0100 Message-Id: <20200508151821.49051-1-artem.galin@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200424145219.54067-4-artem.galin@gmail.com> References: <20200424145219.54067-4-artem.galin@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 01/11] 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 , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Artem Galin child_device_type argument is responsible for selection. Usage examples: DirectX 11 -init_hw_device qsv:hw,child_device_type=d3d11va DirectX 9 -init_hw_device qsv:hw,child_device_type=dxva2 Signed-off-by: Artem Galin --- fftools/ffmpeg_opt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 60bb437ea7..83f1b53e9d 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -558,7 +558,11 @@ 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); + int err; + if (!arg) + return AVERROR(ENOMEM); + err = hw_device_init_from_string(arg, NULL); + return err; } }