X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fresampler.cc;h=322c00c136779f009ad1163119bce5496a191dad;hb=0877bf6d06de8e6f768534ec40c26bf629618a20;hp=1a0c6073dcb6cc8278b74007d60b74f226069ba6;hpb=dc78a40b0c7ce4569874fd1e77a86df907937d50;p=dcpomatic.git

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index 1a0c6073d..322c00c13 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -53,13 +53,17 @@ Resampler::Resampler (int in, int out, int channels)
 
 Resampler::~Resampler ()
 {
-	src_delete (_src);
+	if (_src) {
+		src_delete (_src);
+	}
 }
 
 void
 Resampler::set_fast ()
 {
 	src_delete (_src);
+	_src = 0;
+
 	int error;
 	_src = src_new (SRC_LINEAR, _channels, &error);
 	if (!_src) {
@@ -67,19 +71,9 @@ Resampler::set_fast ()
 	}
 }
 
-pair<shared_ptr<const AudioBuffers>, Frame>
-Resampler::run (shared_ptr<const AudioBuffers> in, Frame frame)
+shared_ptr<const AudioBuffers>
+Resampler::run (shared_ptr<const AudioBuffers> in)
 {
-	if (!_next_in || !_next_out || _next_in.get() != frame) {
-		/* Either there was a discontinuity in the input or this is the first input;
-		   reset _next_out.
-		*/
-		_next_out = lrintf (frame * _out_rate / _in_rate);
-	}
-
-	/* Expected next input frame */
-	_next_in = frame + in->frames ();
-
 	int in_frames = in->frames ();
 	int in_offset = 0;
 	int out_offset = 0;
@@ -128,6 +122,8 @@ Resampler::run (shared_ptr<const AudioBuffers> in, Frame frame)
 		}
 
 		if (data.output_frames_gen == 0) {
+			delete[] data.data_in;
+			delete[] data.data_out;
 			break;
 		}
 
@@ -152,15 +148,10 @@ Resampler::run (shared_ptr<const AudioBuffers> in, Frame frame)
 		delete[] data.data_out;
 	}
 
-	Frame out_frame = _next_out.get ();
-
-	/* Expected next output frame */
-	_next_out = _next_out.get() + resampled->frames();
-
-	return make_pair (resampled, out_frame);
+	return resampled;
 }
 
-pair<shared_ptr<const AudioBuffers>, Frame>
+shared_ptr<const AudioBuffers>
 Resampler::flush ()
 {
 	shared_ptr<AudioBuffers> out (new AudioBuffers (_channels, 0));
@@ -198,5 +189,11 @@ Resampler::flush ()
 	out->set_frames (out_offset);
 
 	delete[] buffer;
-	return make_pair (out, _next_out.get ());
+	return out;
+}
+
+void
+Resampler::reset ()
+{
+	src_reset (_src);
 }