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 7331F45EC5 for ; Mon, 17 Jul 2023 00:28:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E27468C6A6; Mon, 17 Jul 2023 03:27:22 +0300 (EEST) Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 592C368C612 for ; Mon, 17 Jul 2023 03:27:12 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id C481DE0005 for ; Mon, 17 Jul 2023 00:27:11 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 17 Jul 2023 02:27:04 +0200 Message-Id: <20230717002704.3092192-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230717002704.3092192-1-michael@niedermayer.cc> References: <20230717002704.3092192-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 7/7] avradio/sdr: workaround inverted gain parameter on sdrplay 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/sdr.h | 1 + libavradio/sdrdemux.c | 1 + libavradio/sdrinradio.c | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/libavradio/sdr.h b/libavradio/sdr.h index 395b056531..27ec1db4f3 100644 --- a/libavradio/sdr.h +++ b/libavradio/sdr.h @@ -257,6 +257,7 @@ typedef struct SDRContext { int missing_streams; int rtlsdr_fixes; + int sdrplay_fixes; } SDRContext; typedef struct ModulationDescriptor { diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index 5214aea7be..1b3061a406 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -2180,6 +2180,7 @@ const AVOption ff_sdr_options[] = { { "driver" , "sdr driver name" , OFFSET(driver_name), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC}, { "rtlsdr_fixes" , "workaround rtlsdr issues", OFFSET(rtlsdr_fixes), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC}, + { "sdrplay_fixes" , "workaround sdrplay issues", OFFSET(sdrplay_fixes), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC}, { "sdr_sr" , "sdr sample rate" , OFFSET(sdr_sample_rate ), AV_OPT_TYPE_INT , {.i64 = 0}, 0, INT_MAX, DEC}, { "sdr_freq", "sdr frequency" , OFFSET(wanted_freq), AV_OPT_TYPE_INT64 , {.i64 = 9000000}, 0, INT64_MAX, DEC}, { "gain" , "sdr overall gain", OFFSET(sdr_gain), AV_OPT_TYPE_INT , {.i64 = GAIN_SDR_AGC}, -3, INT_MAX, DEC, "gain"}, diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c index 63a9cade78..f824a1d190 100644 --- a/libavradio/sdrinradio.c +++ b/libavradio/sdrinradio.c @@ -76,6 +76,11 @@ static int sdrindev_set_gain_callback(SDRContext *sdr, float gain) if (sdr->sdr_gain == GAIN_DEFAULT) return 0; + //sdrplay has a inverted gain range, not using max_gain as this is a user parameter + if (sdr->sdrplay_fixes > 0) { + gain = FFMIN(48 - gain, 45); + } + if (soapy) { int ret = SoapySDRDevice_setGainMode(soapy, SOAPY_SDR_RX, 0, sdr->sdr_gain == GAIN_SDR_AGC); if (ret) { @@ -192,6 +197,8 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s) if (sdr->rtlsdr_fixes < 0) sdr->rtlsdr_fixes = !strcmp(sdr->driver_name, "rtlsdr"); + if (sdr->sdrplay_fixes < 0) + sdr->sdrplay_fixes = !strcmp(sdr->driver_name, "sdrplay"); SoapySDRKwargs_set(&args, "driver", sdr->driver_name); sdr->soapy = soapy = SoapySDRDevice_make(&args); -- 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".