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 496B34599C for ; Sun, 30 Jul 2023 22:11:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24C5F68C529; Mon, 31 Jul 2023 01:11:40 +0300 (EEST) Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [217.70.183.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70EC268C36E for ; Mon, 31 Jul 2023 01:11:34 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 66A2C40003 for ; Sun, 30 Jul 2023 22:11:33 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 31 Jul 2023 00:11:20 +0200 Message-Id: <20230730221131.1205193-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 01/12] avradio/avformat/sdrdemux: Move agc_gain into local variable 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 --- libavformat/sdr.h | 1 - libavformat/sdrdemux.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/sdr.h b/libavformat/sdr.h index 77278ada67..1f2d3a49ab 100644 --- a/libavformat/sdr.h +++ b/libavformat/sdr.h @@ -161,7 +161,6 @@ typedef struct SDRContext { float agc_max_headroom; float agc_max_headroom_time; int agc_low_time; - float agc_gain; ///< current gain, should be accessed only by buffer thread after init atomic_int wanted_gain; int sdr_adcc; int64_t bandwidth; diff --git a/libavformat/sdrdemux.c b/libavformat/sdrdemux.c index 0dc89041c5..4bde431e17 100644 --- a/libavformat/sdrdemux.c +++ b/libavformat/sdrdemux.c @@ -1475,6 +1475,7 @@ static void *soapy_needs_bigger_buffers_worker(SDRContext *sdr) unsigned block_counter = 0; int64_t local_wanted_freq = 0; int64_t last_wanted_freq = 0; + float agc_gain = 0; sdr->remaining_file_block_size = 0; @@ -1529,16 +1530,16 @@ static void *soapy_needs_bigger_buffers_worker(SDRContext *sdr) block_counter = 0; // we just changed the frequency, do not trust the next blocks content } if (sdr->sdr_gain == GAIN_SW_AGC && - fabs(wanted_gain - sdr->agc_gain) > 0.001 && + fabs(wanted_gain - agc_gain) > 0.001 && sdr->set_gain_callback ) { sdr->set_gain_callback(sdr, wanted_gain); - sdr->agc_gain = wanted_gain; + agc_gain = wanted_gain; } pthread_mutex_unlock(&sdr->mutex); fifo_element.center_frequency = block_counter > 0 ? sdr->freq : 0; - fifo_element.gain = sdr->agc_gain; //we make only small changes so slightly mixing should be ok + fifo_element.gain = agc_gain; //we make only small changes so slightly mixing should be ok remaining = sdr->block_size; while (remaining && !atomic_load(&sdr->close_requested)) { -- 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".