From: Good Guy <good1.2guy@gmail.com>
Date: Thu, 25 Apr 2024 21:51:07 +0000 (-0600)
Subject: Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does... 
X-Git-Tag: 2024-05~6
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=03bf11ec3f2c7a2077c8f521722d97b9e2eeb383;p=goodguy%2Fcinelerra.git

Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does not display pits and dust when set to zero
---

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 8c753a35..6685f468 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -641,8 +641,8 @@ int FFStream::encode_frame(AVFrame *frame)
 		if ( ret == AVERROR(EAGAIN) && !frame ) continue;
 		FFPacket opkt;
 		ret = avcodec_receive_packet(avctx, opkt);
-		if( !frame && ret == AVERROR_EOF ) return pkts;
-		if( ret < 0 ) break;
+		if( !frame && (ret == AVERROR_EOF || ret == AVERROR(EAGAIN) )) return pkts;
+		//if( ret < 0 ) break;
 		ret = write_packet(opkt);
 		if( ret < 0 ) break;
 		++pkts;
diff --git a/cinelerra-5.1/plugins/aging/aging.C b/cinelerra-5.1/plugins/aging/aging.C
index 5517b44d..41d30d75 100644
--- a/cinelerra-5.1/plugins/aging/aging.C
+++ b/cinelerra-5.1/plugins/aging/aging.C
@@ -581,12 +581,12 @@ void AgingClient::process_package(LoadPackage *package)
 			plugin->input_ptr->get_color_model(),
 			plugin->input_ptr->get_w(),
 			local_package->row2 - local_package->row1);
-	if( plugin->config.pits )
+	if( plugin->config.pits && plugin->config.pits_interval > 0 )
 		pits(output_rows,
 			plugin->input_ptr->get_color_model(),
 			plugin->input_ptr->get_w(),
 			local_package->row2 - local_package->row1);
-	if( plugin->config.dust )
+	if( plugin->config.dust && plugin->config.dust_interval > 0 )
 		dusts(output_rows,
 			plugin->input_ptr->get_color_model(),
 			plugin->input_ptr->get_w(),
diff --git a/cinelerra-5.1/plugins/aging/agingwindow.C b/cinelerra-5.1/plugins/aging/agingwindow.C
index 5f4007aa..9ccb4d8a 100644
--- a/cinelerra-5.1/plugins/aging/agingwindow.C
+++ b/cinelerra-5.1/plugins/aging/agingwindow.C
@@ -82,6 +82,7 @@ AgingISlider::~AgingISlider()
 int AgingISlider::handle_event()
 {
 	int ret = BC_ISlider::handle_event();
+	*output = get_value();
 	win->plugin->send_configure_change();
 	return ret;
 }