From patchwork Sat Jul 8 21:25:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6d25:b0:130:f365:34ad with SMTP id fv37csp663609pzb; Sat, 8 Jul 2023 14:27:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlGgthxJ7XgT1x65JyAP/Bs1TlkGvLh8x6T7wcg6+NRkRpuFjJBGGfKDtcZp83kD2leclDta X-Received: by 2002:a2e:809a:0:b0:2b3:47b3:3c39 with SMTP id i26-20020a2e809a000000b002b347b33c39mr6502496ljg.23.1688851661372; Sat, 08 Jul 2023 14:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688851661; cv=none; d=google.com; s=arc-20160816; b=mDyhDFhlk3E4qUaojM7QLl5kIOdyc0OSvnKtlopJI9iSch2/8E5oJ6AiVyBFF6vht2 iTzNMXTfsv2nxrnMpRsypSkWpw4hEbE8g09z+7G4CgNBMVmVCdbRY7YGsTTKKokD6C5b 07s0FO7zaNc2UdMYBl743mN43VBrkV++prskVxGNP1WxtB1Po/zJXoYyNCKyNCoiKVrH SHFJhfYFB+8FmyG7rvA+ZptttVxb1Wxkw//fSVNAkwa7B3LDHmDEJjdvjQ2C8f2pRwh8 xfulUSLXSCGn5/0zozmSVwoMlpaScDzEVlFAmQW8T1l2w0M97wlYEO2g/ooWRW61Lvfg T8ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=0aDKk7PfIwIRzhd0oPudWczbxAGNiTrpCuGsYKNE5T0=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=N8ScTTSaZ0Q5imABqyiG+l6hdXcaYfTFEk0XcOlGZSwU/dbv/L/6jBez1f+b9Ty/IX e9IN0+gfbB2lMXMcOKU7V2sNnXACCTnxY8fsV8pCfd4CO6oS7jGSfpQ4e1P2Ds6nq8o6 hXTWHbcMiVo33SZeh5jiyeK2yHawMEtuqeB3b2Obl9RpHjBWuWd9vvcuYY1Idfzg8leP 7Cm2FG8vW1GVzBnUSnRTHyF38aKAgHMjWnFyJD+WnhHhr7WdRLYfAHGj5t8N/KT2AE5j tYf31FQ0PpI+8wC8VwhmkEiywu4hBYQieTcdbSHsTKLG/+OrgavDtzI5yz3+0oVZkMAd W4ow== 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 j23-20020a17090686d700b0097455b9d069si4192133ejy.1033.2023.07.08.14.27.41; Sat, 08 Jul 2023 14:27:41 -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 B075168C5E0; Sun, 9 Jul 2023 00:25:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 959FA68C55A for ; Sun, 9 Jul 2023 00:25:41 +0300 (EEST) X-GND-Sasl: michael@niedermayer.cc Received: by mail.gandi.net (Postfix) with ESMTPSA id 0680CFF802 for ; Sat, 8 Jul 2023 21:25:40 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 8 Jul 2023 23:25:22 +0200 Message-Id: <20230708212530.109692-10-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 10/18] avradio/sdr: eliminate avpriv_* 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: 049U1lrU3Ho8 Signed-off-by: Michael Niedermayer --- libavradio/sdr.h | 14 +++++++------- libavradio/sdrdemux.c | 32 ++++++++++++++++---------------- libavradio/sdrinradio.c | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/libavradio/sdr.h b/libavradio/sdr.h index 13237707b3..2940ffa389 100644 --- a/libavradio/sdr.h +++ b/libavradio/sdr.h @@ -228,7 +228,7 @@ typedef struct BandDescriptor { int64_t freq_max; } BandDescriptor ; -extern const AVOption avpriv_sdr_options[]; +extern const AVOption ff_sdr_options[]; extern ModulationDescriptor ff_sdr_modulation_descs[]; @@ -237,21 +237,21 @@ extern ModulationDescriptor ff_sdr_modulation_descs[]; * this will check the argument and call set_frequency_callback() * It can be called before the thread is started or from within the thread, */ -int avpriv_sdr_set_freq(SDRContext *sdr, int64_t freq); +int ff_sdr_set_freq(SDRContext *sdr, int64_t freq); -int avpriv_sdr_common_init(AVFormatContext *s); +int ff_sdr_common_init(AVFormatContext *s); -int avpriv_sdr_read_packet(AVFormatContext *s, AVPacket *pkt); +int ff_sdr_read_packet(AVFormatContext *s, AVPacket *pkt); -int avpriv_sdr_read_seek(AVFormatContext *s, int stream_index, int64_t target, int flags); +int ff_sdr_read_seek(AVFormatContext *s, int stream_index, int64_t target, int flags); /** * shuts down threads, destroys mutex * Safe to call if no thread was started or after it was shutdown */ -void avpriv_sdr_stop_threading(AVFormatContext *s); +void ff_sdr_stop_threading(AVFormatContext *s); -int avpriv_sdr_read_close(AVFormatContext *s); +int ff_sdr_read_close(AVFormatContext *s); int ff_sdr_vissualization(SDRContext *sdr, AVStream *st, AVPacket *pkt); diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index 6682768461..2bce1045f4 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -1056,7 +1056,7 @@ ModulationDescriptor ff_sdr_modulation_descs[] = { {"Frequency Modulation", "FM", FM, AVMEDIA_TYPE_AUDIO, probe_fm, demodulate_fm}, }; -int avpriv_sdr_set_freq(SDRContext *sdr, int64_t freq) +int ff_sdr_set_freq(SDRContext *sdr, int64_t freq) { freq = av_clip64(freq, sdr->min_center_freq, sdr->max_center_freq); @@ -1390,9 +1390,9 @@ static void *soapy_needs_bigger_buffers_worker(SDRContext *sdr) } if (sdr->wanted_freq != sdr->freq) { //We could use a seperate MUTEX for the FIFO and for soapy - avpriv_sdr_set_freq(sdr, sdr->wanted_freq); + ff_sdr_set_freq(sdr, sdr->wanted_freq); //This shouldnt really cause any problem if we just continue on error except that we continue returning data with the previous target frequency range - //And theres not much else we can do, an error message was already printed by avpriv_sdr_set_freq() in that case + //And theres not much else we can do, an error message was already printed by ff_sdr_set_freq() in that case block_counter = 0; // we just changed the frequency, do not trust the next blocks content } pthread_mutex_unlock(&sdr->mutex); @@ -1416,7 +1416,7 @@ static void *soapy_needs_bigger_buffers_worker(SDRContext *sdr) return NULL; } -int avpriv_sdr_common_init(AVFormatContext *s) +int ff_sdr_common_init(AVFormatContext *s) { SDRContext *sdr = s->priv_data; AVStream *st; @@ -1588,16 +1588,16 @@ static int sdrfile_initial_setup(AVFormatContext *s) //After reading the first packet header we return to the begin so the packet can be read whole avio_seek(s->pb, 0, SEEK_SET); - ret = avpriv_sdr_set_freq(sdr, sdr->wanted_freq); + ret = ff_sdr_set_freq(sdr, sdr->wanted_freq); if (ret < 0) return ret; sdr->read_callback = sdrfile_read_callback; - return avpriv_sdr_common_init(s); + return ff_sdr_common_init(s); } -int avpriv_sdr_read_packet(AVFormatContext *s, AVPacket *pkt) +int ff_sdr_read_packet(AVFormatContext *s, AVPacket *pkt) { SDRContext *sdr = s->priv_data; int ret, i, full_blocks, seek_direction; @@ -1860,7 +1860,7 @@ process_next_block: return AVERROR(EAGAIN); } -int avpriv_sdr_read_seek(AVFormatContext *s, int stream_index, +int ff_sdr_read_seek(AVFormatContext *s, int stream_index, int64_t target, int flags) { SDRContext *sdr = s->priv_data; @@ -1900,7 +1900,7 @@ int avpriv_sdr_read_seek(AVFormatContext *s, int stream_index, return 0; } -void avpriv_sdr_stop_threading(AVFormatContext *s) +void ff_sdr_stop_threading(AVFormatContext *s) { SDRContext *sdr = s->priv_data; @@ -1919,12 +1919,12 @@ void avpriv_sdr_stop_threading(AVFormatContext *s) sdr->thread_started = 0; } -int avpriv_sdr_read_close(AVFormatContext *s) +int ff_sdr_read_close(AVFormatContext *s) { SDRContext *sdr = s->priv_data; int i; - avpriv_sdr_stop_threading(s); + ff_sdr_stop_threading(s); av_fifo_freep2(&sdr->empty_block_fifo); av_fifo_freep2(&sdr->full_block_fifo); @@ -1969,7 +1969,7 @@ static int sdrfile_probe(const AVProbeData *p) #define OFFSET(x) offsetof(SDRContext, x) #define DEC AV_OPT_FLAG_DECODING_PARAM -const AVOption avpriv_sdr_options[] = { +const AVOption ff_sdr_options[] = { { "video_size", "set frame size", OFFSET(width), AV_OPT_TYPE_IMAGE_SIZE, {.str = "0x0"}, 0, 0, DEC }, { "framerate" , "set frame rate", OFFSET(fps), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX,DEC }, { "block_size", "FFT block size", OFFSET(block_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, DEC}, @@ -2015,7 +2015,7 @@ const AVOption avpriv_sdr_options[] = { static const AVClass sdrfile_demuxer_class = { .class_name = "sdrfile", .item_name = av_default_item_name, - .option = avpriv_sdr_options, + .option = ff_sdr_options, .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_DEMUXER, }; @@ -2026,9 +2026,9 @@ const AVInputFormat ff_sdrfile_demuxer = { .priv_data_size = sizeof(SDRContext), .read_probe = sdrfile_probe, .read_header = sdrfile_initial_setup, - .read_packet = avpriv_sdr_read_packet, - .read_close = avpriv_sdr_read_close, - .read_seek = avpriv_sdr_read_seek, + .read_packet = ff_sdr_read_packet, + .read_close = ff_sdr_read_close, + .read_seek = ff_sdr_read_seek, .flags_internal = FF_FMT_INIT_CLEANUP, .priv_class = &sdrfile_demuxer_class, }; diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c index af87b49495..0e7442fddf 100644 --- a/libavradio/sdrinradio.c +++ b/libavradio/sdrinradio.c @@ -272,7 +272,7 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s) av_log(s, AV_LOG_ERROR, "setSampleRate fail: %s\n", SoapySDRDevice_lastError()); return AVERROR_EXTERNAL; } - ret = avpriv_sdr_set_freq(sdr, sdr->wanted_freq); + ret = ff_sdr_set_freq(sdr, sdr->wanted_freq); if (ret < 0) return ret; @@ -331,7 +331,7 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s) SoapySDRDevice_activateStream(soapy, soapyRxStream, 0, 0, 0); - return avpriv_sdr_common_init(s); + return ff_sdr_common_init(s); } static int sdrindev_read_close(AVFormatContext *s) @@ -339,7 +339,7 @@ static int sdrindev_read_close(AVFormatContext *s) SDRContext *sdr = s->priv_data; SoapySDRDevice *soapy = sdr->soapy; - avpriv_sdr_stop_threading(s); + ff_sdr_stop_threading(s); if (soapy) { if (sdr->soapyRxStream) { @@ -352,7 +352,7 @@ static int sdrindev_read_close(AVFormatContext *s) sdr->soapy = NULL; } - return avpriv_sdr_read_close(s); + return ff_sdr_read_close(s); } static int sdr_get_device_list(AVFormatContext *ctx, AVDeviceInfoList *device_list) @@ -402,7 +402,7 @@ static int sdr_get_device_list(AVFormatContext *ctx, AVDeviceInfoList *device_li static const AVClass sdr_demuxer_class = { .class_name = "sdr", .item_name = av_default_item_name, - .option = avpriv_sdr_options, + .option = ff_sdr_options, .version = LIBAVUTIL_VERSION_INT, .category = AV_CLASS_CATEGORY_RADIO_INPUT, }; @@ -412,9 +412,9 @@ const AVInputFormat ff_sdr_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("Software Defined Radio Demodulator"), .priv_data_size = sizeof(SDRContext), .read_header = sdrindev_initial_hw_setup, - .read_packet = avpriv_sdr_read_packet, + .read_packet = ff_sdr_read_packet, .read_close = sdrindev_read_close, - .read_seek = avpriv_sdr_read_seek, + .read_seek = ff_sdr_read_seek, .get_device_list= sdr_get_device_list, .flags = AVFMT_NOFILE, .flags_internal = FF_FMT_INIT_CLEANUP,