smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

triggerbox: disambiguate esteimated_tempo from the actual segment_tempo

Browse source
This commit is contained in:
Ben Loftis 2022-01-13 23:19:01 -06:00
parent c159614902
commit de324b54b9
2 changed files with 56 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libs/ardour/ardour/triggerbox.h
View file

@ -260,8 +260,9 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
StretchMode stretch_mode() const { return _stretch_mode; } StretchMode stretch_mode() const { return _stretch_mode; }
void set_stretch_mode (StretchMode); void set_stretch_mode (StretchMode);
double apparent_tempo() const { return _apparent_tempo; } double estimated_tempo() const { return _estimated_tempo; }
double set_tempo (double t); double segment_tempo() const { return _segment_tempo; }
void set_segment_tempo (double t);
Temporal::Meter meter() const { return _meter; } Temporal::Meter meter() const { return _meter; }
void set_tempo (Temporal::Meter const &); void set_tempo (Temporal::Meter const &);
@ -319,9 +320,12 @@ class LIBARDOUR_API Trigger : public PBD::Stateful {
/* computed from data */ /* computed from data */
double _estimated_tempo; //TODO: this should come from the MIDI file
double _segment_tempo; //TODO: this will likely get stored in the SegmentDescriptor for audio triggers
double _barcnt; /* our estimate of the number of bars in the region */ double _barcnt; /* our estimate of the number of bars in the region */
double _apparent_tempo;
Temporal::Meter _meter; Temporal::Meter _meter;
samplepos_t expected_end_sample; samplepos_t expected_end_sample;
Temporal::BBT_Offset _start_quantization; Temporal::BBT_Offset _start_quantization;
std::atomic<Trigger*> _pending; std::atomic<Trigger*> _pending;
@ -400,7 +404,7 @@ class LIBARDOUR_API AudioTrigger : public Trigger {
void drop_data (); void drop_data ();
int load_data (boost::shared_ptr<AudioRegion>); int load_data (boost::shared_ptr<AudioRegion>);
void determine_tempo (); void estimate_tempo ();
void setup_stretcher (); void setup_stretcher ();
void _startup (Temporal::BBT_Offset const &); void _startup (Temporal::BBT_Offset const &);
}; };
@ -724,6 +728,8 @@ namespace Properties {
LIBARDOUR_API extern PBD::PropertyDescriptor<uint32_t> currently_playing; LIBARDOUR_API extern PBD::PropertyDescriptor<uint32_t> currently_playing;
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> stretchable; LIBARDOUR_API extern PBD::PropertyDescriptor<bool> stretchable;
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> isolated; LIBARDOUR_API extern PBD::PropertyDescriptor<bool> isolated;
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> tempo_meter; /* only used to transmit changes, not storage */
} }

74
libs/ardour/triggerbox.cc
View file

