From patchwork Mon Dec 13 07:21:41 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: 32411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5073597iog; Sun, 12 Dec 2021 23:24:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJz/Jqd8DEbaYvo5o+6FTz2wcH7Ympk5KABdyI0WdSufVCrHQnJxzXNvt3UM4DWDxrtln8xr X-Received: by 2002:a17:907:6287:: with SMTP id nd7mr43423405ejc.152.1639380243985; Sun, 12 Dec 2021 23:24:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639380243; cv=none; d=google.com; s=arc-20160816; b=Ersm8LYWVGYfATM1Nimv5mdbgOzkkU2uwh9/IU+he20HZGFUhdBLPnxKoSfVUTThhl mSfrZz9jSO4e4Sl6lKar3SoiH1BipcVQwoHySykND5iW9eULmSUFGxfzAgmrsO+L7wzk P0Y0Bvn8mnI5O2ST4gWQBhNMLZDF4Jn8t9G49FmT4tusRCzMIxBIy/9yxpfu2FAx/0kt +etFjBnBtt2mwzGoJlpYHZf9w7Y1EQvZnAdsoeT6lmBn3A768Ruqqr6owwcDt05WmrKq 4DJv/I5nowCjCTnum/344i1jT+2/hOZoxYbQitekjbCeI9W9aCc4TZQBt3819GL1+jBo /0jg== 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=8mq771mErKkZIbk+UMKQ0hXSxOgfULnRUfk0Kz6cxtA=; b=FZHGPwDHWowex1lxX5x/JYNiJ5bj3isd9TQIzPjRZ5S0XqCv3YykP/8kDOt3reG+1j 4iGrg2FQHgAp6gxjiZVWwhqxeWx3TvyycXtndNIiqxbsFBSlGBJif+YInpy0th1qbURu cGC6ebPLGAT1dZAit0ipIeYcymtg5tlVlLZblZwpTSDyLj64hjqUE2FVgAAALBbBHRQX 1ZJyC6Tz/wdWnLewYD/1lm3FIN8CdZpQ8Z/cJxTjlr2FxgT9DnCr61XhNSyKa7H8X4G1 RWLmwo/dqrRLprTgIRFcxmo8w6W5WgHUQi0x5MfU/gWasvt7x01jTIEDytJSrVKlZeLH uLeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jbps7ewh; 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 j7si22292845edw.84.2021.12.12.23.24.03; Sun, 12 Dec 2021 23:24:03 -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=jbps7ewh; 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 6FC2068AF94; Mon, 13 Dec 2021 09:23:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F9AE68AF2E for ; Mon, 13 Dec 2021 09:23:14 +0200 (EET) Received: by mail-lf1-f52.google.com with SMTP id d10so29071316lfg.6 for ; Sun, 12 Dec 2021 23:23:14 -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=fGYrFMIxG8sslSFASAK9bNYbz/ljJHcgjAn2T+n25bQ=; b=jbps7ewhNLXx8pkqKy417voRokBrp8SV8Q54AZMc10XAIF+MwqzEK6VPuFlIGZVrkm Hd0Nya7QPVBbYiEzZyJw47Oto8DPPEUdAkdXhGt+rG9Ol//VvGqH/o/KpwqhIdSJuLhs +fgOzHCGP1UjyAOZvuUJqHt8G1P+OgC3Uui/vd36Or3DL7IIAMvz7+Gfnv63XzqIsrty D7r01PNw4Wm08BFCgS1vDZD1k3gGKzceAeKEhnX7ESejL9pXj+/NHMfNulb2zXJa/TZA sRQ7FxiYk87VxpA2g/h/e6786kXKpIXKaFOr44ceMOnJYQZVyVwH/NXp0B9hwkbw3vsg lDCA== 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=fGYrFMIxG8sslSFASAK9bNYbz/ljJHcgjAn2T+n25bQ=; b=ALwT6uZTjiznsS3SbasMxOiGDMv9IvF5gMWZEMfXt7ybhkZ90MouNCLkDLYKAzIsBo ofn04xOZJ3gS8fs7xz+HjONirdB+HnAOhRQ9dRZ+fsiUXyHbQPPeaBpWd0pNJYN0N2S1 /lQ7oPGoA8Ls03EYWAz17B8VwdtOf21TRGNgNfMpY6XfzKk2elCqBlSPl6gBV/Ghl5+M qVdmxEluH6OIUH8oqJUhF5GkEVkeI3iGZzJB1gGd3MRe9ETcdWREvRksuOPslFdFo26T N6/sqb5FKcKc5mWweUUk7GoX+sS87GB23WZ5H14nrca5wZdF7iAZNg2Hq0YQEpWSIhM+ 0SFQ== X-Gm-Message-State: AOAM5317Eone0XLsB/cFAFwZz+a6sbzRUPEc6flh1tRtNWJURexFhDXa yFcieDuKr+zrpns9U18VeicutV4mqBAeCA== X-Received: by 2002:a05:6512:31cd:: with SMTP id j13mr27278357lfe.586.1639380193572; Sun, 12 Dec 2021 23:23:13 -0800 (PST) Received: from localhost.localdomain (84-217-56-54.customers.ownit.se. [84.217.56.54]) by smtp.gmail.com with ESMTPSA id q26sm1316670lfa.203.2021.12.12.23.23.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Dec 2021 23:23:13 -0800 (PST) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 08:21:41 +0100 Message-Id: <20211213072143.993-12-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20211213072143.993-1-dcnieho@gmail.com> References: <20211213072143.993-1-dcnieho@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 11/13] 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: hw4DH872+iu6 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 3c8e5a82cd..7d7dcce2f9 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("%s %s [%s] (", device_list->default_device == i ? "*" : " ", + device->device_name, device->device_description); + if (device->nb_media_types > 0 && device->media_types) { + 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);