From patchwork Tue Dec 21 13:53:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Diederick C. Niehorster" X-Patchwork-Id: 32800 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5445394iog; Tue, 21 Dec 2021 05:56:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJyb3NrrZhMBdrasWFtttksPvU4T8ns7qL2FxU7gEAff2i6A+5BiyXXaa8mNEiUpDVpOfcHF X-Received: by 2002:a17:907:98d2:: with SMTP id kd18mr2744819ejc.252.1640094962882; Tue, 21 Dec 2021 05:56:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640094962; cv=none; d=google.com; s=arc-20160816; b=E5ZH/0nll/4WJK/dmqL5Pnsp+v932DH8if2YAaX8szSyBif3Ck1FeaBmJndm+GkGHI X0u37EP7DW9YxVYWgJvN2Ra+h/q4RPsDuMMT33gjl9oD2ZlcrTqae7Om/SKnpR9Edr98 Gliah0hDhQP1mxSi8aY7ElMjRhB0iv95mqUbFEEXIAqrWWQXY7aMmmTuVMPENV0XxLxc avjkyzLS2It/+Djug4prALCLGo9DfI3r8oPokh5bk6vcBQ3H9J1iYwA9NAhvh4GYC8X7 bf9P1l0RCWoeKneoLkM7Q3Wl13abXZM+pGYImrjxnBG0JDBAhqsnGE7MO9FSD79PK0KG nj+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=cO5YfPwP5ypudypnUxh2xYo+rk8ww6DeKlK1Lk5E6To=; b=pav7dTYCVQWqHyxIXRlSeN+MkKV+jCIykrYMCa6cxADxe42vAZ8nI7pYjXbEYhzlM6 L8jEzqF+0gxZj0fkqWV+Wxvq2xAgyCXBjPk9wkG15x49bKMB30xRDWAiD1ddFoTGGb7v 2RgL8FYOo3UVTukynEOaF7F7n+9Z6G1/KOmaFGwJuOuEPwwr7qRMVBFhsYXlTBLjkIX0 1leXIC5akrvZti/FLdnuRDDTVLMXeeO0LxwabfVqHfgUgDI6MDNe7JHRSAlkTHVkC1HK 9MlXq8OrXF+sTvfUGiAnHY8bAUtT0k0YRcQElycetBcGvknHrJbDJgKw40XlXKuqGTwM cPtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fpAX8Ju8; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qk10si112865ejc.455.2021.12.21.05.56.01; Tue, 21 Dec 2021 05:56:02 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=fpAX8Ju8; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 94AD668B002; Tue, 21 Dec 2021 15:55:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5628680090 for ; Tue, 21 Dec 2021 15:55:04 +0200 (EET) Received: by mail-lf1-f44.google.com with SMTP id bp20so13854001lfb.6 for ; Tue, 21 Dec 2021 05:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5H6BZ4r9sxJwO8GSbhViSzjChcWwiXvNcCDy8UFdP94=; b=fpAX8Ju8cpEMjc3TpVWqZ3TA8F2hvH/DLBf80dlgtHG5gTeUe8yiYV9U/d4vAIhtI9 odayYhUPZL/o55y80NlL5xiH3n8uO6fcPGQP/UlAiDaBRiluRaGNV8VAGIyiJNrMwBK1 haXSO9S5IuK4x2puTptzdYakcMNlJzGZIzfk7YfMrr/6uqjMIq1OzenvgTgtf4iBcD4i NV7zh7BbFrJEcSgl7iNqOKNEplTFS2YX+EJU3yh35TwaSPY0FecT6breqlk0hTepK+IQ C8+YN9WXGKa/89d+HXdmoZEvSpigK5eZhjg5iAxxSpSoGtTXcQN1rR3wjyz25Frvez5o PciA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5H6BZ4r9sxJwO8GSbhViSzjChcWwiXvNcCDy8UFdP94=; b=OjRGsU7QA6DCIShh7tV70bx5uDZr77L9bLHd8VBZu98uzOzgxxAg/RH8klttkvkjMc 8LgFvuEbF1awSXlE5AH+F/KFCrLKKoBtLsb93CVOu446++vbPaFYcaU46mbnKmi5k4Ya WacmWBY+dSEr5CSGv5dnXJZZmM4goj2xNVDN5nt5LdfgFCeOXjz6IM86qZeLQ/++pTUq ZKrCByGRsPB+V2LjojXQ6Npyj4y01t+t3e5Lwlb7z75a5bG4cR0sQQ/Xi/Xr0b6SpWoD UAOhqrQt20EPBOBR/7KatfNmmr91pJPxr3H1za1dyeN67ykg+EbJg2+HgR4qBrFTaoED /UGw== X-Gm-Message-State: AOAM530xa/uUygiPZQT192QGkczlTKUeDlm3bGavj+DB9UO5IXzYPo3E zwLSdnNeZcjPdMZy3IvCx97Ad9aUw8mZSg== X-Received: by 2002:a05:6512:90c:: with SMTP id e12mr3129838lft.419.1640094903396; Tue, 21 Dec 2021 05:55:03 -0800 (PST) Received: from localhost.localdomain ([196.244.192.13]) by smtp.gmail.com with ESMTPSA id bu36sm2034631lfb.259.2021.12.21.05.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 05:55:02 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Dec 2021 14:53:35 +0100 Message-Id: <20211221135337.1348-11-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211221135337.1348-1-dcnieho@gmail.com> References: <20211221135337.1348-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 10/12] fftools: provide media type info for devices X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Diederick Niehorster Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bjx+GY5CvMnX fftools now print info about what media type(s), if any, are provided by sink and source avdevices. Signed-off-by: Diederick Niehorster --- fftools/cmdutils.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 882584e9c2..1444ea2f07 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2244,9 +2244,29 @@ double get_rotation(int32_t *displaymatrix) } #if CONFIG_AVDEVICE +static void print_device_list(const AVDeviceInfoList *device_list) +{ + // print devices + for (int i = 0; i < device_list->nb_devices; i++) { + const AVDeviceInfo *device = device_list->devices[i]; + printf("%c %s [%s] (", device_list->default_device == i ? '*' : ' ', + device->device_name, device->device_description); + if (device->nb_media_types > 0) { + for (int j = 0; j < device->nb_media_types; ++j) { + const char* media_type = av_get_media_type_string(device->media_types[j]); + if (j > 0) + printf(", "); + printf("%s", media_type ? media_type : "unknown"); + } + } else { + printf("none"); + } + printf(")\n"); + } +} static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) { - int ret, i; + int ret; AVDeviceInfoList *device_list = NULL; if (!fmt || !fmt->priv_class || !AV_IS_INPUT_DEVICE(fmt->priv_class->category)) @@ -2258,10 +2278,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) goto fail; } - for (i = 0; i < device_list->nb_devices; i++) { - printf("%c %s [%s]\n", device_list->default_device == i ? '*' : ' ', - device_list->devices[i]->device_name, device_list->devices[i]->device_description); - } + print_device_list(device_list); fail: avdevice_free_list_devices(&device_list); @@ -2270,7 +2287,7 @@ static int print_device_sources(const AVInputFormat *fmt, AVDictionary *opts) static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts) { - int ret, i; + int ret; AVDeviceInfoList *device_list = NULL; if (!fmt || !fmt->priv_class || !AV_IS_OUTPUT_DEVICE(fmt->priv_class->category)) @@ -2282,10 +2299,7 @@ static int print_device_sinks(const AVOutputFormat *fmt, AVDictionary *opts) goto fail; } - for (i = 0; i < device_list->nb_devices; i++) { - printf("%c %s [%s]\n", device_list->default_device == i ? '*' : ' ', - device_list->devices[i]->device_name, device_list->devices[i]->device_description); - } + print_device_list(device_list); fail: avdevice_free_list_devices(&device_list);