X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.cc;h=f54f4ec6abd3ab16c16ac48de8a408f93d4f254a;hb=e526999a0252193ee8e42ac841c7494bea44ecfb;hp=e414436e8b39960c6c5f78ca16188c0781bc0407;hpb=b6c780d3107557d452c6612d715d01e2be52dbda;p=dcpomatic.git

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index e414436e8..f54f4ec6a 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 extern "C" {
 #include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
-}	
+}
 #include "resampler.h"
 #include "audio_buffers.h"
 #include "exceptions.h"
@@ -51,7 +51,9 @@ Resampler::Resampler (int in, int out, int channels)
 	/* Sample rates */
 	av_opt_set_int (_swr_context, "isr", _in_rate, 0);
 	av_opt_set_int (_swr_context, "osr", _out_rate, 0);
-	
+
+	av_opt_set (_swr_context, "resampler", "soxr", 0);
+
 	swr_init (_swr_context);
 }
 
@@ -70,16 +72,16 @@ Resampler::run (shared_ptr<const AudioBuffers> in)
 	int const resampled_frames = swr_convert (
 		_swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) in->data(), in->frames()
 		);
-	
+
 	if (resampled_frames < 0) {
 		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;
-}	
+}
 
 shared_ptr<const AudioBuffers>
 Resampler::flush ()
@@ -91,11 +93,11 @@ Resampler::flush ()
 
 	while (true) {
 		int const frames = swr_convert (_swr_context, (uint8_t **) pass->data(), pass_size, 0, 0);
-		
+
 		if (frames < 0) {
 			throw EncodeError (_("could not run sample-rate converter"));
 		}
-		
+
 		if (frames == 0) {
 			break;
 		}