@ -64,6 +64,7 @@ namespace ARDOUR {
PBD::PropertyDescriptor<bool> stretchable; PBD::PropertyDescriptor<bool> stretchable;
PBD::PropertyDescriptor<bool> isolated; PBD::PropertyDescriptor<bool> isolated;
PBD::PropertyDescriptor<Trigger::StretchMode> stretch_mode; PBD::PropertyDescriptor<Trigger::StretchMode> stretch_mode;
PBD::PropertyDescriptor<bool> tempo_meter; /* only to transmit updates, not storage */
} }
} }
@ -98,7 +99,8 @@ Trigger::Trigger (uint32_t n, TriggerBox& b)
, _stretch_mode (Properties::stretch_mode, Trigger::Crisp) , _stretch_mode (Properties::stretch_mode, Trigger::Crisp)
, cue_launched (false) , cue_launched (false)
, _barcnt (0.) , _barcnt (0.)
, _apparent_tempo (0.) , _estimated_tempo (0.)
, _segment_tempo (0.)
, _meter (4, 4) , _meter (4, 4)
, expected_end_sample (0) , expected_end_sample (0)
, _pending ((Trigger*) 0) , _pending ((Trigger*) 0)
@ -183,6 +185,16 @@ Trigger::set_stretchable (bool s)
_box.session().set_dirty(); _box.session().set_dirty();
} }
void
Trigger::set_segment_tempo (double t)
{
if (_segment_tempo != t) {
_segment_tempo = t; //TODO : this data will likely get stored in the SegmentDescriptor, not the trigger itself
PropertyChanged (ARDOUR::Properties::tempo_meter);
_box.session().set_dirty();
}
}
void void
Trigger::set_ui (void* p) Trigger::set_ui (void* p)
{ {
@ -310,7 +322,8 @@ Trigger::get_state (void)
} }
node->set_property (X_("index"), _index); node->set_property (X_("index"), _index);
node->set_property (X_("apparent-tempo"), _apparent_tempo); node->set_property (X_("estimated-tempo"), _estimated_tempo);
node->set_property (X_("segment-tempo"), _segment_tempo);
node->set_property (X_("barcnt"), _barcnt); node->set_property (X_("barcnt"), _barcnt);
if (_region) { if (_region) {
@ -334,12 +347,14 @@ Trigger::set_state (const XMLNode& node, int version)
boost::shared_ptr<Region> r = RegionFactory::region_by_id (rid); boost::shared_ptr<Region> r = RegionFactory::region_by_id (rid);
if (r) { if (r) {
set_region (r, false); set_region (r, false); //TODO: this results in a call to estimate_tempo() which should be avoided if bpm is already known
} }
set_values (node); node.get_property (X_("estimated-tempo"), _estimated_tempo); //TODO: for now: if we know the bpm, overwrite the value that estimate_tempo() found
node.get_property (X_("segment-tempo"), _segment_tempo);
node.get_property (X_("index"), _index); node.get_property (X_("index"), _index);
set_values (node);
return 0; return 0;
} }
@ -814,7 +829,7 @@ AudioTrigger::~AudioTrigger ()
bool bool
AudioTrigger::stretching() const AudioTrigger::stretching() const
{ {
return (_apparent_tempo != .0) && _stretchable; return (_segment_tempo != .0) && _stretchable;
} }
SegmentDescriptor SegmentDescriptor
@ -822,7 +837,7 @@ AudioTrigger::get_segment_descriptor () const
{ {
SegmentDescriptor sd; SegmentDescriptor sd;
sd.set_tempo (Temporal::Tempo (_apparent_tempo, 4)); sd.set_tempo (Temporal::Tempo (_segment_tempo, 4));
return sd; return sd;
} }
@ -1034,14 +1049,17 @@ AudioTrigger::set_region_in_worker_thread (boost::shared_ptr<Region> r)
} }
load_data (ar); load_data (ar);
determine_tempo ();
estimate_tempo (); //TODO: should first check if we already know this info from xml
_segment_tempo = _estimated_tempo;
setup_stretcher (); setup_stretcher ();
/* Given what we know about the tempo and duration, set the defaults /* Given what we know about the tempo and duration, set the defaults
* for the trigger properties. * for the trigger properties.
*/ */
if (_apparent_tempo == 0.) { if (_segment_tempo == 0.) {
_stretchable = false; _stretchable = false;
_quantization = Temporal::BBT_Offset (-1, 0, 0); _quantization = Temporal::BBT_Offset (-1, 0, 0);
_follow_action0 = None; _follow_action0 = None;
@ -1067,7 +1085,7 @@ AudioTrigger::set_region_in_worker_thread (boost::shared_ptr<Region> r)
} }
void void
AudioTrigger::determine_tempo () AudioTrigger::estimate_tempo ()
{ {
using namespace Temporal; using namespace Temporal;
TempoMap::SharedPtr tm (TempoMap::use()); TempoMap::SharedPtr tm (TempoMap::use());
@ -1080,7 +1098,7 @@ AudioTrigger::determine_tempo ()
if (have_segment) { if (have_segment) {
_apparent_tempo = segment.tempo().quarter_notes_per_minute (); _estimated_tempo = segment.tempo().quarter_notes_per_minute ();
_meter = segment.meter(); _meter = segment.meter();
} else { } else {
@ -1125,8 +1143,8 @@ AudioTrigger::determine_tempo ()
if (!p) { if (!p) {
text_tempo = -1.; text_tempo = -1.;
} else { } else {
_apparent_tempo = text_tempo; _estimated_tempo = text_tempo;
std::cerr << "from filename, tempo = " << _apparent_tempo << std::endl; std::cerr << "from filename, tempo = " << _estimated_tempo << std::endl;
} }
} }
} }
@ -1134,7 +1152,7 @@ AudioTrigger::determine_tempo ()
/* We don't have too many good choices here. Triggers can fire at any /* We don't have too many good choices here. Triggers can fire at any
* time, so there's no special place on the tempo map that we can use * time, so there's no special place on the tempo map that we can use
* to get the meter from and thus compute an apparent bar count for * to get the meter from and thus compute an estimated bar count for
* this region. Our solution for now: just use the first meter. * this region. Our solution for now: just use the first meter.
*/ */
@ -1144,10 +1162,10 @@ AudioTrigger::determine_tempo ()
mbpm.setBPMRange (metric.tempo().quarter_notes_per_minute () * 0.75, metric.tempo().quarter_notes_per_minute() * 1.5); mbpm.setBPMRange (metric.tempo().quarter_notes_per_minute () * 0.75, metric.tempo().quarter_notes_per_minute() * 1.5);
_apparent_tempo = mbpm.estimateTempoOfSamples (data[0], data.length); _estimated_tempo = mbpm.estimateTempoOfSamples (data[0], data.length);
if (_apparent_tempo == 0.0) { if (_estimated_tempo == 0.0) {
/* no apparent tempo, just return since we'll use it as-is */ /* no estimated tempo, just return since we'll use it as-is */
std::cerr << "Could not determine tempo for " << name() << std::endl; std::cerr << "Could not determine tempo for " << name() << std::endl;
return; return;
} }
@ -1156,18 +1174,18 @@ AudioTrigger::determine_tempo ()
segment.set_extent (_region->start_sample(), _region->length_samples()); segment.set_extent (_region->start_sample(), _region->length_samples());
} }
segment.set_tempo (Temporal::Tempo (_apparent_tempo, 4)); segment.set_tempo (Temporal::Tempo (_estimated_tempo, 4));
for (auto & src : _region->sources()) { for (auto & src : _region->sources()) {
src->set_segment_descriptor (segment); src->set_segment_descriptor (segment);
} }
cerr << name() << " Estimated bpm " << _apparent_tempo << " from " << (double) data.length / _box.session().sample_rate() << " seconds\n"; cerr << name() << " Estimated bpm " << _estimated_tempo << " from " << (double) data.length / _box.session().sample_rate() << " seconds\n";
} }
} }
const double seconds = (double) data.length / _box.session().sample_rate(); const double seconds = (double) data.length / _box.session().sample_rate();
const double quarters = (seconds / 60.) * _apparent_tempo; const double quarters = (seconds / 60.) * _estimated_tempo;
_barcnt = quarters / _meter.divisions_per_bar(); _barcnt = quarters / _meter.divisions_per_bar();
/* now check the determined tempo and force it to a value that gives us /* now check the determined tempo and force it to a value that gives us
@ -1176,19 +1194,19 @@ AudioTrigger::determine_tempo ()
resulting in small or larger gaps in output if they are repeating. resulting in small or larger gaps in output if they are repeating.
*/ */
if ((_apparent_tempo != 0.) && (rint (_barcnt) != _barcnt)) { if ((_estimated_tempo != 0.) && (rint (_barcnt) != _barcnt)) {
/* fractional barcnt */ /* fractional barcnt */
int intquarters = round (quarters); int intquarters = round (quarters);
double at = _apparent_tempo; double at = _estimated_tempo;
_apparent_tempo = intquarters / (seconds/60.); _estimated_tempo = intquarters / (seconds/60.);
DEBUG_TRACE (DEBUG::Triggers, string_compose ("adjusted barcnt of %1 and q = %2 to %3, old %4 new at = %5 seconds was %6\n", _barcnt, quarters, intquarters, at, _apparent_tempo, seconds)); DEBUG_TRACE (DEBUG::Triggers, string_compose ("adjusted barcnt of %1 and q = %2 to %3, old %4 new at = %5 seconds was %6\n", _barcnt, quarters, intquarters, at, _estimated_tempo, seconds));
} }
/* use initial tempo in map (assumed for now to be the only one */ /* use initial tempo in map (assumed for now to be the only one */
const samplecnt_t one_bar = tm->bbt_duration_at (timepos_t (AudioTime), BBT_Offset (1, 0, 0)).samples(); const samplecnt_t one_bar = tm->bbt_duration_at (timepos_t (AudioTime), BBT_Offset (1, 0, 0)).samples();
cerr << "tempo: " << _apparent_tempo << endl; cerr << "estimated tempo: " << _estimated_tempo << endl;
cerr << "one bar in samples: " << one_bar << endl; cerr << "one bar in samples: " << one_bar << endl;
cerr << "barcnt = " << round (_barcnt) << endl; cerr << "barcnt = " << round (_barcnt) << endl;
} }
@ -1196,11 +1214,11 @@ AudioTrigger::determine_tempo ()
bool bool
AudioTrigger::probably_oneshot () const AudioTrigger::probably_oneshot () const
{ {
assert (_apparent_tempo != 0.); assert (_segment_tempo != 0.);
if ((data.length < (_box.session().sample_rate()/2)) || if ((data.length < (_box.session().sample_rate()/2)) ||
/* XXX use Meter here, not 4.0 */ /* XXX use Meter here, not 4.0 */
((_barcnt < 1) && (data.length < (4.0 * ((_box.session().sample_rate() * 60) / _apparent_tempo))))) { ((_barcnt < 1) && (data.length < (4.0 * ((_box.session().sample_rate() * 60) / _segment_tempo))))) {
std::cerr << "looks like a one-shot\n"; std::cerr << "looks like a one-shot\n";
return true; return true;
} }
@ -1341,10 +1359,10 @@ AudioTrigger::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sa
if (do_stretch && _state != Playout) { if (do_stretch && _state != Playout) {
const double stretch = _apparent_tempo / bpm; const double stretch = _segment_tempo / bpm;
_stretcher->setTimeRatio (stretch); _stretcher->setTimeRatio (stretch);
DEBUG_TRACE (DEBUG::Triggers, string_compose ("clip tempo %1 bpm %2 ratio %3%4\n", _apparent_tempo, bpm, std::setprecision (6), stretch)); DEBUG_TRACE (DEBUG::Triggers, string_compose ("clip tempo %1 bpm %2 ratio %3%4\n", _segment_tempo, bpm, std::setprecision (6), stretch));
if ((avail = _stretcher->available()) < 0) { if ((avail = _stretcher->available()) < 0) {
error << _("Could not configure rubberband stretcher") << endmsg; error << _("Could not configure rubberband stretcher") << endmsg;