Fix zero-sized buffers coming out of audio merger.

diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc
index afbcf4921e9dde165e04914c81777697229cf275..0eeeb3c4ae5858b094ffd4f5da58ab659f9d3b75 100644 (file)
--- a/src/lib/audio_filter_graph.cc
+++ b/src/lib/audio_filter_graph.cc
@@ -26,10 +26,12 @@ extern "C" {
 #include <libavfilter/buffersrc.h>
 #include <libavutil/channel_layout.h>
 }
+#include <iostream>
 
 #include "i18n.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
 
 AudioFilterGraph::AudioFilterGraph (int sample_rate, int channels)
@@ -105,6 +107,7 @@ AudioFilterGraph::sink_name () const
 void
 AudioFilterGraph::process (shared_ptr<const AudioBuffers> buffers)
 {
+       DCPOMATIC_ASSERT (buffers->frames() > 0);
        int const process_channels = av_get_channel_layout_nb_channels (_channel_layout);
        DCPOMATIC_ASSERT (process_channels >= buffers->channels());
 

diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc
index 5e0589bb12941e39481e74ac104700ab7a711ce7..10a71535b4794e7e80cebe792898d5deab03ed17 100644 (file)
--- a/src/lib/audio_merger.cc
+++ b/src/lib/audio_merger.cc
@@ -51,7 +51,7 @@ AudioMerger::pull (DCPTime time)
        list<Buffer> new_buffers;
 
        BOOST_FOREACH (Buffer i, _buffers) {
-               if (i.period().to < time) {
+               if (i.period().to <= time) {
                        /* Completely within the pull period */
                        out.push_back (make_pair (i.audio, i.time));
                } else if (i.time < time) {