From patchwork Fri Oct 9 20:38:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 22802 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 ECC8E4489D1 for ; Fri, 9 Oct 2020 23:41:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0D8368B9F6; Fri, 9 Oct 2020 23:41:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B063E68B9B5 for ; Fri, 9 Oct 2020 23:41:14 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id q63so12002964qkf.3 for ; Fri, 09 Oct 2020 13:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ZvtqkB6rDBTCYghwgvVC934N4S4pupxSbAQv0dwm3eI=; b=eImjt2dGwMNezEBDkhmJ23QOjEFV5PRFdyRbKwDb/Hsf0363mD7TENy2i75Ft6AbBe SFdmNPC4DS62Q6UyVVaJOuYpo8TlQF6TUPPFYBXGkeinp7tUAqdLNVBEttfRLjSrB15+ B5M7EPDQdVWLJUN6n3ZKflQKkvpnBvUOtdoHVFrE2ifoBg/rhvSBZYlVE/c3wl1hSDfa aZV3QHBnXXbALul3lv46Q10RqNqM/4J/9AIsMgkljONx6loH5w6XZrDhtFhG8znTxmNM OnLfvpmo4kaen09l1oxUk+lDOK47eeA1HeK19DXNSieEkFjZXFoF1b3nbql0ppstqFJK JtHA== 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=ZvtqkB6rDBTCYghwgvVC934N4S4pupxSbAQv0dwm3eI=; b=Mr9C9rbSeEtl7gEm2kAcxkRtPaxDQwjOu/Yc4puS9tkJ1guPYTYoKeT2bjtuBXikn+ yN3BgQbP8VUI/oxDGk+SFQsk3GZWkhNnBjqzMdbR9Rl3piPnjSZvTxyk3nJWfl2p50WJ xI8J8esCFaNeTi+holBmF1MYNvTWB2Jb6YiT9VsHn8emZ0iLmE2UPilWFpRNfDD37ATd cnpBTffxN8O/HNWMFJvLd4UV1CNgUWIzc+gyLfIvedvk4dqE0sAYQ74azkwnGgtTK6yE uOdYN1S5sRNypcP1YbjfLeBH+ndQCDOXYLRWxTkL6rm8aFwTYZVCBwruCDjPOaLGjcAl izYQ== X-Gm-Message-State: AOAM532Gn528xbODnY/lDVZ2ra5WIX9VAxQjRQqicaormL/DVkxXSxF2 oUatD9rGig4MPY4drnMf9c+1ePtId+tAcA== X-Google-Smtp-Source: ABdhPJzBBgk/M4jqErrmqbvoe6U2OD2rnVh/HcC/8/4WqMnp0FKHf1J58bGq+AyPAnFWDmgiow+AQg== X-Received: by 2002:a37:c07:: with SMTP id 7mr14067003qkm.335.1602276073069; Fri, 09 Oct 2020 13:41:13 -0700 (PDT) Received: from localhost.localdomain ([181.23.78.153]) by smtp.gmail.com with ESMTPSA id l92sm6908272qte.38.2020.10.09.13.41.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 13:41:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Oct 2020 17:38:51 -0300 Message-Id: <20201009203851.10820-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <273f8ad1-2579-7b62-25a8-a77647fdbb10@gmail.com> References: <273f8ad1-2579-7b62-25a8-a77647fdbb10@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3 v2] cmdutils: use the new device iteration API to list devices 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" Signed-off-by: James Almer --- fftools/cmdutils.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 88fdbeaf1e..ba25e5c884 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -2302,7 +2302,8 @@ static int show_sinks_sources_parse_arg(const char *arg, char **dev, AVDictionar int show_sources(void *optctx, const char *opt, const char *arg) { - AVInputFormat *fmt = NULL; + const AVInputFormat *fmt = NULL; + void *fmt_iter = NULL; char *dev = NULL; AVDictionary *opts = NULL; int ret = 0; @@ -2314,21 +2315,11 @@ int show_sources(void *optctx, const char *opt, const char *arg) goto fail; do { - fmt = av_input_audio_device_next(fmt); + fmt = av_indev_iterate(&fmt_iter); if (fmt) { - if (!strcmp(fmt->name, "lavfi")) - continue; //it's pointless to probe lavfi if (dev && !av_match_name(dev, fmt->name)) continue; - print_device_sources(fmt, opts); - } - } while (fmt); - do { - fmt = av_input_video_device_next(fmt); - if (fmt) { - if (dev && !av_match_name(dev, fmt->name)) - continue; - print_device_sources(fmt, opts); + print_device_sources((AVInputFormat *)fmt, opts); } } while (fmt); fail: @@ -2340,7 +2331,8 @@ int show_sources(void *optctx, const char *opt, const char *arg) int show_sinks(void *optctx, const char *opt, const char *arg) { - AVOutputFormat *fmt = NULL; + const AVOutputFormat *fmt = NULL; + void *fmt_iter = NULL; char *dev = NULL; AVDictionary *opts = NULL; int ret = 0; @@ -2352,19 +2344,11 @@ int show_sinks(void *optctx, const char *opt, const char *arg) goto fail; do { - fmt = av_output_audio_device_next(fmt); - if (fmt) { - if (dev && !av_match_name(dev, fmt->name)) - continue; - print_device_sinks(fmt, opts); - } - } while (fmt); - do { - fmt = av_output_video_device_next(fmt); + fmt = av_outdev_iterate(&fmt_iter); if (fmt) { if (dev && !av_match_name(dev, fmt->name)) continue; - print_device_sinks(fmt, opts); + print_device_sinks((AVOutputFormat *)fmt, opts); } } while (fmt); fail: