Credit Andrew - fix vorbis audio which was scratchy and ensure aging plugin does...

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 8c753a354ee0d99c8faf3e5a1d9af63a9aaab32f..6685f468b205255061c670412dc2108135bf5b83 100644 (file)
--- 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 5517b44da14f800231db31ab0800b203a853bbd9..41d30d75844e2b1cd771878b351a1d49a2ecc540 100644 (file)
--- 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 5f4007aa15e1cdaf95d6e69a04005f0bcad26a0c..9ccb4d8aac15be402975ba743d06d38c47afa7e5 100644 (file)
--- 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;
 }

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
deleted file mode 100644 (file)
index 0643526..0000000
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch0
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/libavcodec/aaccoder.c
-+++ b/libavcodec/aaccoder.c
-@@ -60,6 +60,8 @@
-  * replace low energy non zero bands */
- #define NOISE_LAMBDA_REPLACE 1.948f
- 
-+#undef B0
-+
- #include "libavcodec/aaccoder_trellis.h"
- 
- typedef float (*quantize_and_encode_band_func)(struct AACEncContext *s, PutBitContext *pb,
-
---- a/libavcodec/hevc_mvs.c
-+++ b/libavcodec/hevc_mvs.c
-@@ -25,6 +25,8 @@
- #include "hevcdec.h"
- #include "threadframe.h"
- 
-+#undef B0
-+
- static const uint8_t l0_l1_cand_idx[12][2] = {
-     { 0, 1, },
-     { 1, 0, },
---- a/libavcodec/opus_pvq.c
-+++ b/libavcodec/opus_pvq.c
-@@ -36,6 +36,8 @@
- #define CELT_PVQ_U(n, k) (ff_celt_pvq_u_row[FFMIN(n, k)][FFMAX(n, k)])
- #define CELT_PVQ_V(n, k) (CELT_PVQ_U(n, k) + CELT_PVQ_U(n, (k) + 1))
- 
-+#undef B0
-+
- static inline int16_t celt_cos(int16_t x)
- {
-     x = (MUL16(x, x) + 4096) >> 13;