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 55DD64773E for ; Thu, 21 Sep 2023 09:06:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3AEF568C8C7; Thu, 21 Sep 2023 12:06:47 +0300 (EEST) Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A973068C855 for ; Thu, 21 Sep 2023 12:06:40 +0300 (EEST) Received: from b5e5cd9a55e9d9bae8551c23e2a524c8 ([1.136.232.3]) (authenticated (0 bits)) by mx.sdf.org (8.16.1/8.14.5) with ESMTPSA id 38L96WZw027406 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Thu, 21 Sep 2023 09:06:36 GMT Date: Thu, 21 Sep 2023 19:06:28 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avradio/avdevice/sdrindev: -sdr_ant option 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: multipart/mixed; boundary="===============8019134652003736516==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============8019134652003736516== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="I0oKhFKqv8x6HPqw" Content-Disposition: inline --I0oKhFKqv8x6HPqw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Signed-off-by: Peter Ross --- For use with uhd device with run-time selectable antenna jack. libavdevice/sdrindev.c | 3 +++ libavformat/sdr.h | 1 + libavformat/sdrdemux.c | 1 + 3 files changed, 5 insertions(+) diff --git a/libavdevice/sdrindev.c b/libavdevice/sdrindev.c index 8766fc2f34..337bc40c76 100644 --- a/libavdevice/sdrindev.c +++ b/libavdevice/sdrindev.c @@ -234,6 +234,9 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s) names =3D SoapySDRDevice_listAntennas(soapy, SOAPY_SDR_RX, 0, &length); print_and_free_list(s, names, length, "Antennas"); =20 + if (sdr->sdr_ant) + SoapySDRDevice_setAntenna(soapy, SOAPY_SDR_RX, 0, sdr->sdr_ant); + //Go over all tunable elements names =3D SoapySDRDevice_listFrequencies(soapy, SOAPY_SDR_RX, 0, &leng= th); print_and_free_list(s, names, length, "Tunables"); diff --git a/libavformat/sdr.h b/libavformat/sdr.h index 1bf8fbef79..9cbb451418 100644 --- a/libavformat/sdr.h +++ b/libavformat/sdr.h @@ -153,6 +153,7 @@ typedef struct SDRContext { int64_t max_freq; int64_t min_center_freq; int64_t max_center_freq; + char *sdr_ant; int sdr_sample_rate; float min_gain; float max_gain; diff --git a/libavformat/sdrdemux.c b/libavformat/sdrdemux.c index 84dd90af80..882ae96751 100644 --- a/libavformat/sdrdemux.c +++ b/libavformat/sdrdemux.c @@ -2335,6 +2335,7 @@ const AVOption avpriv_sdr_options[] =3D { { "rtlsdr_fixes" , "workaround rtlsdr issues", OFFSET(rtlsdr_fixes), A= V_OPT_TYPE_INT , {.i64 =3D -1}, -1, 1, DEC}, { "sdrplay_fixes" , "workaround sdrplay issues", OFFSET(sdrplay_fixes)= , AV_OPT_TYPE_INT , {.i64 =3D -1}, -1, 1, DEC}, { "dc_fix" , "Apply DC correction", OFFSET(dc_fix), AV_OPT_TYPE_INT , = {.i64 =3D -1}, -1, 1, DEC}, + { "sdr_ant", "sdr antenna", OFFSET(sdr_ant), AV_OPT_TYPE_STRING, {.str= =3D NULL}, 0, 0, DEC}, { "sdr_sr" , "sdr sample rate" , OFFSET(sdr_sample_rate ), AV_OPT_TY= PE_INT , {.i64 =3D 0}, 0, INT_MAX, DEC}, { "sdr_freq", "sdr frequency" , OFFSET(user_wanted_freq), AV_OPT_TY= PE_INT64 , {.i64 =3D 9000000}, 0, INT64_MAX, DEC}, { "gain" , "sdr overall gain", OFFSET(sdr_gain), AV_OPT_TYPE_INT , {= =2Ei64 =3D GAIN_SDR_AGC}, -3, INT_MAX, DEC, "gain"}, --=20 2.40.1 -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) --I0oKhFKqv8x6HPqw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQSpB+AvpuUM0jTNINJnYHnFrEDdawUCZQwHigAKCRBnYHnFrEDd a6wbAJ4xYtsYH7iChcOapTZzs0CU3w5CfwCfb3tTumSkdme3mCM2suacEfELZGk= =3Z8m -----END PGP SIGNATURE----- --I0oKhFKqv8x6HPqw-- --===============8019134652003736516== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============8019134652003736516==--