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

NO-OP: whitespace

Browse source
This commit is contained in:
Robin Gareus 2020-03-28 01:13:14 +01:00
parent 08065e87b5
commit 97a221f1bb
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 146 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

146
libs/ardour/rb_effect.cc
View file

@ -58,7 +58,6 @@ RBEffect::RBEffect (Session& s, TimeFXRequest& req)
, tsr (req)
{
}
RBEffect::~RBEffect ()
@ -95,58 +94,58 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
#endif
/*
We have two cases to consider:
1. The region has not been stretched before.
In this case, we just want to read region->length() samples
from region->start().
We will create a new region of region->length() *
tsr.time_fraction samples. The new region will have its
start set to 0 (because it has a new audio file that begins
at the start of the stretched area) and its ancestral_start
set to region->start() (so that we know where to begin
reading if we want to stretch it again).
2. The region has been stretched before.
The region starts at region->start() samples into its
(possibly previously stretched) source file. But we don't
want to read from its source file; we want to read from the
file it was originally stretched from.
The region's source begins at region->ancestral_start()
samples into its master source file. Thus, we need to start
reading at region->ancestral_start() + (region->start() /
region->stretch()) samples into the master source. This
value will also become the ancestral_start for the new
region.
We cannot use region->ancestral_length() to establish how
many samples to read, because it won't be up to date if the
region has been trimmed since it was last stretched. We
must read region->length() / region->stretch() samples and
stretch them by tsr.time_fraction * region->stretch(), for
a new region of region->length() * tsr.time_fraction
samples.
Case 1 is of course a special case of 2, where
region->ancestral_start() == 0 and region->stretch() == 1.
When we ask to read from a region, we supply a position on
the global timeline. The read function calculates the
offset into the source as (position - region->position()) +
region->start(). This calculation is used regardless of
whether we are reading from a master or
previously-stretched region. In order to read from a point
n samples into the master source, we need to provide n -
region->start() + region->position() as our position
argument to master_read_at().
Note that region->ancestral_length() is not used.
I hope this is clear.
* We have two cases to consider:
*
* 1. The region has not been stretched before.
*
* In this case, we just want to read region->length() samples
* from region->start().
*
* We will create a new region of region->length() *
* tsr.time_fraction samples. The new region will have its
* start set to 0 (because it has a new audio file that begins
* at the start of the stretched area) and its ancestral_start
* set to region->start() (so that we know where to begin
* reading if we want to stretch it again).
*
* 2. The region has been stretched before.
*
* The region starts at region->start() samples into its
* (possibly previously stretched) source file. But we don't
* want to read from its source file; we want to read from the
* file it was originally stretched from.
*
* The region's source begins at region->ancestral_start()
* samples into its master source file. Thus, we need to start
* reading at region->ancestral_start() + (region->start() /
* region->stretch()) samples into the master source. This
* value will also become the ancestral_start for the new
* region.
*
* We cannot use region->ancestral_length() to establish how
* many samples to read, because it won't be up to date if the
* region has been trimmed since it was last stretched. We
* must read region->length() / region->stretch() samples and
* stretch them by tsr.time_fraction * region->stretch(), for
* a new region of region->length() * tsr.time_fraction
* samples.
*
* Case 1 is of course a special case of 2, where
* region->ancestral_start() == 0 and region->stretch() == 1.
*
* When we ask to read from a region, we supply a position on
* the global timeline. The read function calculates the
* offset into the source as (position - region->position()) +
* region->start(). This calculation is used regardless of
* whether we are reading from a master or
* previously-stretched region. In order to read from a point
* n samples into the master source, we need to provide n -
* region->start() + region->position() as our position
* argument to master_read_at().
*
* Note that region->ancestral_length() is not used.
*
* I hope this is clear.
*/
double stretch = region->stretch () * tsr.time_fraction;
@ -180,7 +179,7 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
stretcher.setExpectedInputDuration (read_duration);
/* the name doesn't need to be super-precise, but allow for 2 fractional
digits just to disambiguate close but not identical FX
* digits just to disambiguate close but not identical FX
*/
if (stretch == 1.0) {
@ -209,25 +208,22 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
}
/* we read from the master (original) sources for the region,
not the ones currently in use, in case it's already been
subject to timefx. */
* not the ones currently in use, in case it's already been
* subject to timefx. */
/* study first, process afterwards. */
try {
while (pos < read_duration && !tsr.cancel) {
samplecnt_t this_read = 0;
for (uint32_t i = 0; i < channels; ++i) {
samplepos_t this_time = min (bufsize, read_duration - pos);
samplepos_t this_position;
this_position = read_start + pos -
region->start () + region->position ();
this_read = region->master_read_at
(buffers[i],
this_read = region->master_read_at (buffers[i],
buffers[i],
gain_buffer,
this_position,
@ -235,9 +231,9 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
i);
if (this_read != this_time) {
error << string_compose
(_("tempoize: error reading data from %1 at %2 (wanted %3, got %4)"),
region->name(), this_position, this_time, this_read) << endmsg;
error << string_compose (_("tempoize: error reading data from %1 at %2 (wanted %3, got %4)"),
region->name (), this_position, this_time, this_read)
<< endmsg;
goto out;
}
}
@ -253,11 +249,9 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
pos = 0;
while (pos < read_duration && !tsr.cancel) {
samplecnt_t this_read = 0;
for (uint32_t i = 0; i < channels; ++i) {
samplepos_t this_time;
this_time = min (bufsize, read_duration - pos);
this_time = min (this_time, (samplepos_t)stretcher.getSamplesRequired ());
@ -266,8 +260,7 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
this_position = read_start + pos -
region->start () + region->position ();
this_read = region->master_read_at
(buffers[i],
this_read = region->master_read_at (buffers[i],
buffers[i],
gain_buffer,
this_position,
@ -275,9 +268,9 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
i);
if (this_read != this_time) {
error << string_compose
(_("tempoize: error reading data from %1 at %2 (wanted %3, got %4)"),
region->name(), pos + region->position(), this_time, this_read) << endmsg;
error << string_compose (_("tempoize: error reading data from %1 at %2 (wanted %3, got %4)"),
region->name (), pos + region->position (), this_time, this_read)
<< endmsg;
goto out;
}
}
@ -290,13 +283,11 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
samplecnt_t avail = 0;
while ((avail = stretcher.available ()) > 0) {
this_read = min (bufsize, avail);
this_read = stretcher.retrieve (buffers, this_read);
for (uint32_t i = 0; i < nsrcs.size (); ++i) {
boost::shared_ptr<AudioSource> asrc = boost::dynamic_pointer_cast<AudioSource> (nsrcs[i]);
if (!asrc) {
continue;
@ -325,7 +316,6 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
this_read = stretcher.retrieve (buffers, this_read);
for (uint32_t i = 0; i < nsrcs.size (); ++i) {
boost::shared_ptr<AudioSource> asrc = boost::dynamic_pointer_cast<AudioSource> (nsrcs[i]);
if (!asrc) {
continue;
@ -348,7 +338,7 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
new_name = region->name ();
at = new_name.find ('@');
// remove any existing stretch indicator
/* remove any existing stretch indicator */
if (at != string::npos && at > 2) {
new_name = new_name.substr (0, at - 1);
@ -363,14 +353,13 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
/* now reset ancestral data for each new region */
for (vector<boost::shared_ptr<Region> >::iterator x = results.begin (); x != results.end (); ++x) {
(*x)->set_ancestral_data (read_start,
read_duration,
stretch,
shift);
(*x)->set_master_sources (region->master_sources ());
/* multiply the old (possibly previously stretched) region length by the extra
stretch this time around to get its new length. this is a non-music based edit atm.
* stretch this time around to get its new length. this is a non-music based edit atm.
*/
(*x)->set_length ((*x)->length () * tsr.time_fraction, 0);
}
@ -403,8 +392,3 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
return ret;
}