X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioregion.cc;h=248da959367a24ddbecf7bdde47429e0a29203c6;hb=1db2be2fef7a70f5200bcd96a701f612bbd7ec52;hp=a68b7b1f650fe58389b741686ecd563792ffdcdf;hpb=d4d5b30aebb8a54358bfb203c84cfd641bff79f3;p=ardour.git diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index a68b7b1f65..248da95936 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -37,9 +37,7 @@ #include "evoral/Curve.hpp" #include "ardour/audioregion.h" -#include "ardour/debug.h" #include "ardour/session.h" -#include "ardour/gain.h" #include "ardour/dB.h" #include "ardour/playlist.h" #include "ardour/audiofilesource.h" @@ -63,6 +61,83 @@ namespace ARDOUR { PBD::PropertyDescriptor fade_in_active; PBD::PropertyDescriptor fade_out_active; PBD::PropertyDescriptor scale_amplitude; + PBD::PropertyDescriptor fade_out_is_xfade; + PBD::PropertyDescriptor fade_out_is_short; + PBD::PropertyDescriptor fade_in_is_xfade; + PBD::PropertyDescriptor fade_in_is_short; + } +} + +static const double VERY_SMALL_SIGNAL = 0.0000001; //-140dB + +/* Curve manipulations */ + +static void +reverse_curve (boost::shared_ptr dst, boost::shared_ptr src) +{ + size_t len = src->back()->when; + + for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); it++) { + dst->add (len - (*it)->when, (*it)->value); + } +} + +static void +generate_inverse_power_curve (boost::shared_ptr dst, boost::shared_ptr src) +{ + // calc inverse curve using sum of squares + for (Evoral::ControlList::const_iterator it = src->begin(); it!=src->end(); ++it ) { + float value = (*it)->value; + value = 1 - powf(value,2); + value = sqrtf(value); + dst->fast_simple_add ( (*it)->when, value ); + } +} + +static void +generate_db_fade (boost::shared_ptr dst, double len, int num_steps, float dB_drop) +{ + dst->clear (); + dst->fast_simple_add (0, 1); + + //generate a fade-out curve by successively applying a gain drop + float fade_speed = dB_to_coefficient(dB_drop / (float) num_steps); + for (int i = 1; i < (num_steps-1); i++) { + float coeff = 1.0; + for (int j = 0; j < i; j++) { + coeff *= fade_speed; + } + dst->fast_simple_add (len*(double)i/(double)num_steps, coeff); + } + + dst->fast_simple_add (len, VERY_SMALL_SIGNAL); +} + +static void +merge_curves (boost::shared_ptr dst, + boost::shared_ptr curve1, + boost::shared_ptr curve2) +{ + Evoral::ControlList::EventList::size_type size = curve1->size(); + + //curve lengths must match for now + if (size != curve2->size()) { + return; + } + + Evoral::ControlList::const_iterator c1 = curve1->begin(); + int count = 0; + for (Evoral::ControlList::const_iterator c2 = curve2->begin(); c2!=curve2->end(); c2++ ) { + float v1 = accurate_coefficient_to_dB((*c1)->value); + float v2 = accurate_coefficient_to_dB((*c2)->value); + + double interp = v1 * ( 1.0-( (double)count / (double)size) ); + interp += v2 * ( (double)count / (double)size ); + + interp = dB_to_coefficient(interp); + dst->add ( (*c1)->when, interp ); + c1++; + count++; } } @@ -81,6 +156,14 @@ AudioRegion::make_property_quarks () DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-out-active = %1\n", Properties::fade_out_active.property_id)); Properties::scale_amplitude.property_id = g_quark_from_static_string (X_("scale-amplitude")); DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for scale-amplitude = %1\n", Properties::scale_amplitude.property_id)); + Properties::fade_out_is_xfade.property_id = g_quark_from_static_string (X_("fade-out-is-xfade")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-out-is-xfade = %1\n", Properties::fade_out_is_xfade.property_id)); + Properties::fade_out_is_short.property_id = g_quark_from_static_string (X_("fade-out-is-short")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-out-is-short = %1\n", Properties::fade_out_is_short.property_id)); + Properties::fade_in_is_xfade.property_id = g_quark_from_static_string (X_("fade-in-is-xfade")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-in-is-xfade = %1\n", Properties::fade_in_is_xfade.property_id)); + Properties::fade_in_is_short.property_id = g_quark_from_static_string (X_("fade-in-is-short")); + DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for fade-in-is-short = %1\n", Properties::fade_in_is_short.property_id)); } void @@ -94,6 +177,10 @@ AudioRegion::register_properties () add_property (_fade_in_active); add_property (_fade_out_active); add_property (_scale_amplitude); + add_property (_fade_out_is_xfade); + add_property (_fade_out_is_short); + add_property (_fade_in_is_xfade); + add_property (_fade_in_is_short); } #define AUDIOREGION_STATE_DEFAULT \ @@ -102,15 +189,23 @@ AudioRegion::register_properties () , _default_fade_out (Properties::default_fade_out, true) \ , _fade_in_active (Properties::fade_in_active, true) \ , _fade_out_active (Properties::fade_out_active, true) \ - , _scale_amplitude (Properties::scale_amplitude, 1.0) - + , _scale_amplitude (Properties::scale_amplitude, 1.0) \ + , _fade_in_is_xfade (Properties::fade_in_is_xfade, false) \ + , _fade_out_is_xfade (Properties::fade_out_is_xfade, false) \ + , _fade_in_is_short (Properties::fade_in_is_short, false) \ + , _fade_out_is_short (Properties::fade_out_is_short, false) + #define AUDIOREGION_COPY_STATE(other) \ _envelope_active (Properties::envelope_active, other->_envelope_active) \ , _default_fade_in (Properties::default_fade_in, other->_default_fade_in) \ , _default_fade_out (Properties::default_fade_out, other->_default_fade_out) \ , _fade_in_active (Properties::fade_in_active, other->_fade_in_active) \ , _fade_out_active (Properties::fade_out_active, other->_fade_out_active) \ - , _scale_amplitude (Properties::scale_amplitude, other->_scale_amplitude) + , _scale_amplitude (Properties::scale_amplitude, other->_scale_amplitude) \ + , _fade_in_is_xfade (Properties::fade_in_is_xfade, other->_fade_in_is_xfade) \ + , _fade_out_is_xfade (Properties::fade_out_is_xfade, other->_fade_out_is_xfade) \ + , _fade_in_is_short (Properties::fade_in_is_short, other->_fade_in_is_short) \ + , _fade_out_is_short (Properties::fade_out_is_short, other->_fade_out_is_short) /* a Session will reset these to its chosen defaults by calling AudioRegion::set_default_fade() */ void @@ -134,7 +229,9 @@ AudioRegion::AudioRegion (Session& s, framepos_t start, framecnt_t len, std::str , AUDIOREGION_STATE_DEFAULT , _automatable (s) , _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) + , _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) , _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) + , _inverse_fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) , _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation))) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -149,7 +246,9 @@ AudioRegion::AudioRegion (const SourceList& srcs) , AUDIOREGION_STATE_DEFAULT , _automatable(srcs[0]->session()) , _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) + , _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) , _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) + , _inverse_fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) , _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation))) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -163,7 +262,9 @@ AudioRegion::AudioRegion (boost::shared_ptr other) , AUDIOREGION_COPY_STATE (other) , _automatable (other->session()) , _fade_in (new AutomationList (*other->_fade_in)) + , _inverse_fade_in (new AutomationList(*other->_inverse_fade_in)) , _fade_out (new AutomationList (*other->_fade_out)) + , _inverse_fade_out (new AutomationList (*other->_inverse_fade_out)) /* As far as I can see, the _envelope's times are relative to region position, and have nothing to do with sources (and hence _start). So when we copy the envelope, we just use the supplied offset. */ @@ -187,7 +288,9 @@ AudioRegion::AudioRegion (boost::shared_ptr other, framecnt_t , AUDIOREGION_COPY_STATE (other) , _automatable (other->session()) , _fade_in (new AutomationList (*other->_fade_in)) + , _inverse_fade_in (new AutomationList(*other->_inverse_fade_in)) , _fade_out (new AutomationList (*other->_fade_out)) + , _inverse_fade_out (new AutomationList (*other->_inverse_fade_out)) /* As far as I can see, the _envelope's times are relative to region position, and have nothing to do with sources (and hence _start). So when we copy the envelope, we just use the supplied offset. */ @@ -211,7 +314,9 @@ AudioRegion::AudioRegion (boost::shared_ptr other, const Sour , AUDIOREGION_COPY_STATE (other) , _automatable (other->session()) , _fade_in (new AutomationList (*other->_fade_in)) + , _inverse_fade_in (new AutomationList(*other->_inverse_fade_in)) , _fade_out (new AutomationList (*other->_fade_out)) + , _inverse_fade_out (new AutomationList (*other->_inverse_fade_out)) , _envelope (new AutomationList (*other->_envelope)) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -232,7 +337,9 @@ AudioRegion::AudioRegion (SourceList& srcs) , AUDIOREGION_STATE_DEFAULT , _automatable(srcs[0]->session()) , _fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) + , _inverse_fade_in (new AutomationList(Evoral::Parameter(FadeInAutomation))) , _fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) + , _inverse_fade_out (new AutomationList(Evoral::Parameter(FadeOutAutomation))) , _envelope (new AutomationList(Evoral::Parameter(EnvelopeAutomation))) , _fade_in_suspended (0) , _fade_out_suspended (0) @@ -259,7 +366,7 @@ AudioRegion::post_set (const PropertyChange& /*ignored*/) if (_left_of_split) { if (_fade_in->back()->when >= _length) { set_default_fade_in (); - } + } set_default_fade_out (); _left_of_split = false; } @@ -267,7 +374,7 @@ AudioRegion::post_set (const PropertyChange& /*ignored*/) if (_right_of_split) { if (_fade_out->back()->when >= _length) { set_default_fade_out (); - } + } set_default_fade_in (); _right_of_split = false; @@ -342,195 +449,156 @@ AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, fr } } +/** @param buf Buffer to write data to (existing data will be overwritten). + * @param pos Position to read from as an offset from the region position. + * @param cnt Number of frames to read. + * @param channel Channel to read from. + */ framecnt_t -AudioRegion::read (Sample* buf, framepos_t timeline_position, framecnt_t cnt, int channel) const +AudioRegion::read (Sample* buf, framepos_t pos, framecnt_t cnt, int channel) const { /* raw read, no fades, no gain, nada */ - return _read_at (_sources, _length, buf, 0, 0, _position + timeline_position, cnt, channel, 0, 0, ReadOps (0)); -} - -framecnt_t -AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, - framepos_t file_position, framecnt_t cnt, uint32_t chan_n, - framecnt_t read_frames, framecnt_t skip_frames) const -{ - /* regular diskstream/butler read complete with fades etc */ - return _read_at (_sources, _length, buf, mixdown_buffer, gain_buffer, - file_position, cnt, chan_n, read_frames, skip_frames, ReadOps (~0)); + return read_from_sources (_sources, _length, buf, _position + pos, cnt, channel); } framecnt_t -AudioRegion::master_read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, +AudioRegion::master_read_at (Sample *buf, Sample* /*mixdown_buffer*/, float* /*gain_buffer*/, framepos_t position, framecnt_t cnt, uint32_t chan_n) const { /* do not read gain/scaling/fades and do not count this disk i/o in statistics */ - return _read_at (_master_sources, _master_sources.front()->length(_master_sources.front()->timeline_position()), - buf, mixdown_buffer, gain_buffer, position, cnt, chan_n, 0, 0, ReadOps (0)); + assert (cnt >= 0); + return read_from_sources ( + _master_sources, _master_sources.front()->length (_master_sources.front()->timeline_position()), + buf, position, cnt, chan_n + ); } +/** @param buf Buffer to mix data into. + * @param mixdown_buffer Scratch buffer for audio data. + * @param gain_buffer Scratch buffer for gain data. + * @param position Position within the session to read from. + * @param cnt Number of frames to read. + * @param chan_n Channel number to read. + */ framecnt_t -AudioRegion::_read_at (const SourceList& /*srcs*/, framecnt_t limit, - Sample *buf, Sample *mixdown_buffer, float *gain_buffer, - framepos_t position, - framecnt_t cnt, - uint32_t chan_n, - framecnt_t /*read_frames*/, - framecnt_t /*skip_frames*/, - ReadOps rops) const -{ - frameoffset_t internal_offset; - frameoffset_t buf_offset; - framecnt_t to_read; - bool raw = (rops == ReadOpsNone); +AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, + framepos_t position, + framecnt_t cnt, + uint32_t chan_n) const +{ + /* We are reading data from this region into buf (possibly via mixdown_buffer). + The caller has verified that we cover the desired section. + */ + + /* See doc/region_read.svg for a drawing which might help to explain + what is going on. + */ + assert (cnt >= 0); + if (n_channels() == 0) { return 0; } - if (muted() && !raw) { + if (muted()) { return 0; /* read nothing */ } - /* precondition: caller has verified that we cover the desired section */ + + /* WORK OUT WHERE TO GET DATA FROM */ - if (position < _position) { - internal_offset = 0; - buf_offset = _position - position; - cnt -= buf_offset; - } else { - internal_offset = position - _position; - buf_offset = 0; - } + framecnt_t to_read; - if (internal_offset >= limit) { - return 0; /* read nothing */ - } + assert (position >= _position); + frameoffset_t const internal_offset = position - _position; - if ((to_read = min (cnt, limit - internal_offset)) == 0) { + if (internal_offset >= _length) { return 0; /* read nothing */ } - if (opaque() || raw) { - /* overwrite whatever is there */ - mixdown_buffer = buf + buf_offset; - } else { - mixdown_buffer += buf_offset; - } - - if (rops & ReadOpsCount) { - _read_data_count = 0; + if ((to_read = min (cnt, _length - internal_offset)) == 0) { + return 0; /* read nothing */ } - if (chan_n < n_channels()) { - - boost::shared_ptr src = audio_source(chan_n); - if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) { - return 0; /* "read nothing" */ - } - - if (rops & ReadOpsCount) { - _read_data_count += src->read_data_count(); - } - } else { + /* COMPUTE DETAILS OF ANY FADES INVOLVED IN THIS READ */ - /* track is N-channel, this region has less channels; silence the ones - we don't have. - */ + /* Amount of fade in that we are dealing with in this read */ + framecnt_t fade_in_limit = 0; - if (Config->get_replicate_missing_region_channels()) { - /* track is N-channel, this region has less channels, so use a relevant channel - */ - - uint32_t channel = n_channels() % chan_n; - boost::shared_ptr src = audio_source (channel); + /* Offset from buf / mixdown_buffer of the start + of any fade out that we are dealing with + */ + frameoffset_t fade_out_offset = 0; + + /* Amount of fade in that we are dealing with in this read */ + framecnt_t fade_out_limit = 0; - if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) { - return 0; /* "read nothing" */ - } + framecnt_t fade_interval_start = 0; - /* adjust read data count appropriately since this was a duplicate read */ - src->dec_read_data_count (to_read); - } else { - memset (mixdown_buffer, 0, sizeof (Sample) * cnt); + /* Fade in */ + + if (_fade_in_active && _session.config.get_use_region_fades()) { + + framecnt_t fade_in_length = (framecnt_t) _fade_in->back()->when; + + /* see if this read is within the fade in */ + + if (internal_offset < fade_in_length) { + fade_in_limit = min (to_read, fade_in_length - internal_offset); } } - - if (rops & ReadOpsFades) { - - /* fade in */ - - if (_fade_in_active && _session.config.get_use_region_fades()) { - - framecnt_t fade_in_length = (framecnt_t) _fade_in->back()->when; - - /* see if this read is within the fade in */ - - if (internal_offset < fade_in_length) { - - framecnt_t fi_limit; - - fi_limit = min (to_read, fade_in_length - internal_offset); - - _fade_in->curve().get_vector (internal_offset, internal_offset+fi_limit, gain_buffer, fi_limit); - - for (framecnt_t n = 0; n < fi_limit; ++n) { - mixdown_buffer[n] *= gain_buffer[n]; - } - } - } - - /* fade out */ - - if (_fade_out_active && _session.config.get_use_region_fades()) { - - /* see if some part of this read is within the fade out */ + + /* Fade out */ + + if (_fade_out_active && _session.config.get_use_region_fades()) { + + /* see if some part of this read is within the fade out */ /* ................. >| REGION - limit + _length { } FADE fade_out_length ^ - limit - fade_out_length + _length - fade_out_length |--------------| ^internal_offset ^internal_offset + to_read we need the intersection of [internal_offset,internal_offset+to_read] with - [limit - fade_out_length, limit] + [_length - fade_out_length, _length] */ - framecnt_t fade_out_length = (framecnt_t) _fade_out->back()->when; - framecnt_t fade_interval_start = max(internal_offset, limit-fade_out_length); - framecnt_t fade_interval_end = min(internal_offset + to_read, limit); - - if (fade_interval_end > fade_interval_start) { - /* (part of the) the fade out is in this buffer */ - - framecnt_t fo_limit = fade_interval_end - fade_interval_start; - framecnt_t curve_offset = fade_interval_start - (limit-fade_out_length); - framecnt_t fade_offset = fade_interval_start - internal_offset; - - _fade_out->curve().get_vector (curve_offset, curve_offset+fo_limit, gain_buffer, fo_limit); + fade_interval_start = max (internal_offset, _length - framecnt_t (_fade_out->back()->when)); + framecnt_t fade_interval_end = min(internal_offset + to_read, _length.val()); + + if (fade_interval_end > fade_interval_start) { + /* (part of the) the fade out is in this buffer */ + fade_out_limit = fade_interval_end - fade_interval_start; + fade_out_offset = fade_interval_start - internal_offset; + } + } - for (framecnt_t n = 0, m = fade_offset; n < fo_limit; ++n, ++m) { - mixdown_buffer[m] *= gain_buffer[n]; - } - } + /* READ DATA FROM THE SOURCE INTO mixdown_buffer. + We can never read directly into buf, since it may contain data + from a region `below' this one in the stack, and our fades (if they exist) + may need to mix with the existing data. + */ - } + if (read_from_sources (_sources, _length, mixdown_buffer, position, to_read, chan_n) != to_read) { + return 0; } - /* Regular gain curves and scaling */ + /* APPLY REGULAR GAIN CURVES AND SCALING TO mixdown_buffer */ - if ((rops & ReadOpsOwnAutomation) && envelope_active()) { + if (envelope_active()) { _envelope->curve().get_vector (internal_offset, internal_offset + to_read, gain_buffer, to_read); - if ((rops & ReadOpsOwnScaling) && _scale_amplitude != 1.0f) { + if (_scale_amplitude != 1.0f) { for (framecnt_t n = 0; n < to_read; ++n) { mixdown_buffer[n] *= gain_buffer[n] * _scale_amplitude; } @@ -539,25 +607,164 @@ AudioRegion::_read_at (const SourceList& /*srcs*/, framecnt_t limit, mixdown_buffer[n] *= gain_buffer[n]; } } - } else if ((rops & ReadOpsOwnScaling) && _scale_amplitude != 1.0f) { + } else if (_scale_amplitude != 1.0f) { + apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude); + } + + + /* APPLY FADES TO THE DATA IN mixdown_buffer AND MIX THE RESULTS INTO + * buf. The key things to realize here: (1) the fade being applied is + * (as of April 26th 2012) just the inverse of the fade in curve (2) + * "buf" contains data from lower regions already. So this operation + * fades out the existing material. + */ + + if (fade_in_limit != 0) { + + if (opaque()) { + if (_inverse_fade_in) { + + /* explicit inverse fade in curve (e.g. for constant + * power), so we have to fetch it. + */ + + _inverse_fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + + /* Fade the data from lower layers out */ + for (framecnt_t n = 0; n < fade_in_limit; ++n) { + buf[n] *= gain_buffer[n]; + } + + /* refill gain buffer with the fade in */ + + _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + + } else { + + /* no explicit inverse fade in, so just use (1 - fade + * in) for the fade out of lower layers + */ + + _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + + for (framecnt_t n = 0; n < fade_in_limit; ++n) { + buf[n] *= 1 - gain_buffer[n]; + } + } + } else { + _fade_in->curve().get_vector (internal_offset, internal_offset + fade_in_limit, gain_buffer, fade_in_limit); + } - // XXX this should be using what in 2.0 would have been: - // Session::apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude); - for (framecnt_t n = 0; n < to_read; ++n) { - mixdown_buffer[n] *= _scale_amplitude; + /* Mix our newly-read data in, with the fade */ + for (framecnt_t n = 0; n < fade_in_limit; ++n) { + buf[n] += mixdown_buffer[n] * gain_buffer[n]; } } - if (!opaque() && (buf != mixdown_buffer)) { + if (fade_out_limit != 0) { - /* gack. the things we do for users. - */ + framecnt_t const curve_offset = fade_interval_start - (_length - _fade_out->back()->when); - buf += buf_offset; + if (opaque()) { + if (_inverse_fade_out) { + + _inverse_fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + + /* Fade the data from lower levels out */ + for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { + buf[m] *= gain_buffer[n]; + } + + /* fetch the actual fade out */ + + _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + + } else { + + /* no explicit inverse fade out, so just use (1 - fade + * out) for the fade in of lower layers + */ + + _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + + for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { + buf[m] *= 1 - gain_buffer[n]; + } + } + } else { + _fade_out->curve().get_vector (curve_offset, curve_offset + fade_out_limit, gain_buffer, fade_out_limit); + } - for (framecnt_t n = 0; n < to_read; ++n) { - buf[n] += mixdown_buffer[n]; + /* Mix our newly-read data out, with the fade */ + for (framecnt_t n = 0, m = fade_out_offset; n < fade_out_limit; ++n, ++m) { + buf[m] += mixdown_buffer[m] * gain_buffer[n]; + } + } + + + /* MIX OR COPY THE REGION BODY FROM mixdown_buffer INTO buf */ + + framecnt_t const N = to_read - fade_in_limit - fade_out_limit; + if (N > 0) { + if (opaque ()) { + memcpy (buf + fade_in_limit, mixdown_buffer + fade_in_limit, N * sizeof (Sample)); + } else { + mix_buffers_no_gain (buf + fade_in_limit, mixdown_buffer + fade_in_limit, N); + } + } + + return to_read; +} + +/** Read data directly from one of our sources, accounting for the situation when the track has a different channel + * count to the region. + * + * @param srcs Source list to get our source from. + * @param limit Furthest that we should read, as an offset from the region position. + * @param buf Buffer to write data into (existing contents of the buffer will be overwritten) + * @param position Position to read from, in session frames. + * @param cnt Number of frames to read. + * @param chan_n Channel to read from. + * @return Number of frames read. + */ + +framecnt_t +AudioRegion::read_from_sources (SourceList const & srcs, framecnt_t limit, Sample* buf, framepos_t position, framecnt_t cnt, uint32_t chan_n) const +{ + frameoffset_t const internal_offset = position - _position; + if (internal_offset >= limit) { + return 0; + } + + framecnt_t const to_read = min (cnt, limit - internal_offset); + if (to_read == 0) { + return 0; + } + + if (chan_n < n_channels()) { + + boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[chan_n]); + if (src->read (buf, _start + internal_offset, to_read) != to_read) { + return 0; /* "read nothing" */ + } + + } else { + + /* track is N-channel, this region has fewer channels; silence the ones + we don't have. + */ + + if (Config->get_replicate_missing_region_channels()) { + /* track is N-channel, this region has less channels, so use a relevant channel + */ + + uint32_t channel = n_channels() % chan_n; + boost::shared_ptr src = boost::dynamic_pointer_cast (srcs[channel]); + + if (src->read (buf, _start + internal_offset, to_read) != to_read) { + return 0; /* "read nothing" */ + } } } @@ -580,10 +787,10 @@ AudioRegion::state () child = node.add_child ("Envelope"); bool default_env = false; - + // If there are only two points, the points are in the start of the region and the end of the region // so, if they are both at 1.0f, that means the default region. - + if (_envelope->size() == 2 && _envelope->front()->value == 1.0f && _envelope->back()->value==1.0f) { @@ -591,7 +798,7 @@ AudioRegion::state () default_env = true; } } - + if (default_env) { child->add_property ("default", "yes"); } else { @@ -606,6 +813,11 @@ AudioRegion::state () child->add_child_nocopy (_fade_in->get_state ()); } + if (_inverse_fade_in) { + child = node.add_child (X_("InvFadeIn")); + child->add_child_nocopy (_inverse_fade_in->get_state ()); + } + child = node.add_child (X_("FadeOut")); if (_default_fade_out) { @@ -614,6 +826,11 @@ AudioRegion::state () child->add_child_nocopy (_fade_out->get_state ()); } + if (_inverse_fade_out) { + child = node.add_child (X_("InvFadeOut")); + child->add_child_nocopy (_inverse_fade_out->get_state ()); + } + return node; } @@ -623,7 +840,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ const XMLNodeList& nlist = node.children(); const XMLProperty *prop; LocaleGuard lg (X_("POSIX")); - boost::shared_ptr the_playlist (_playlist.lock()); + boost::shared_ptr the_playlist (_playlist.lock()); suspend_property_changes (); @@ -664,7 +881,6 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ set_default_envelope (); } - _envelope->set_max_xval (_length); _envelope->truncate_end (_length); @@ -672,7 +888,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ _fade_in->clear (); - if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { + if (((prop = child->property ("default")) != 0 && string_is_affirmative (prop->value())) || (prop = child->property ("steepness")) != 0) { set_default_fade_in (); } else { XMLNode* grandchild = child->child ("AutomationList"); @@ -689,11 +905,17 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ } } + /* legacy a3 */ + + if ((prop = child->property ("is-xfade")) != 0) { + _fade_in_is_xfade = string_is_affirmative (prop->value()); + } + } else if (child->name() == "FadeOut") { _fade_out->clear (); - if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { + if (((prop = child->property ("default")) != 0 && (string_is_affirmative (prop->value()))) || (prop = child->property ("steepness")) != 0) { set_default_fade_out (); } else { XMLNode* grandchild = child->child ("AutomationList"); @@ -701,7 +923,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ _fade_out->set_state (*grandchild, version); } } - + if ((prop = child->property ("active")) != 0) { if (string_is_affirmative (prop->value())) { set_fade_out_active (true); @@ -710,6 +932,22 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_ } } + /* legacy a3 */ + + if ((prop = child->property ("is-xfade")) != 0) { + _fade_out_is_xfade = string_is_affirmative (prop->value()); + } + + } else if (child->name() == "InvFadeIn") { + XMLNode* grandchild = child->child ("AutomationList"); + if (grandchild) { + _inverse_fade_in->set_state (*grandchild, version); + } + } else if (child->name() == "InvFadeOut") { + XMLNode* grandchild = child->child ("AutomationList"); + if (grandchild) { + _inverse_fade_out->set_state (*grandchild, version); + } } } @@ -752,64 +990,76 @@ AudioRegion::set_fade_in (boost::shared_ptr f) _fade_in->freeze (); *_fade_in = *f; _fade_in->thaw (); - + _default_fade_in = false; + send_change (PropertyChange (Properties::fade_in)); } void AudioRegion::set_fade_in (FadeShape shape, framecnt_t len) { + boost::shared_ptr c1 (new Evoral::ControlList (FadeInAutomation)); + boost::shared_ptr c2 (new Evoral::ControlList (FadeInAutomation)); + boost::shared_ptr c3 (new Evoral::ControlList (FadeInAutomation)); + _fade_in->freeze (); _fade_in->clear (); + _inverse_fade_in->clear (); switch (shape) { case FadeLinear: _fade_in->fast_simple_add (0.0, 0.0); _fade_in->fast_simple_add (len, 1.0); + reverse_curve (_inverse_fade_in, _fade_in); break; case FadeFast: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.389401, 0.0333333); - _fade_in->fast_simple_add (len * 0.629032, 0.0861111); - _fade_in->fast_simple_add (len * 0.829493, 0.233333); - _fade_in->fast_simple_add (len * 0.9447, 0.483333); - _fade_in->fast_simple_add (len * 0.976959, 0.697222); - _fade_in->fast_simple_add (len, 1); + generate_db_fade (_fade_in, len, 10, -60); + reverse_curve (c1, _fade_in); + _fade_in->copy_events (*c1); + generate_inverse_power_curve (_inverse_fade_in, _fade_in); break; case FadeSlow: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.0207373, 0.197222); - _fade_in->fast_simple_add (len * 0.0645161, 0.525); - _fade_in->fast_simple_add (len * 0.152074, 0.802778); - _fade_in->fast_simple_add (len * 0.276498, 0.919444); - _fade_in->fast_simple_add (len * 0.481567, 0.980556); - _fade_in->fast_simple_add (len * 0.767281, 1); - _fade_in->fast_simple_add (len, 1); + generate_db_fade (c1, len, 10, -1); // start off with a slow fade + generate_db_fade (c2, len, 10, -80); // end with a fast fade + merge_curves (_fade_in, c1, c2); + reverse_curve (c3, _fade_in); + _fade_in->copy_events (*c3); + generate_inverse_power_curve (_inverse_fade_in, _fade_in); break; - case FadeLogA: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.0737327, 0.308333); - _fade_in->fast_simple_add (len * 0.246544, 0.658333); - _fade_in->fast_simple_add (len * 0.470046, 0.886111); - _fade_in->fast_simple_add (len * 0.652074, 0.972222); - _fade_in->fast_simple_add (len * 0.771889, 0.988889); - _fade_in->fast_simple_add (len, 1); + case FadeConstantPower: + for (int i = 0; i < 9; ++i) { + float dist = (float) i / 10.0f; + _fade_in->fast_simple_add (len*dist, sin (dist*M_PI/2)); + } + _fade_in->fast_simple_add (len, 1.0); + reverse_curve (_inverse_fade_in, _fade_in); break; - - case FadeLogB: - _fade_in->fast_simple_add (0, 0); - _fade_in->fast_simple_add (len * 0.304147, 0.0694444); - _fade_in->fast_simple_add (len * 0.529954, 0.152778); - _fade_in->fast_simple_add (len * 0.725806, 0.333333); - _fade_in->fast_simple_add (len * 0.847926, 0.558333); - _fade_in->fast_simple_add (len * 0.919355, 0.730556); - _fade_in->fast_simple_add (len, 1); + + case FadeSymmetric: + //start with a nearly linear cuve + _fade_in->fast_simple_add (0, 1); + _fade_in->fast_simple_add (0.5*len, 0.6); + //now generate a fade-out curve by successively applying a gain drop + const float breakpoint = 0.7; //linear for first 70% + const int num_steps = 9; + for (int i = 2; i < num_steps; i++) { + float coeff = (1.0-breakpoint); + for (int j = 0; j < i; j++) { + coeff *= 0.5; //6dB drop per step + } + _fade_in->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff); + } + _fade_in->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (c3, _fade_in); + _fade_in->copy_events (*c3); + reverse_curve (_inverse_fade_in, _fade_in ); break; } + _default_fade_in = false; _fade_in->thaw (); send_change (PropertyChange (Properties::fade_in)); } @@ -820,6 +1070,7 @@ AudioRegion::set_fade_out (boost::shared_ptr f) _fade_out->freeze (); *_fade_out = *f; _fade_out->thaw (); + _default_fade_out = false; send_change (PropertyChange (Properties::fade_in)); } @@ -827,57 +1078,67 @@ AudioRegion::set_fade_out (boost::shared_ptr f) void AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) { + boost::shared_ptr c1 (new Evoral::ControlList (FadeOutAutomation)); + boost::shared_ptr c2 (new Evoral::ControlList (FadeOutAutomation)); + _fade_out->freeze (); _fade_out->clear (); + _inverse_fade_out->clear (); switch (shape) { - case FadeFast: - _fade_out->fast_simple_add (len * 0, 1); - _fade_out->fast_simple_add (len * 0.023041, 0.697222); - _fade_out->fast_simple_add (len * 0.0553, 0.483333); - _fade_out->fast_simple_add (len * 0.170507, 0.233333); - _fade_out->fast_simple_add (len * 0.370968, 0.0861111); - _fade_out->fast_simple_add (len * 0.610599, 0.0333333); - _fade_out->fast_simple_add (len * 1, 0); + case FadeLinear: + _fade_out->fast_simple_add (0.0, 1.0); + _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (_inverse_fade_out, _fade_out); break; - - case FadeLogA: - _fade_out->fast_simple_add (len * 0, 1); - _fade_out->fast_simple_add (len * 0.228111, 0.988889); - _fade_out->fast_simple_add (len * 0.347926, 0.972222); - _fade_out->fast_simple_add (len * 0.529954, 0.886111); - _fade_out->fast_simple_add (len * 0.753456, 0.658333); - _fade_out->fast_simple_add (len * 0.9262673, 0.308333); - _fade_out->fast_simple_add (len * 1, 0); + + case FadeFast: + generate_db_fade (_fade_out, len, 10, -60); + generate_inverse_power_curve (_inverse_fade_out, _fade_out); break; - - case FadeSlow: - _fade_out->fast_simple_add (len * 0, 1); - _fade_out->fast_simple_add (len * 0.305556, 1); - _fade_out->fast_simple_add (len * 0.548611, 0.991736); - _fade_out->fast_simple_add (len * 0.759259, 0.931129); - _fade_out->fast_simple_add (len * 0.918981, 0.68595); - _fade_out->fast_simple_add (len * 0.976852, 0.22865); - _fade_out->fast_simple_add (len * 1, 0); + + case FadeSlow: + generate_db_fade (c1, len, 10, -1); //start off with a slow fade + generate_db_fade (c2, len, 10, -80); //end with a fast fade + merge_curves (_fade_out, c1, c2); + generate_inverse_power_curve (_inverse_fade_out, _fade_out); break; - case FadeLogB: - _fade_out->fast_simple_add (len * 0, 1); - _fade_out->fast_simple_add (len * 0.080645, 0.730556); - _fade_out->fast_simple_add (len * 0.277778, 0.289256); - _fade_out->fast_simple_add (len * 0.470046, 0.152778); - _fade_out->fast_simple_add (len * 0.695853, 0.0694444); - _fade_out->fast_simple_add (len * 1, 0); + case FadeConstantPower: + //constant-power fades use a sin/cos relationship + //the cutoff is abrupt but it has the benefit of being symmetrical + _fade_out->fast_simple_add (0.0, 1.0); + for (int i = 1; i < 9; i++ ) { + float dist = (float)i/10.0; + _fade_out->fast_simple_add ((len * dist), cos(dist*M_PI/2)); + } + _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (_inverse_fade_out, _fade_out); break; - - case FadeLinear: - _fade_out->fast_simple_add (len * 0, 1); - _fade_out->fast_simple_add (len * 1, 0); + + case FadeSymmetric: + //start with a nearly linear cuve + _fade_out->fast_simple_add (0, 1); + _fade_out->fast_simple_add (0.5*len, 0.6); + + //now generate a fade-out curve by successively applying a gain drop + const float breakpoint = 0.7; //linear for first 70% + const int num_steps = 9; + for (int i = 2; i < num_steps; i++) { + float coeff = (1.0-breakpoint); + for (int j = 0; j < i; j++) { + coeff *= 0.5; //6dB drop per step + } + _fade_out->fast_simple_add (len* (breakpoint+((1.0-breakpoint)*(double)i/(double)num_steps)), coeff); + } + _fade_out->fast_simple_add (len, VERY_SMALL_SIGNAL); + reverse_curve (_inverse_fade_out, _fade_out); break; } + _default_fade_out = false; _fade_out->thaw (); - send_change (PropertyChange (Properties::fade_in)); + send_change (PropertyChange (Properties::fade_out)); } void @@ -886,10 +1147,32 @@ AudioRegion::set_fade_in_length (framecnt_t len) if (len > _length) { len = _length - 1; } + + if (len < 64) { + len = 64; + } bool changed = _fade_in->extend_to (len); if (changed) { + if (_inverse_fade_in) { + _inverse_fade_in->extend_to (len); + } + + if (_session.config.get_xfade_model() == FullCrossfade && + _session.config.get_auto_xfade() && + _fade_in_is_xfade && !_fade_in_is_short) { + + /* trim a single other region below us to the new start + of the fade. + */ + + boost::shared_ptr other = get_single_other_xfade_region (true); + if (other) { + other->trim_end (position() + len); + } + } + _default_fade_in = false; send_change (PropertyChange (Properties::fade_in)); } @@ -902,10 +1185,33 @@ AudioRegion::set_fade_out_length (framecnt_t len) len = _length - 1; } + if (len < 64) { + len = 64; + } + bool changed = _fade_out->extend_to (len); if (changed) { + + if (_inverse_fade_out) { + _inverse_fade_out->extend_to (len); + } _default_fade_out = false; + + if (_session.config.get_xfade_model() == FullCrossfade && + _session.config.get_auto_xfade() && + _fade_out_is_xfade && !_fade_out_is_short) { + + /* trim a single other region below us to the new start + of the fade. + */ + + boost::shared_ptr other = get_single_other_xfade_region (false); + if (other) { + other->trim_front (last_frame() - len); + } + } + send_change (PropertyChange (Properties::fade_out)); } } @@ -947,6 +1253,8 @@ void AudioRegion::set_default_fade_in () { _fade_in_suspended = 0; + _fade_in_is_xfade = false; + _fade_in_is_short = true; set_fade_in (FadeLinear, 64); } @@ -954,6 +1262,8 @@ void AudioRegion::set_default_fade_out () { _fade_out_suspended = 0; + _fade_out_is_xfade = false; + _fade_out_is_short = true; set_fade_out (FadeLinear, 64); } @@ -983,9 +1293,8 @@ AudioRegion::recompute_at_end () _envelope->freeze (); _envelope->truncate_end (_length); - _envelope->set_max_xval (_length); _envelope->thaw (); - + suspend_property_changes(); if (_left_of_split) { @@ -1000,7 +1309,7 @@ AudioRegion::recompute_at_end () _fade_in->extend_to (_length); send_change (PropertyChange (Properties::fade_in)); } - + resume_property_changes(); } @@ -1010,7 +1319,7 @@ AudioRegion::recompute_at_start () /* as above, but the shift was from the front */ _envelope->truncate_start (_length); - + suspend_property_changes(); if (_right_of_split) { @@ -1025,7 +1334,7 @@ AudioRegion::recompute_at_start () _fade_out->extend_to (_length); send_change (PropertyChange (Properties::fade_out)); } - + resume_property_changes(); } @@ -1062,11 +1371,11 @@ AudioRegion::separate_by_channel (Session& /*session*/, vectorset_whole_file (false); @@ -1083,72 +1392,6 @@ AudioRegion::read_raw_internal (Sample* buf, framepos_t pos, framecnt_t cnt, int return audio_source(channel)->read (buf, pos, cnt); } -int -AudioRegion::exportme (Session& /*session*/, ARDOUR::ExportSpecification& /*spec*/) -{ - // TODO EXPORT -// const framecnt_t blocksize = 4096; -// framecnt_t to_read; -// int status = -1; -// -// spec.channels = _sources.size(); -// -// if (spec.prepare (blocksize, session.frame_rate())) { -// goto out; -// } -// -// spec.pos = 0; -// spec.total_frames = _length; -// -// while (spec.pos < _length && !spec.stop) { -// -// -// /* step 1: interleave */ -// -// to_read = min (_length - spec.pos, blocksize); -// -// if (spec.channels == 1) { -// -// if (read_raw_internal (spec.dataF, _start + spec.pos, to_read) != to_read) { -// goto out; -// } -// -// } else { -// -// Sample buf[blocksize]; -// -// for (uint32_t chan = 0; chan < spec.channels; ++chan) { -// -// if (audio_source(chan)->read (buf, _start + spec.pos, to_read) != to_read) { -// goto out; -// } -// -// for (framecnt_t x = 0; x < to_read; ++x) { -// spec.dataF[chan+(x*spec.channels)] = buf[x]; -// } -// } -// } -// -// if (spec.process (to_read)) { -// goto out; -// } -// -// spec.pos += to_read; -// spec.progress = (double) spec.pos /_length; -// -// } -// -// status = 0; -// -// out: -// spec.running = false; -// spec.status = status; -// spec.clear(); -// -// return status; - return 0; -} - void AudioRegion::set_scale_amplitude (gain_t g) { @@ -1179,7 +1422,7 @@ AudioRegion::maximum_amplitude (Progress* p) const framecnt_t const blocksize = 64 * 1024; Sample buf[blocksize]; - + while (fpos < fend) { uint32_t n; @@ -1331,17 +1574,17 @@ AudioRegion::audio_source (uint32_t n) const return boost::dynamic_pointer_cast(source(n)); } -int +int AudioRegion::adjust_transients (frameoffset_t delta) { for (AnalysisFeatureList::iterator x = _transients.begin(); x != _transients.end(); ++x) { (*x) = (*x) + delta; } - + send_change (PropertyChange (Properties::valid_transients)); - - return 0; -} + + return 0; +} int AudioRegion::update_transient (framepos_t old_position, framepos_t new_position) @@ -1350,11 +1593,11 @@ AudioRegion::update_transient (framepos_t old_position, framepos_t new_position) if ((*x) == old_position) { (*x) = new_position; send_change (PropertyChange (Properties::valid_transients)); - + break; } } - + return 0; } @@ -1363,7 +1606,7 @@ AudioRegion::add_transient (framepos_t where) { _transients.push_back(where); _valid_transients = true; - + send_change (PropertyChange (Properties::valid_transients)); } @@ -1372,7 +1615,7 @@ AudioRegion::remove_transient (framepos_t where) { _transients.remove(where); _valid_transients = true; - + send_change (PropertyChange (Properties::valid_transients)); } @@ -1382,9 +1625,9 @@ AudioRegion::set_transients (AnalysisFeatureList& results) _transients.clear(); _transients = results; _valid_transients = true; - + send_change (PropertyChange (Properties::valid_transients)); - + return 0; } @@ -1583,7 +1826,131 @@ AudioRegion::find_silence (Sample threshold, framecnt_t min_length, InterThreadI return silent_periods; } +Evoral::Range +AudioRegion::body_range () const +{ + return Evoral::Range (first_frame() + _fade_in->back()->when, last_frame() - _fade_out->back()->when); +} + +void +AudioRegion::set_fade_in_is_xfade (bool yn) +{ + if (yn == _fade_in_is_xfade) { + return; + } + + _fade_in_is_xfade = yn; + send_change (PropertyChange (Properties::fade_in_is_xfade)); +} + +void +AudioRegion::set_fade_out_is_xfade (bool yn) +{ + if (yn == _fade_out_is_xfade) { + return; + } + + _fade_out_is_xfade = yn; + send_change (PropertyChange (Properties::fade_out_is_xfade)); +} +void +AudioRegion::set_fade_in_is_short (bool yn) +{ + if (yn == _fade_in_is_short) { + return; + } + + _fade_in_is_short = yn; + send_change (PropertyChange (Properties::fade_in_is_short)); + +} + +void +AudioRegion::set_fade_out_is_short (bool yn) +{ + if (yn == _fade_out_is_short) { + return; + } + + _fade_out_is_short = yn; + send_change (PropertyChange (Properties::fade_out_is_short)); +} + +boost::shared_ptr +AudioRegion::get_single_other_xfade_region (bool start) const +{ + boost::shared_ptr pl (playlist()); + + if (!pl) { + /* not currently in a playlist - xfade length is unbounded + (and irrelevant) + */ + return boost::shared_ptr (); + } + + boost::shared_ptr rl; + + if (start) { + rl = pl->regions_at (position()); + } else { + rl = pl->regions_at (last_frame()); + } + + RegionList::iterator i; + boost::shared_ptr other; + uint32_t n = 0; + + /* count and find the other region in a single pass through the list */ + + for (i = rl->begin(); i != rl->end(); ++i) { + if ((*i).get() != this) { + other = *i; + } + ++n; + } + + if (n != 2) { + /* zero or multiple regions stacked here - don't care about xfades */ + return boost::shared_ptr (); + } + + return other; +} + +framecnt_t +AudioRegion::verify_xfade_bounds (framecnt_t len, bool start) +{ + /* this is called from a UI to check on whether a new proposed + length for an xfade is legal or not. it returns the legal + length corresponding to @a len which may be shorter than or + equal to @a len itself. + */ + + boost::shared_ptr other = get_single_other_xfade_region (start); + framecnt_t maxlen; + + if (!other) { + /* zero or > 2 regions here, don't care about len, but + it can't be longer than the region itself. + */ + return min (length(), len); + } + + /* we overlap a single region. clamp the length of an xfade to + the maximum possible duration of the overlap (if the other + region were trimmed appropriately). + */ + + if (start) { + maxlen = other->latest_possible_frame() - position(); + } else { + maxlen = last_frame() - other->earliest_possible_position(); + } + + return min (length(), min (maxlen, len)); + +} extern "C" {