some tiny steps towards using new data structures for clip recording

libs/ardour/ardour/cliprec.h

@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2023 Paul Davis <paul@linuxaudiosystems.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <atomic>
+
+#ifndef __ardour_cliprec_h__
+#define __ardour_cliprec_h__
+
+
+#include "pbd/ringbufferNPT.h"
+#include "pbd/signals.h"
+
+#include "temporal/timeline.h"
+
+#include "ardour/disk_io.h"
+#include "ardour/rt_midibuffer.h"
+
+namespace PBD {
+class Thread;
+class Semaphore;
+}
+
+namespace ARDOUR {
+
+class AudioFileSource;
+class Session;
+class Track;
+
+template<typename T> class MidiRingBuffer;
+
+class LIBARDOUR_API ClipRecProcessor : public DiskIOProcessor
+{
+  public:
+	ClipRecProcessor (Session&, Track&, std::string const & name, Temporal::TimeDomainProvider const &);
+	void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required);
+	bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
+
+	float buffer_load () const;
+	void adjust_buffering ();
+	void configuration_changed ();
+
+	struct ArmInfo {
+		Temporal::timepos_t start;
+		Temporal::timepos_t end;
+	};
+
+	void set_armed (ArmInfo*);
+	bool armed() const { return (bool) _arm_info.load(); }
+	PBD::Signal0<void> ArmedChanged;
+
+  private:
+	std::atomic<ArmInfo*> _arm_info;
+	std::shared_ptr<RTMidiBuffer> rt_midibuffer;
+
+	/* private (to class) butler thread */
+
+	static PBD::Thread* _thread;
+	static PBD::Semaphore* _semaphore;
+	static bool thread_should_run;
+	static void thread_work ();
+	static ClipRecProcessor* currently_recording;
+
+	int pull_data ();
+	void start_recording ();
+	void finish_recording ();
+};
+
+} /* namespace */
+
+#endif /* __ardour_cliprec_h__ */

libs/ardour/ardour/debug.h

@@ -115,6 +115,7 @@ namespace PBD {
 		LIBARDOUR_API extern DebugBits VSTCallbacks;
 		LIBARDOUR_API extern DebugBits WiimoteControl;
 		LIBARDOUR_API extern DebugBits Freesound;
+		LIBARDOUR_API extern DebugBits ClipRecording;
 
 	}
 }

libs/ardour/ardour/disk_io.h

@@ -161,7 +161,6 @@ protected:
 
 		/* used only by capture */
 		std::shared_ptr<AudioFileSource> write_source;
-		PBD::RingBufferNPT<CaptureTransition>* capture_transition_buf;
 
 		/* used in the butler thread only */
 		samplecnt_t curr_capture_cnt;

libs/ardour/cliprec.cc

