From patchwork Mon May 6 14:49:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 13007 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 56C494482AD for ; Mon, 6 May 2019 17:49:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4363568AD3D; Mon, 6 May 2019 17:49:41 +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 4FAC568A884 for ; Mon, 6 May 2019 17:49:33 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k16so17656619wrn.5 for ; Mon, 06 May 2019 07:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=pkcn0FIx7iG9OBTH7D/+ckEAynQVN/0lrFm7VsLqdU4=; b=DVbouscOSnyQBpux4j+aYdL25eNXITiJjTbCbA7sRsyPk94JoyCXMkzw4OkS44irUB i1NPBL2qgcIf6IEbGIl9V4ZsWVT2+PVaOBvU2BKhps3vsprq0zCromgjBIgt4iqriHMe PTrl0naZaLZbhDoI1icr9vWW4NpE0c/emOgKr9+h5gBTP0KYsmmhc3dQ2URwSZ6uMFby G2RLuH6/geObwy8wVdLZLkOsmdhEytYQDiGl0uMF4f3gk3dFc3NRBBukxj2tqCzgmWJJ fozpp3R6twIN1+MY8wiQNr7QPklY3DWRjJePdapaHsMTqtTemZ4udOlWmDOiBDiG7zf1 JN2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pkcn0FIx7iG9OBTH7D/+ckEAynQVN/0lrFm7VsLqdU4=; b=MdrBHUihnHs4zwk2ULKJp9zGwMKH77n1dJP85zcMgymTWWT9lRKSaeDPFOg4vkm0RB Ee/y/C3uKWEHdzDA1ftWbF+oJ8PcaZwZ7DQTpXxSMj3rOqjhjC3edOgH1rS8Wa6QMzov nd1m4NfQXz8KVFF1YB180+qbUbDdnMqdaElgYTH3gh73eeU4VtboDnXNRA8lKrvs0Xtm EkOJlKAD864L6Fh6ZuK1vD58ohLO2MzX9tgya2f7LgabO86ZLPi5jOQWNBEHb/Ig/i0h eFzpPERJfkIGXBtZygtoquSsmvLAa532Xq5WifQyuylT5gu4nfwVZ1RyZZOgYDZy9WE9 ECwQ== X-Gm-Message-State: APjAAAWDtjdiCsfHCAM2qmUVFiH9QJ5Efytn7yL383uJ1sr9w3JvX00c e82Taje3uDw3D9hqjYkwJgoGSEbm6DI= X-Google-Smtp-Source: APXvYqzd42MKw0hxHoX0rcFYENXAiWXvCerntiIxLduoCSoMFiFwoDWnbwAL55UZhD3H3PrUahH1Uw== X-Received: by 2002:a5d:654a:: with SMTP id z10mr18959069wrv.153.1557154172564; Mon, 06 May 2019 07:49:32 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id l19sm14691742wrg.29.2019.05.06.07.49.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 May 2019 07:49:31 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2019 15:49:22 +0100 Message-Id: <20190506144928.28501-2-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190506144928.28501-1-sw@jkqxz.net> References: <20190506144928.28501-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/7] ffmpeg_hw: Treat empty device string as no device setting 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The implementation will use some default in this case. The empty string is not a meaningful device for any existing hardware type, and indeed OpenCL treats it identically to no device already to work around the lack of this setting on the command line. --- fftools/ffmpeg_hw.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg_hw.c b/fftools/ffmpeg_hw.c index d454ae7179..962d8f7d5a 100644 --- a/fftools/ffmpeg_hw.c +++ b/fftools/ffmpeg_hw.c @@ -155,10 +155,12 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out) ++p; q = strchr(p, ','); if (q) { - device = av_strndup(p, q - p); - if (!device) { - err = AVERROR(ENOMEM); - goto fail; + if (q - p > 0) { + device = av_strndup(p, q - p); + if (!device) { + err = AVERROR(ENOMEM); + goto fail; + } } err = av_dict_parse_string(&options, q + 1, "=", ",", 0); if (err < 0) { @@ -168,7 +170,8 @@ int hw_device_init_from_string(const char *arg, HWDevice **dev_out) } err = av_hwdevice_ctx_create(&device_ref, type, - device ? device : p, options, 0); + q ? device : p[0] ? p : NULL, + options, 0); if (err < 0) goto fail;