X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.cc;h=00121384dce7617ab59f0ee85ea0373a7ab0c440;hb=570d4c4489b49c3915674085ee24414f738cb914;hp=2a4320bd8523efb6124a58b9f072d16f6827ece8;hpb=0c01a21ffc4cf9eea71a662916cc3095f2634216;p=dcpomatic.git diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc index 2a4320bd8..00121384d 100644 --- 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), @@ -75,7 +76,9 @@ Resampler::run (shared_ptr 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);