From patchwork Thu Sep 21 09:06:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 43861 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1e62:b0:149:dfde:5c0a with SMTP id cy34csp477448pzb; Thu, 21 Sep 2023 02:06:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbbQIVCo6a+sSUFSBvi+sVvgNQv+Rq0o7/zGHjIiqagVYgAirf7zdSXz1hwvou949QfJ/3 X-Received: by 2002:a17:906:cc56:b0:9a1:d2ef:3e3c with SMTP id mm22-20020a170906cc5600b009a1d2ef3e3cmr4137595ejb.44.1695287211887; Thu, 21 Sep 2023 02:06:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695287211; cv=none; d=google.com; s=arc-20160816; b=XB3woJs4fV+9qeNfkLjy+G1MHSOd8g3eWISViPEUAJfWr5bEYSTr+LpjfBIkBc0D8T Mj2Q4XInQK4Z28JZnRJNOqCwh4yQIlop7AE7ur/+JkkJvp0LS5HEn4LLwf/APXHTrC2W /gZ7vCCc8t0dmGgCtRBMGNuE/VUKcuMrWZKbOTZbKuOzNkw/bP+KbR6Q89wUP3YMoV1n PIDlYFm3r3Ruqaxe1uVF3azT5tXxy5Zlrjk3lIFEdF4/5bDn6LSZ3MAKIZ5AYmsmEi0+ C6b5mgzQDwBMLmmvR1RdaS0bQOvvO4tQ4BRF61QwGldVfHQDhqSyVZtAGkw9ZwiScAMA ue6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:delivered-to; bh=38YPVUwPiv3OHWiyU5+MMh1C09fa8r8mcUcJDISBlg8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ChrNoXLV1dBL9ei6uNbCC6W/AunQeQ+ayiZfJK9wzLNzpoy450WFWhmlyg7SRHW5vo SPyydA+0GsNxhXxidhi1S8/zU7Pw76bXq32sNdOV4bPFLBrIDEiO+oFP9nashr2QFDr3 POhDXMcnFhHethOlReMS959F+gD3f3DSGo+UZhdsogAwg+AJPfnnMFnn2ODaEKZEPGRD 2C7Jp5fYbb6bRGgde57eA59nVyheQUP+LdfDtyxMWXknlwxgJG0EcSh4bD3ybAFWui4H ak2Rbx6K7k6wYUKXyZtkRsOj4r2n881ySn5zLRLHqyyHRyUWaigOK9rjhdH7YzCLK+1O TBag== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dx26-20020a170906a85a00b0099de25aa629si873349ejb.681.2023.09.21.02.06.51; Thu, 21 Sep 2023 02:06:51 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 768C768C823; Thu, 21 Sep 2023 12:06:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Fkz1ittr3U9f 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 = SoapySDRDevice_listAntennas(soapy, SOAPY_SDR_RX, 0, &length); print_and_free_list(s, names, length, "Antennas"); + if (sdr->sdr_ant) + SoapySDRDevice_setAntenna(soapy, SOAPY_SDR_RX, 0, sdr->sdr_ant); + //Go over all tunable elements names = SoapySDRDevice_listFrequencies(soapy, SOAPY_SDR_RX, 0, &length); 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[] = { { "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}, { "dc_fix" , "Apply DC correction", OFFSET(dc_fix), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC}, + { "sdr_ant", "sdr antenna", OFFSET(sdr_ant), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, 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(user_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"},