From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4FA984619C for ; Sat, 8 Jul 2023 21:26:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC85868C570; Sun, 9 Jul 2023 00:25:45 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 254AB68C54B for ; Sun, 9 Jul 2023 00:25:38 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 876D9240006 for ; Sat, 8 Jul 2023 21:25:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 8 Jul 2023 23:25:18 +0200 Message-Id: <20230708212530.109692-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230708212530.109692-1-michael@niedermayer.cc> References: <20230708212530.109692-1-michael@niedermayer.cc> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/18] avradio/sdrinradio: Factor print_and_free_list() out 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Michael Niedermayer --- libavradio/sdrinradio.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c index 052e2298da..e4f17f4bc9 100644 --- a/libavradio/sdrinradio.c +++ b/libavradio/sdrinradio.c @@ -93,6 +93,17 @@ static int sdrindev_set_frequency_callback(SDRContext *sdr, int64_t freq) return 0; } +static void print_and_free_list(AVFormatContext *s, char** names, size_t length, const char *title) +{ + if (length) { + av_log(s, AV_LOG_INFO, "%s:", title); + for (int i = 0; i < length; i++) + av_log(s, AV_LOG_INFO, "%c%s", ", "[!i], names[i]); + av_log(s, AV_LOG_INFO, "\n"); + } + SoapySDRStrings_clear(&names, length); +} + /** * Initial setup of SDR HW through soapy. * This will go over available settings and match them up with what the user requested @@ -162,19 +173,11 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s) //Go over all Antennas and print them names = SoapySDRDevice_listAntennas(soapy, SOAPY_SDR_RX, 0, &length); - av_log(s, AV_LOG_INFO, "Antennas: "); - for (i = 0; i < length; i++) - av_log(s, AV_LOG_INFO, "%s, ", names[i]); - av_log(s, AV_LOG_INFO, "\n"); - SoapySDRStrings_clear(&names, length); + print_and_free_list(s, names, length, "Antennas"); //Go over all Gain Elements and print them names = SoapySDRDevice_listGains(soapy, SOAPY_SDR_RX, 0, &length); - av_log(s, AV_LOG_INFO, "Rx Gain Elements: "); - for (i = 0; i < length; i++) - av_log(s, AV_LOG_INFO, "%s, ", names[i]); - av_log(s, AV_LOG_INFO, "\n"); - SoapySDRStrings_clear(&names, length); + print_and_free_list(s, names, length, "Rx Gain Elements"); //Inform the user if AGC is supported and setup AGC as requested by the user has_agc = SoapySDRDevice_hasGainMode(soapy, SOAPY_SDR_RX, 0); -- 2.31.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".