X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fresampled_source.cc;h=f3518537f66fc923e0bf011367a24d6305bbac91;hb=30b087ab3d28f1585987fa3f6ae006562ae192e3;hp=0a8131910827fefd5817ae76ece8619d572cdead;hpb=59076a7e4c66db12bbbfbf01f012ca2f6ba4bf56;p=ardour.git

diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc
index 0a81319108..f3518537f6 100644
--- a/libs/ardour/resampled_source.cc
+++ b/libs/ardour/resampled_source.cc
@@ -21,7 +21,7 @@
 #include "ardour/resampled_source.h"
 #include "pbd/failed_constructor.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -32,9 +32,9 @@ const uint32_t ResampledImportableSource::blocksize = 524288U;
 const uint32_t ResampledImportableSource::blocksize = 16384U;
 #endif
 
-ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> src, framecnt_t rate, SrcQuality srcq)
+ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> src, samplecnt_t rate, SrcQuality srcq)
 	: source (src)
-	, src_state (0)
+	, _src_state (0)
 {
 	_src_type = SRC_SINC_BEST_QUALITY;
 
@@ -56,89 +56,94 @@ ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<Importab
 		break;
 	}
 
-	input = new float[blocksize];
+	_input = new float[blocksize];
 
 	seek (0);
 
-	src_data.src_ratio = ((float) rate) / source->samplerate();
+	_src_data.src_ratio = ((float) rate) / source->samplerate();
 }
 
 ResampledImportableSource::~ResampledImportableSource ()
 {
-	src_state = src_delete (src_state) ;
-	delete [] input;
+	_src_state = src_delete (_src_state) ;
+	delete [] _input;
 }
 
-framecnt_t
-ResampledImportableSource::read (Sample* output, framecnt_t nframes)
+samplecnt_t
+ResampledImportableSource::read (Sample* output, samplecnt_t nframes)
 {
 	int err;
+	size_t bs = floor ((float)(blocksize / source->channels())) *  source->channels();
 
 	/* If the input buffer is empty, refill it. */
+	if (_src_data.input_frames == 0) {
 
-	if (src_data.input_frames == 0) {
-
-		src_data.input_frames = source->read (input, blocksize);
+		_src_data.input_frames = source->read (_input, bs);
 
 		/* The last read will not be a full buffer, so set end_of_input. */
-
-		if ((framecnt_t) src_data.input_frames < blocksize) {
-			src_data.end_of_input = true;
+		if ((size_t) _src_data.input_frames < bs) {
+			_end_of_input = true;
 		}
 
-		src_data.input_frames /= source->channels();
-		src_data.data_in = input;
+		_src_data.input_frames /= source->channels();
+		_src_data.data_in = _input;
 	}
 
-	src_data.data_out = output;
-
-	if (!src_data.end_of_input) {
-		src_data.output_frames = nframes / source->channels();
-	} else {
-		src_data.output_frames = std::min ((framecnt_t) src_data.input_frames, nframes / source->channels());
+	_src_data.data_out = output;
+	_src_data.output_frames = nframes / source->channels();
+
+	if (_end_of_input && _src_data.input_frames * _src_data.src_ratio <= _src_data.output_frames) {
+		/* only set src_data.end_of_input for the last cycle.
+		 *
+		 * The flag only affects writing out remaining data in the
+		 * internal buffer of src_state.
+		 * SRC is not aware of data bufered here in _src_data.input
+		 * which needs to be processed first.
+		 */
+		_src_data.end_of_input = true;
 	}
 
-	if ((err = src_process (src_state, &src_data))) {
+	if ((err = src_process (_src_state, &_src_data))) {
 		error << string_compose(_("Import: %1"), src_strerror (err)) << endmsg ;
 		return 0 ;
 	}
 
 	/* Terminate if at end */
-
-	if (src_data.end_of_input && src_data.output_frames_gen == 0) {
+	if (_src_data.end_of_input && _src_data.output_frames_gen == 0) {
 		return 0;
 	}
 
-	src_data.data_in += src_data.input_frames_used * source->channels();
-	src_data.input_frames -= src_data.input_frames_used ;
+	_src_data.data_in += _src_data.input_frames_used * source->channels();
+	_src_data.input_frames -= _src_data.input_frames_used ;
 
-	return src_data.output_frames_gen * source->channels();
+	return _src_data.output_frames_gen * source->channels();
 }
 
 void
-ResampledImportableSource::seek (framepos_t pos)
+ResampledImportableSource::seek (samplepos_t pos)
 {
 	source->seek (pos);
 
 	/* and reset things so that we start from scratch with the conversion */
 
-	if (src_state) {
-		src_delete (src_state);
+	if (_src_state) {
+		src_delete (_src_state);
 	}
 
 	int err;
 
-	if ((src_state = src_new (_src_type, source->channels(), &err)) == 0) {
+	if ((_src_state = src_new (_src_type, source->channels(), &err)) == 0) {
 		error << string_compose(_("Import: src_new() failed : %1"), src_strerror (err)) << endmsg ;
 		throw failed_constructor ();
 	}
 
-	src_data.input_frames = 0;
-	src_data.data_in = input;
-	src_data.end_of_input = 0;
+	_src_data.input_frames = 0;
+	_src_data.data_in = _input;
+	_src_data.end_of_input = 0;
+	_end_of_input = false;
 }
 
-framepos_t
+samplepos_t
 ResampledImportableSource::natural_position () const
 {
         return source->natural_position() * ratio ();