@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2023 Paul Davis <paul@linuxaudiosystems.com>
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "pbd/compose.h"
+#include "pbd/debug.h"
+#include "pbd/pthread_utils.h"
+#include "pbd/semutils.h"
+#include "pbd/types_convert.h"
+
+#include "ardour/audio_buffer.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/butler.h"
+#include "ardour/cliprec.h"
+#include "ardour/debug.h"
+#include "ardour/midi_track.h"
+#include "ardour/session.h"
+
+#include "pbd/i18n.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+
+PBD::Thread* ClipRecProcessor::_thread (0);
+bool ClipRecProcessor::thread_should_run (false);
+PBD::Semaphore* ClipRecProcessor::_semaphore (0);
+ClipRecProcessor* ClipRecProcessor::currently_recording (nullptr);
+
+ClipRecProcessor::ClipRecProcessor (Session& s, Track& t, std::string const & name, Temporal::TimeDomainProvider const & tdp)
+	: DiskIOProcessor (s, t,name, DiskIOProcessor::Recordable, tdp)
+{
+	if (!_thread) {
+		thread_should_run = true;
+		_semaphore = new PBD::Semaphore (X_("cliprec"), 0);
+		_thread = PBD::Thread::create (&ClipRecProcessor::thread_work);
+	}
+}
+
+void
+ClipRecProcessor::set_armed (ArmInfo* ai)
+{
+	if ((bool) _arm_info.load() == (bool) ai) {
+		if (_arm_info.load()) {
+			assert (currently_recording == this);
+		}
+		return;
+	}
+
+	if (!yn) {
+		finish_recording ();
+		assert (currently_recording == this);
+		delete _arm_info;
+		_arm_info = nullptr;
+		currently_recording = nullptr;
+		ArmedChanged (); // EMIT SIGNAL
+		return;
+	}
+
+	if (currently_recording) {
+		currently_recording->set_armed (nullptr);
+		currently_recording = 0;
+	}
+
+	_arm_info = ai;
+	currently_recording = this;
+	start_recording ();
+	ArmedChanged (); // EMIT SIGNAL
+}
+
+void
+ClipRecProcessor::start_recording ()
+{
+}
+
+void
+ClipRecProcessor::finish_recording ()
+{
+	/* XXXX do something */
+#if 0
+	std::shared_ptr<ChannelList const> c = channels.reader();
+	for (auto & chan : *c) {
+		Source::WriterLock lock((chan)->write_source->mutex());
+		(chan)->write_source->mark_streaming_write_completed (lock);
+		(chan)->write_source->done_with_peakfile_writes ();
+	}
+#endif
+}
+
+void
+ClipRecProcessor::thread_work ()
+{
+	while (thread_should_run) {
+		_semaphore->wait ();
+		ClipRecProcessor* crp = currently_recording;
+		if (crp) {
+			(void) crp->pull_data ();
+		}
+	}
+}
+
+int
+ClipRecProcessor::pull_data ()
+{
+	int ret = 0;
+
+#if 0
+	uint32_t to_write;
+
+	RingBufferNPT<Sample>::rw_vector vector;
+
+	vector.buf[0] = 0;
+	vector.buf[1] = 0;
+
+	std::shared_ptr<ChannelList const> c = channels.reader();
+	for (ChannelList::const_iterator chan = c->begin(); chan != c->end(); ++chan) {
+
+		(*chan)->wbuf->get_read_vector (&vector);
+
+		if (vector.len[0] + vector.len[1] == 0) {
+			goto out;
+		}
+
+		to_write = vector.len[0];
+
+		if ((!(*chan)->write_source) || (*chan)->write_source->write (vector.buf[0], to_write) != to_write) {
+			// error << string_compose(_("AudioDiskstream %1: cannot write to disk"), id()) << endmsg;
+			return -1;
+		}
+
+		(*chan)->wbuf->increment_read_ptr (to_write);
+		// (*chan)->curr_capture_cnt += to_write;
+
+		to_write = vector.len[1];
+
+		DEBUG_TRACE (DEBUG::ClipRecording, string_compose ("%1 additional write of %2\n", name(), to_write));
+
+		if ((*chan)->write_source->write (vector.buf[1], to_write) != to_write) {
+			// error << string_compose(_("AudioDiskstream %1: cannot write to disk"), id()) << endmsg;
+			return -1;
+		}
+
+		(*chan)->wbuf->increment_read_ptr (to_write);
+		//(*chan)->curr_capture_cnt += to_write;
+	}
+
+	/* MIDI*/
+
+	if (_midi_write_source && _midi_buf) {
+
+		const samplecnt_t total = g_atomic_int_get (&_samples_pending_write);
+
+		if (total == 0 || _midi_buf->read_space() == 0)
+		    (!force_flush && (total < _chunk_samples) && _was_recording)) {
+			goto out;
+		}
+
+	}
+#endif
+
+  out:
+	return ret;
+}
+
+bool
+ClipRecProcessor::can_support_io_configuration (const ChanCount& in, ChanCount& out)
+{
+	if (in.n_midi() != 0 && in.n_midi() != 1) {
+		/* we only support zero or 1 MIDI stream */
+		return false;
+	}
+
+	/* currently no way to deliver different channels that we receive */
+	out = in;
+
+	return true;
+}
+
+void
+ClipRecProcessor::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required)
+{
+	if (!check_active()) {
+		return;
+	}
+
+	const size_t n_buffers = bufs.count().n_audio();
+	std::shared_ptr<ChannelList const> c = channels.reader();
+	ChannelList::const_iterator chan;
+	size_t n;
+
+	if (!_arm_info.load()) {
+		return;
+	}
+
+	/* Audio */
+#if 0
+	if (n_buffers) {
+
+		/* AUDIO */
+
+		for (chan = c->begin(), n = 0; chan != c->end(); ++chan, ++n) {
+
+			ChannelInfo* chaninfo (*chan);
+			AudioBuffer& buf (bufs.get_audio (n%n_buffers));
+
+			chaninfo->wbuf->get_write_vector (&chaninfo->rw_vector);
+
+			if (nframes <= (samplecnt_t) chaninfo->rw_vector.len[0]) {
+
+				Sample *incoming = buf.data ();
+				memcpy (chaninfo->rw_vector.buf[0], incoming, sizeof (Sample) * nframes);
+
+			} else {
+
+				samplecnt_t total = chaninfo->rw_vector.len[0] + chaninfo->rw_vector.len[1];
+
+				if (nframes > total) {
+					DEBUG_TRACE (DEBUG::ClipRecording, string_compose ("%1 overrun in %2, rec_nframes = %3 total space = %4\n",
+					                                            DEBUG_THREAD_SELF, name(), nframes, total));
+					return;
+				}
+
+				Sample *incoming = buf.data ();
+				samplecnt_t first = chaninfo->rw_vector.len[0];
+
+				memcpy (chaninfo->rw_vector.buf[0], incoming, sizeof (Sample) * first);
+				memcpy (chaninfo->rw_vector.buf[1], incoming + first, sizeof (Sample) * (nframes - first));
+			}
+
+			chaninfo->wbuf->increment_write_ptr (nframes);
+
+			if (chaninfo->wbuf->read_space() > 10) {
+				_semaphore->signal ();
+			}
+		}
+	}
+#endif
+
+#if 0
+	/* MIDI */
+
+
+	// Pump entire port buffer into the ring buffer (TODO: split cycles?)
+	MidiBuffer& buf    = bufs.get_midi (0);
+	MidiTrack* mt = dynamic_cast<MidiTrack*>(&_track);
+	MidiChannelFilter* filter = mt ? &mt->capture_filter() : 0;
+
+	assert (buf.size() == 0 || _midi_buf);
+
+	for (MidiBuffer::iterator i = buf.begin(); i != buf.end(); ++i) {
+		Evoral::Event<MidiBuffer::TimeType> ev (*i, false);
+		if (ev.time() > nframes) {
+			break;
+		}
+
+		bool skip_event = false;
+
+		if (mt) {
+			/* skip injected immediate/out-of-band events */
+			MidiBuffer const& ieb (mt->immediate_event_buffer());
+			for (MidiBuffer::const_iterator j = ieb.begin(); j != ieb.end(); ++j) {
+				if (*j == ev) {
+					skip_event = true;
+				}
+			}
+		}
+
+		if (!skip_event && (!filter || !filter->filter(ev.buffer(), ev.size()))) {
+			const samplepos_t event_time = start_sample + ev.time();
+			rt_midibuffer->write (event_time,  ev.event_type(), ev.size(), ev.buffer());
+	}
+#endif
+}
+
+float
+ClipRecProcessor::buffer_load () const
+{
+	std::shared_ptr<ChannelList const> c = channels.reader();
+
+	if (c->empty ()) {
+		return 1.0;
+	}
+
+	return (float) ((double) c->front()->wbuf->write_space()/
+			(double) c->front()->wbuf->bufsize());
+}
+
+void
+ClipRecProcessor::adjust_buffering ()
+{
+	std::shared_ptr<ChannelList const> c = channels.reader();
+
+	for (ChannelList::const_iterator chan = c->begin(); chan != c->end(); ++chan) {
+		(*chan)->resize (_session.butler()->audio_capture_buffer_size());
+	}
+}
+
+void
+ClipRecProcessor::configuration_changed ()
+{
+	/* nothing to do */
+}

libs/ardour/debug.cc

@@ -111,3 +111,4 @@ PBD::DebugBits PBD::DEBUG::VST3Process = PBD::new_debug_bit ("VST3Process");
 PBD::DebugBits PBD::DEBUG::VSTCallbacks = PBD::new_debug_bit ("vstcallbacks");
 PBD::DebugBits PBD::DEBUG::WiimoteControl = PBD::new_debug_bit ("wiimotecontrol");
 PBD::DebugBits PBD::DEBUG::Freesound = PBD::new_debug_bit ("freesound");
+PBD::DebugBits PBD::DEBUG::ClipRecording = PBD::new_debug_bit ("cliprecording");

libs/ardour/disk_io.cc

@@ -325,7 +325,6 @@ DiskIOProcessor::use_playlist (DataType dt, std::shared_ptr<Playlist> playlist)
 DiskIOProcessor::ChannelInfo::ChannelInfo (samplecnt_t bufsize)
 	: rbuf (0)
 	, wbuf (0)
-	, capture_transition_buf (0)
 	, curr_capture_cnt (0)
 {
 }
@@ -334,10 +333,8 @@ DiskIOProcessor::ChannelInfo::~ChannelInfo ()
 {
 	delete rbuf;
 	delete wbuf;
-	delete capture_transition_buf;
 	rbuf = 0;
 	wbuf = 0;
-	capture_transition_buf = 0;
 }
 
 /** Get the start, end, and length of a location "atomically".

libs/ardour/disk_writer.cc

@@ -97,9 +97,6 @@ DiskWriter::display_name () const
 void
 DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
 {
-	if (!capture_transition_buf) {
-		capture_transition_buf = new RingBufferNPT<CaptureTransition> (256);
-	}
 	delete wbuf;
 	wbuf = new RingBufferNPT<Sample> (bufsize);
 	/* touch memory to lock it */

libs/ardour/wscript

@@ -49,6 +49,7 @@ libardour_sources = [
         'chan_mapping.cc',
         'circular_buffer.cc',
         'clip_library.cc',
+        'cliprec.cc',
         'config_text.cc',
         'control_group.cc',
         'control_protocol_manager.cc',