Try to fix crash on drop()ping JobManager. More debugging when resampler fails.

[dcpomatic.git] / src / lib / resampler.cc

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index 2a4320bd8523efb6124a58b9f072d16f6827ece8..d897bf562dc4a97dcf5c314a8e7242e050f93e2f 100644 (file)
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -23,10 +23,13 @@ extern "C" {
 #include "resampler.h"
 #include "audio_buffers.h"
 #include "exceptions.h"
+#include "compose.hpp"
 
 #include "i18n.h"
 
 using std::cout;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
 
 Resampler::Resampler (int in, int out, int channels)
@@ -42,8 +45,6 @@ Resampler::Resampler (int in, int out, int channels)
           input and output layouts are the same.
        */
 
-       cout << "resamp for " << _channels << " " << _in_rate << " " << _out_rate << "\n";
-
        _swr_context = swr_alloc_set_opts (
                0,
                av_get_default_channel_layout (_channels),
@@ -63,9 +64,11 @@ Resampler::~Resampler ()
        swr_free (&_swr_context);
 }
 
-shared_ptr<const AudioBuffers>
-Resampler::run (shared_ptr<const AudioBuffers> in)
+pair<shared_ptr<const AudioBuffers>, AudioContent::Frame>
+Resampler::run (shared_ptr<const AudioBuffers> in, AudioContent::Frame frame)
 {
+       AudioContent::Frame const resamp_time = swr_next_pts (_swr_context, frame * _out_rate) / _in_rate;
+               
        /* Compute the resampled frames count and add 32 for luck */
        int const max_resampled_frames = ceil ((double) in->frames() * _out_rate / _in_rate) + 32;
        shared_ptr<AudioBuffers> resampled (new AudioBuffers (_channels, max_resampled_frames));
@@ -75,11 +78,13 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
                );
        
        if (resampled_frames < 0) {
-               throw EncodeError (_("could not run sample-rate converter"));
+               char buf[256];
+               av_strerror (resampled_frames, buf, sizeof(buf));
+               throw EncodeError (String::compose (_("could not run sample-rate converter for %1 samples (%2) (%3)"), in->frames(), resampled_frames, buf));
        }
        
        resampled->set_frames (resampled_frames);
-       return resampled;
+       return make_pair (resampled, resamp_time);
 }      
 
 shared_ptr<const AudioBuffers>