X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiosource.cc;h=4deb053cd8f0bf3a2b4a06d6db878447b0d2eac9;hb=3b250c54754745985f087137b7ed9058a7bb6e90;hp=f309f599c5f199ab76ffb6ae7e2e3b63e973bc9c;hpb=dbf3ba2d73dfa2b3230ff5829e4a4a49c7c5ba5f;p=ardour.git diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index f309f599c5..4deb053cd8 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -35,12 +35,9 @@ #include #include "pbd/xml++.h" -#include "pbd/pthread_utils.h" #include "ardour/audiosource.h" -#include "ardour/cycle_timer.h" -#include "ardour/session.h" -#include "ardour/transient_detector.h" +#include "ardour/rc_configuration.h" #include "ardour/runtime_functions.h" #include "i18n.h" @@ -48,8 +45,11 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using Glib::ustring; +Glib::Threads::Mutex AudioSource::_level_buffer_lock; +vector > AudioSource::_mixdown_buffers; +vector > AudioSource::_gain_buffers; +size_t AudioSource::_working_buffers_size = 0; bool AudioSource::_build_missing_peakfiles = false; /** true if we want peakfiles (e.g. if we are displaying a GUI) */ @@ -57,15 +57,13 @@ bool AudioSource::_build_peakfiles = false; #define _FPP 256 -AudioSource::AudioSource (Session& s, ustring name) +AudioSource::AudioSource (Session& s, string name) : Source (s, DataType::AUDIO, name) , _length (0) { _peaks_built = false; _peak_byte_max = 0; _peakfile_descriptor = 0; - _read_data_count = 0; - _write_data_count = 0; peak_leftover_cnt = 0; peak_leftover_size = 0; peak_leftovers = 0; @@ -79,8 +77,6 @@ AudioSource::AudioSource (Session& s, const XMLNode& node) _peaks_built = false; _peak_byte_max = 0; _peakfile_descriptor = 0; - _read_data_count = 0; - _write_data_count = 0; peak_leftover_cnt = 0; peak_leftover_size = 0; peak_leftovers = 0; @@ -139,10 +135,10 @@ AudioSource::length (framepos_t /*pos*/) const } void -AudioSource::update_length (framepos_t pos, framecnt_t cnt) +AudioSource::update_length (framecnt_t len) { - if (pos + cnt > _length) { - _length = pos + cnt; + if (len > _length) { + _length = len; } } @@ -164,11 +160,7 @@ bool AudioSource::peaks_ready (boost::function doThisWhenReady, ScopedConnection** connect_here_if_not, EventLoop* event_loop) const { bool ret; - Glib::Mutex::Lock lm (_peaks_ready_lock); - - /* check to see if the peak data is ready. if not - connect the slot while still holding the lock. - */ + Glib::Threads::Mutex::Lock lm (_peaks_ready_lock); if (!(ret = _peaks_built)) { *connect_here_if_not = new ScopedConnection; @@ -196,13 +188,13 @@ AudioSource::touch_peakfile () } int -AudioSource::rename_peakfile (ustring newpath) +AudioSource::rename_peakfile (string newpath) { /* caller must hold _lock */ - ustring oldpath = peakpath; + string oldpath = peakpath; - if (access (oldpath.c_str(), F_OK) == 0) { + if (Glib::file_test (oldpath, Glib::FILE_TEST_EXISTS)) { if (rename (oldpath.c_str(), newpath.c_str()) != 0) { error << string_compose (_("cannot rename peakfile for %1 from %2 to %3 (%4)"), _name, oldpath, newpath, strerror (errno)) << endmsg; return -1; @@ -215,7 +207,7 @@ AudioSource::rename_peakfile (ustring newpath) } int -AudioSource::initialize_peakfile (bool newfile, ustring audio_path) +AudioSource::initialize_peakfile (bool newfile, string audio_path) { struct stat statbuf; @@ -243,7 +235,7 @@ AudioSource::initialize_peakfile (bool newfile, ustring audio_path) /* we found it in the peaks dir, so check it out */ - if (statbuf.st_size == 0 || ((nframes_t) statbuf.st_size < ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) { + if (statbuf.st_size == 0 || (statbuf.st_size < (off_t) ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) { // empty _peaks_built = false; } else { @@ -252,8 +244,14 @@ AudioSource::initialize_peakfile (bool newfile, ustring audio_path) int err = stat (audio_path.c_str(), &stat_file); if (err) { - _peaks_built = false; - _peak_byte_max = 0; + + /* no audio path - nested source or we can't + read it or ... whatever, use the peakfile as-is. + */ + + _peaks_built = true; + _peak_byte_max = statbuf.st_size; + } else { /* allow 6 seconds slop on checking peak vs. file times because of various @@ -281,14 +279,16 @@ AudioSource::initialize_peakfile (bool newfile, ustring audio_path) framecnt_t AudioSource::read (Sample *dst, framepos_t start, framecnt_t cnt, int /*channel*/) const { - Glib::Mutex::Lock lm (_lock); + assert (cnt >= 0); + + Glib::Threads::Mutex::Lock lm (_lock); return read_unlocked (dst, start, cnt); } framecnt_t AudioSource::write (Sample *dst, framecnt_t cnt) { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); /* any write makes the fill not removable */ _flags = Flag (_flags & ~Removable); return write_unlocked (dst, cnt); @@ -308,7 +308,7 @@ int AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t start, framecnt_t cnt, double samples_per_visual_peak, framecnt_t samples_per_file_peak) const { - Glib::Mutex::Lock lm (_lock); + Glib::Threads::Mutex::Lock lm (_lock); double scale; double expected_peaks; PeakData::PeakDatum xmax; @@ -394,7 +394,6 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t #endif nread = ::pread (peakfile_fd, peaks, sizeof (PeakData)* npeaks, first_peak_byte); - delete peakfile_descriptor; if (nread != sizeof (PeakData) * npeaks) { cerr << "AudioSource[" @@ -440,7 +439,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t */ const framecnt_t chunksize = (framecnt_t) min (expected_peaks, 65536.0); - + staging = new PeakData[chunksize]; /* compute the rounded up frame position */ @@ -576,14 +575,14 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t adjusting zero_fill and npeaks and then breaking out of this loop early */ - + memset (raw_staging, 0, sizeof (Sample) * chunksize); - + } else { - + to_read = min (chunksize, (_length - current_frame)); - - + + if ((frames_read = read_unlocked (raw_staging, current_frame, to_read)) == 0) { error << string_compose(_("AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"), _name, to_read, current_frame, _length, strerror (errno)) @@ -591,7 +590,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t goto out; } } - + i = 0; } @@ -647,13 +646,13 @@ AudioSource::build_peaks_from_scratch () { /* hold lock while building peaks */ - Glib::Mutex::Lock lp (_lock); + Glib::Threads::Mutex::Lock lp (_lock); if (prepare_for_peakfile_writes ()) { goto out; } - framepos_t current_frame = 0; + framecnt_t current_frame = 0; framecnt_t cnt = _length; _peaks_built = false; @@ -663,7 +662,7 @@ AudioSource::build_peaks_from_scratch () framecnt_t frames_to_read = min (bufsize, cnt); framecnt_t frames_read; - + if ((frames_read = read_unlocked (buf, current_frame, frames_to_read)) != frames_to_read) { error << string_compose(_("%1: could not write read raw data for peak computation (%2)"), _name, strerror (errno)) << endmsg; done_with_peakfile_writes (false); @@ -684,13 +683,7 @@ AudioSource::build_peaks_from_scratch () } done_with_peakfile_writes ((cnt == 0)); - } - - { - Glib::Mutex::Lock lm (_peaks_ready_lock); - - if (_peaks_built) { - PeaksReady (); /* EMIT SIGNAL */ + if (cnt == 0) { ret = 0; } } @@ -724,22 +717,25 @@ AudioSource::done_with_peakfile_writes (bool done) } if (done) { + Glib::Threads::Mutex::Lock lm (_peaks_ready_lock); _peaks_built = true; + PeaksReady (); /* EMIT SIGNAL */ } delete _peakfile_descriptor; _peakfile_descriptor = 0; } +/** @param first_frame Offset from the source start of the first frame to process */ int -AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, framecnt_t cnt, +AudioSource::compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt, bool force, bool intermediate_peaks_ready) { return compute_and_write_peaks (buf, first_frame, cnt, force, intermediate_peaks_ready, _FPP); } int -AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, framecnt_t cnt, +AudioSource::compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt, bool force, bool intermediate_peaks_ready, framecnt_t fpp) { Sample* buf2 = 0; @@ -781,7 +777,7 @@ AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, frame _peak_byte_max = max (_peak_byte_max, (off_t) (byte + sizeof(PeakData))); { - Glib::Mutex::Lock lm (_peaks_ready_lock); + Glib::Threads::Mutex::Lock lm (_peaks_ready_lock); PeakRangeReady (peak_leftover_frame, peak_leftover_cnt); /* EMIT SIGNAL */ if (intermediate_peaks_ready) { PeaksReady (); /* EMIT SIGNAL */ @@ -880,8 +876,9 @@ AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, frame off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize); if (endpos < target_length) { - (void) ftruncate (_peakfile_fd, target_length); - /* error doesn't actually matter though, so continue on without testing */ + if (ftruncate (_peakfile_fd, target_length)) { + /* error doesn't actually matter so continue on without testing */ + } } } @@ -893,7 +890,7 @@ AudioSource::compute_and_write_peaks (Sample* buf, framepos_t first_frame, frame _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaks_computed)); if (frames_done) { - Glib::Mutex::Lock lm (_peaks_ready_lock); + Glib::Threads::Mutex::Lock lm (_peaks_ready_lock); PeakRangeReady (first_frame, frames_done); /* EMIT SIGNAL */ if (intermediate_peaks_ready) { PeaksReady (); /* EMIT SIGNAL */ @@ -923,7 +920,10 @@ AudioSource::truncate_peakfile () off_t end = lseek (_peakfile_fd, 0, SEEK_END); if (end > _peak_byte_max) { - (void) ftruncate (_peakfile_fd, _peak_byte_max); + if (ftruncate (_peakfile_fd, _peak_byte_max)) { + error << string_compose (_("could not truncate peakfile %1 to %2 (error: %3)"), + peakpath, _peak_byte_max, errno) << endmsg; + } } } @@ -945,3 +945,50 @@ AudioSource::available_peaks (double zoom_factor) const return (end/sizeof(PeakData)) * _FPP; } +void +AudioSource::mark_streaming_write_completed () +{ + Glib::Threads::Mutex::Lock lm (_peaks_ready_lock); + + if (_peaks_built) { + PeaksReady (); /* EMIT SIGNAL */ + } +} + +void +AudioSource::allocate_working_buffers (framecnt_t framerate) +{ + Glib::Threads::Mutex::Lock lm (_level_buffer_lock); + + + /* Note: we don't need any buffers allocated until + a level 1 audiosource is created, at which + time we'll call ::ensure_buffers_for_level() + with the right value and do the right thing. + */ + + if (!_mixdown_buffers.empty()) { + ensure_buffers_for_level_locked ( _mixdown_buffers.size(), framerate); + } +} + +void +AudioSource::ensure_buffers_for_level (uint32_t level, framecnt_t frame_rate) +{ + Glib::Threads::Mutex::Lock lm (_level_buffer_lock); + ensure_buffers_for_level_locked (level, frame_rate); +} + +void +AudioSource::ensure_buffers_for_level_locked (uint32_t level, framecnt_t frame_rate) +{ + framecnt_t nframes = (framecnt_t) floor (Config->get_audio_playback_buffer_seconds() * frame_rate); + + _mixdown_buffers.clear (); + _gain_buffers.clear (); + + while (_mixdown_buffers.size() < level) { + _mixdown_buffers.push_back (boost::shared_ptr (new Sample[nframes])); + _gain_buffers.push_back (boost::shared_ptr (new gain_t[nframes])); + } +}