X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiosource.cc;h=b993a093b50b0eda3087bee4ac25154c4e08c9f9;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=bf7a32c885a096d8ba575a0447d8f7f1a2527e3c;hpb=8277d134b9733aee344782891c99f07114384d9e;p=ardour.git diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index bf7a32c885..b993a093b5 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis 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 @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: source.cc 404 2006-03-17 17:39:21Z pauld $ */ #include @@ -23,16 +22,26 @@ #include #include #include +#include #include #include #include #include +#include #include +#include -#include -#include +#include +#include -#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/runtime_functions.h" #include "i18n.h" @@ -40,48 +49,56 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -sigc::signal AudioSource::AudioSourceCreated; -pthread_t AudioSource::peak_thread; -bool AudioSource::have_peak_thread = false; -vector AudioSource::pending_peak_sources; -Glib::Mutex* AudioSource::pending_peak_sources_lock = 0; -int AudioSource::peak_request_pipe[2]; - bool AudioSource::_build_missing_peakfiles = false; + +/** true if we want peakfiles (e.g. if we are displaying a GUI) */ bool AudioSource::_build_peakfiles = false; -AudioSource::AudioSource (string name) - : Source (name) -{ - if (pending_peak_sources_lock == 0) { - pending_peak_sources_lock = new Glib::Mutex; - } +#define _FPP 256 +AudioSource::AudioSource (Session& s, string name) + : Source (s, DataType::AUDIO, name) + , _length (0) +{ _peaks_built = false; - next_peak_clear_should_notify = true; + _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; } -AudioSource::AudioSource (const XMLNode& node) - : Source (node) +AudioSource::AudioSource (Session& s, const XMLNode& node) + : Source (s, node) + , _length (0) { - if (pending_peak_sources_lock == 0) { - pending_peak_sources_lock = new Glib::Mutex; - } _peaks_built = false; - next_peak_clear_should_notify = true; + _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; - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } } AudioSource::~AudioSource () { + /* shouldn't happen but make sure we don't leak file descriptors anyway */ + + if (peak_leftover_cnt) { + cerr << "AudioSource destroyed with leftover peak data pending" << endl; + } + + delete _peakfile_descriptor; + delete [] peak_leftovers; } XMLNode& @@ -97,12 +114,10 @@ AudioSource::get_state () } int -AudioSource::set_state (const XMLNode& node) +AudioSource::set_state (const XMLNode& node, int /*version*/) { const XMLProperty* prop; - Source::set_state (node); - if ((prop = node.property ("captured-for")) != 0) { _captured_for = prop->value(); } @@ -110,190 +125,69 @@ AudioSource::set_state (const XMLNode& node) return 0; } -/*********************************************************************** - PEAK FILE STUFF - ***********************************************************************/ - -void* -AudioSource::peak_thread_work (void* arg) +bool +AudioSource::empty () const { - PBD::ThreadCreated (pthread_self(), X_("Peak")); - struct pollfd pfd[1]; - - if (pending_peak_sources_lock == 0) { - pending_peak_sources_lock = new Glib::Mutex; - } - - Glib::Mutex::Lock lm (*pending_peak_sources_lock); - - while (true) { - - pfd[0].fd = peak_request_pipe[0]; - pfd[0].events = POLLIN|POLLERR|POLLHUP; - - pending_peak_sources_lock->unlock (); - - if (poll (pfd, 1, -1) < 0) { - - if (errno == EINTR) { - pending_peak_sources_lock->lock (); - continue; - } - - error << string_compose (_("poll on peak request pipe failed (%1)"), - strerror (errno)) - << endmsg; - break; - } - - if (pfd[0].revents & ~POLLIN) { - error << _("Error on peak thread request pipe") << endmsg; - break; - } - - if (pfd[0].revents & POLLIN) { - - char req; - - /* empty the pipe of all current requests */ - - while (1) { - size_t nread = ::read (peak_request_pipe[0], &req, sizeof (req)); - - if (nread == 1) { - switch ((PeakRequest::Type) req) { - - case PeakRequest::Build: - break; - - case PeakRequest::Quit: - pthread_exit_pbd (0); - /*NOTREACHED*/ - break; - - default: - break; - } - - } else if (nread == 0) { - break; - } else if (errno == EAGAIN) { - break; - } else { - fatal << _("Error reading from peak request pipe") << endmsg; - /*NOTREACHED*/ - } - } - } - - pending_peak_sources_lock->lock (); - - while (!pending_peak_sources.empty()) { - - AudioSource* s = pending_peak_sources.front(); - pending_peak_sources.erase (pending_peak_sources.begin()); - - pending_peak_sources_lock->unlock (); - s->build_peaks(); - pending_peak_sources_lock->lock (); - } - } - - pthread_exit_pbd (0); - /*NOTREACHED*/ - return 0; + return _length == 0; } -int -AudioSource::start_peak_thread () +framecnt_t +AudioSource::length (framepos_t /*pos*/) const { - if (!_build_peakfiles) { - return 0; - } - - if (pipe (peak_request_pipe)) { - error << string_compose(_("Cannot create transport request signal pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (fcntl (peak_request_pipe[0], F_SETFL, O_NONBLOCK)) { - error << string_compose(_("UI: cannot set O_NONBLOCK on peak request pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (fcntl (peak_request_pipe[1], F_SETFL, O_NONBLOCK)) { - error << string_compose(_("UI: cannot set O_NONBLOCK on peak request pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (pthread_create_and_store ("peak file builder", &peak_thread, 0, peak_thread_work, 0)) { - error << _("AudioSource: could not create peak thread") << endmsg; - return -1; - } - - have_peak_thread = true; - return 0; + return _length; } void -AudioSource::stop_peak_thread () +AudioSource::update_length (framepos_t pos, framecnt_t cnt) { - if (!have_peak_thread) { - return; + if (pos + cnt > _length) { + _length = pos + cnt; } +} - void* status; - char c = (char) PeakRequest::Quit; - ::write (peak_request_pipe[1], &c, 1); - pthread_join (peak_thread, &status); -} +/*********************************************************************** + PEAK FILE STUFF + ***********************************************************************/ -void -AudioSource::queue_for_peaks (AudioSource& source) +/** Checks to see if peaks are ready. If so, we return true. If not, we return false, and + * things are set up so that doThisWhenReady is called when the peaks are ready. + * A new PBD::ScopedConnection is created for the associated connection and written to + * *connect_here_if_not. + * + * @param doThisWhenReady Function to call when peaks are ready (if they are not already). + * @param connect_here_if_not Address to write new ScopedConnection to. + * @param event_loop Event loop for doThisWhenReady to be called in. + */ +bool +AudioSource::peaks_ready (boost::function doThisWhenReady, ScopedConnection** connect_here_if_not, EventLoop* event_loop) const { - if (have_peak_thread) { - - Glib::Mutex::Lock lm (*pending_peak_sources_lock); - - source.next_peak_clear_should_notify = true; - - if (find (pending_peak_sources.begin(), - pending_peak_sources.end(), - &source) == pending_peak_sources.end()) { - pending_peak_sources.push_back (&source); - } + bool ret; + Glib::Mutex::Lock lm (_peaks_ready_lock); - char c = (char) PeakRequest::Build; - ::write (peak_request_pipe[1], &c, 1); + if (!(ret = _peaks_built)) { + *connect_here_if_not = new ScopedConnection; + PeaksReady.connect (**connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop); } -} -void AudioSource::clear_queue_for_peaks () -{ - /* this is done to cancel a group of running peak builds */ - if (have_peak_thread) { - Glib::Mutex::Lock lm (*pending_peak_sources_lock); - pending_peak_sources.clear (); - } + return ret; } - -bool -AudioSource::peaks_ready (sigc::slot the_slot, sigc::connection& conn) const +void +AudioSource::touch_peakfile () { - bool ret; - Glib::Mutex::Lock lm (_lock); - - /* check to see if the peak data is ready. if not - connect the slot while still holding the lock. - */ + struct stat statbuf; - if (!(ret = _peaks_built)) { - conn = PeaksReady.connect (the_slot); + if (stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) { + return; } - return ret; + struct utimbuf tbuf; + + tbuf.actime = statbuf.st_atime; + tbuf.modtime = time ((time_t) 0); + + utime (peakpath.c_str(), &tbuf); } int @@ -322,78 +216,92 @@ AudioSource::initialize_peakfile (bool newfile, string audio_path) peakpath = peak_path (audio_path); - /* Nasty band-aid for older sessions that were created before we - used libsndfile for all audio files. - */ - - if (!newfile && access (peakpath.c_str(), R_OK) != 0) { - string str = old_peak_path (audio_path); - if (access (str.c_str(), R_OK) == 0) { - peakpath = str; - } + /* if the peak file should be there, but isn't .... */ + + if (!newfile && !Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) { + peakpath = find_broken_peakfile (peakpath, audio_path); } - if (newfile) { + if (stat (peakpath.c_str(), &statbuf)) { + if (errno != ENOENT) { + /* it exists in the peaks dir, but there is some kind of error */ - if (!_build_peakfiles) { - return 0; + error << string_compose(_("AudioSource: cannot stat peakfile \"%1\""), peakpath) << endmsg; + return -1; } + /* peakfile does not exist */ + _peaks_built = false; } else { - if (stat (peakpath.c_str(), &statbuf)) { - if (errno != ENOENT) { - /* it exists in the peaks dir, but there is some kind of error */ - - error << string_compose(_("AudioSource: cannot stat peakfile \"%1\""), peakpath) << endmsg; - return -1; - } + /* we found it in the peaks dir, so check it out */ - } else { - - /* we found it in the peaks dir */ - } - - if (statbuf.st_size == 0) { + if (statbuf.st_size == 0 || (statbuf.st_size < (off_t) ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) { + // empty _peaks_built = false; } else { // Check if the audio file has changed since the peakfile was built. struct stat stat_file; int err = stat (audio_path.c_str(), &stat_file); - - if (!err && stat_file.st_mtime > statbuf.st_mtime){ + + if (err) { _peaks_built = false; + _peak_byte_max = 0; } else { - _peaks_built = true; + + /* allow 6 seconds slop on checking peak vs. file times because of various + disk action "races" + */ + + if (stat_file.st_mtime > statbuf.st_mtime && (stat_file.st_mtime - statbuf.st_mtime > 6)) { + _peaks_built = false; + _peak_byte_max = 0; + } else { + _peaks_built = true; + _peak_byte_max = statbuf.st_size; + } } } } if (!newfile && !_peaks_built && _build_missing_peakfiles && _build_peakfiles) { build_peaks_from_scratch (); - } + } return 0; } -jack_nframes_t -AudioSource::read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const +framecnt_t +AudioSource::read (Sample *dst, framepos_t start, framecnt_t cnt, int /*channel*/) const { Glib::Mutex::Lock lm (_lock); - return read_unlocked (dst, start, cnt, workbuf); + return read_unlocked (dst, start, cnt); } -jack_nframes_t -AudioSource::write (Sample *dst, jack_nframes_t cnt, char * workbuf) +framecnt_t +AudioSource::write (Sample *dst, framecnt_t cnt) { Glib::Mutex::Lock lm (_lock); - return write_unlocked (dst, cnt, workbuf); + /* any write makes the fill not removable */ + _flags = Flag (_flags & ~Removable); + return write_unlocked (dst, cnt); } -int -AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t start, jack_nframes_t cnt, double samples_per_visual_peak) const +int +AudioSource::read_peaks (PeakData *peaks, framecnt_t npeaks, framepos_t start, framecnt_t cnt, double samples_per_visual_peak) const +{ + return read_peaks_with_fpp (peaks, npeaks, start, cnt, samples_per_visual_peak, _FPP); +} + +/** @param peaks Buffer to write peak data. + * @param npeaks Number of peaks to write. + */ + +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); double scale; @@ -402,26 +310,28 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t PeakData::PeakDatum xmin; int32_t to_read; uint32_t nread; - jack_nframes_t zero_fill = 0; + framecnt_t zero_fill = 0; int ret = -1; PeakData* staging = 0; Sample* raw_staging = 0; - char * workbuf = 0; - int peakfile = -1; - expected_peaks = (cnt / (double) frames_per_peak); + FdFileDescriptor* peakfile_descriptor = new FdFileDescriptor (peakpath, false, 0664); + int peakfile_fd = -1; + + expected_peaks = (cnt / (double) samples_per_file_peak); scale = npeaks/expected_peaks; -#if 0 - cerr << "======>RP: npeaks = " << npeaks - << " start = " << start - << " cnt = " << cnt - << " len = " << _length - << " samples_per_visual_peak =" << samples_per_visual_peak +#undef DEBUG_READ_PEAKS +#ifdef DEBUG_READ_PEAKS + cerr << "======>RP: npeaks = " << npeaks + << " start = " << start + << " cnt = " << cnt + << " len = " << _length + << " samples_per_visual_peak =" << samples_per_visual_peak << " expected was " << expected_peaks << " ... scale = " << scale << " PD ptr = " << peaks < _length - start) { // cerr << "too close to end @ " << _length << " given " << start << " + " << cnt << endl; cnt = _length - start; - jack_nframes_t old = npeaks; - npeaks = min ((jack_nframes_t) floor (cnt / samples_per_visual_peak), npeaks); + framecnt_t old = npeaks; + npeaks = min ((framecnt_t) floor (cnt / samples_per_visual_peak), npeaks); zero_fill = old - npeaks; } // cerr << "actual npeaks = " << npeaks << " zf = " << zero_fill << endl; - + if (npeaks == cnt) { - // cerr << "RAW DATA\n"; - +#ifdef DEBUG_READ_PEAKS + cerr << "RAW DATA\n"; +#endif /* no scaling at all, just get the sample data and duplicate it for both max and min peak values. */ Sample* raw_staging = new Sample[cnt]; - workbuf = new char[cnt*4]; - - if (read_unlocked (raw_staging, start, cnt, workbuf) != cnt) { + + if (read_unlocked (raw_staging, start, cnt) != cnt) { error << _("cannot read sample data for unscaled peak computation") << endmsg; return -1; } - for (jack_nframes_t i = 0; i < npeaks; ++i) { + for (framecnt_t i = 0; i < npeaks; ++i) { peaks[i].max = raw_staging[i]; peaks[i].min = raw_staging[i]; } + delete peakfile_descriptor; delete [] raw_staging; - delete [] workbuf; return 0; } if (scale == 1.0) { - off_t first_peak_byte = (start / frames_per_peak) * sizeof (PeakData); + off_t first_peak_byte = (start / samples_per_file_peak) * sizeof (PeakData); /* open, read, close */ - if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) { - error << string_compose(_("AudioSource: cannot open peakpath \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) { + error << string_compose(_("AudioSource: cannot open peakpath (a) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + delete peakfile_descriptor; return -1; } - // cerr << "DIRECT PEAKS\n"; - - nread = ::pread (peakfile, peaks, sizeof (PeakData)* npeaks, first_peak_byte); - close (peakfile); +#ifdef DEBUG_READ_PEAKS + cerr << "DIRECT PEAKS\n"; +#endif + + nread = ::pread (peakfile_fd, peaks, sizeof (PeakData)* npeaks, first_peak_byte); + delete peakfile_descriptor; if (nread != sizeof (PeakData) * npeaks) { cerr << "AudioSource[" << _name - << "]: cannot read peaks from peakfile! (read only " + << "]: cannot read peaks from peakfile! (read only " << nread - << " not " + << " not " << npeaks - << "at sample " + << "at sample " << start << " = byte " << first_peak_byte << ')' << endl; + delete peakfile_descriptor; return -1; } @@ -498,16 +412,18 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); } + delete peakfile_descriptor; return 0; } - jack_nframes_t tnp; + framecnt_t tnp; if (scale < 1.0) { - // cerr << "DOWNSAMPLE\n"; - +#ifdef DEBUG_READ_PEAKS + cerr << "DOWNSAMPLE\n"; +#endif /* the caller wants: - more frames-per-peak (lower resolution) than the peakfile, or to put it another way, @@ -515,23 +431,23 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t So, read a block into a staging area, and then downsample from there. - to avoid confusion, I'll refer to the requested peaks as visual_peaks and the peakfile peaks as stored_peaks + to avoid confusion, I'll refer to the requested peaks as visual_peaks and the peakfile peaks as stored_peaks */ - const uint32_t chunksize = (uint32_t) min (expected_peaks, 4096.0); + const framecnt_t chunksize = (framecnt_t) min (expected_peaks, 65536.0); staging = new PeakData[chunksize]; - + /* compute the rounded up frame position */ - - jack_nframes_t current_frame = start; - jack_nframes_t current_stored_peak = (jack_nframes_t) ceil (current_frame / (double) frames_per_peak); - uint32_t next_visual_peak = (uint32_t) ceil (current_frame / samples_per_visual_peak); - double next_visual_peak_frame = next_visual_peak * samples_per_visual_peak; - uint32_t stored_peak_before_next_visual_peak = (jack_nframes_t) next_visual_peak_frame / frames_per_peak; - uint32_t nvisual_peaks = 0; - uint32_t stored_peaks_read = 0; - uint32_t i = 0; + + framepos_t current_frame = start; + framepos_t current_stored_peak = (framepos_t) ceil (current_frame / (double) samples_per_file_peak); + framepos_t next_visual_peak = (framepos_t) ceil (current_frame / samples_per_visual_peak); + double next_visual_peak_frame = next_visual_peak * samples_per_visual_peak; + framepos_t stored_peak_before_next_visual_peak = (framepos_t) next_visual_peak_frame / samples_per_file_peak; + framecnt_t nvisual_peaks = 0; + framecnt_t stored_peaks_read = 0; + framecnt_t i = 0; /* handle the case where the initial visual peak is on a pixel boundary */ @@ -539,8 +455,10 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t /* open ... close during out: handling */ - if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) { - error << string_compose(_("AudioSource: cannot open peakpath \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) { + error << string_compose(_("AudioSource: cannot open peakpath (b) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + delete peakfile_descriptor; + delete [] staging; return 0; } @@ -549,13 +467,18 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t if (i == stored_peaks_read) { uint32_t start_byte = current_stored_peak * sizeof(PeakData); - tnp = min ((_length/frames_per_peak - current_stored_peak), (jack_nframes_t) expected_peaks); + tnp = min ((framecnt_t)(_length/samples_per_file_peak - current_stored_peak), (framecnt_t) expected_peaks); to_read = min (chunksize, tnp); - - off_t fend = lseek (peakfile, 0, SEEK_END); - - if ((nread = ::pread (peakfile, staging, sizeof (PeakData) * to_read, start_byte)) + +#ifdef DEBUG_READ_PEAKS + cerr << "read " << sizeof (PeakData) * to_read << " from peakfile @ " << start_byte << endl; +#endif + + if ((nread = ::pread (peakfile_fd, staging, sizeof (PeakData) * to_read, start_byte)) != sizeof (PeakData) * to_read) { + + off_t fend = lseek (peakfile_fd, 0, SEEK_END); + cerr << "AudioSource[" << _name << "]: cannot read peak data from peakfile (" @@ -565,9 +488,9 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t << ") (" << strerror (errno) << ')' - << " at start_byte = " << start_byte + << " at start_byte = " << start_byte << " _length = " << _length << " versus len = " << fend - << " expected maxpeaks = " << (_length - current_frame)/frames_per_peak + << " expected maxpeaks = " << (_length - current_frame)/samples_per_file_peak << " npeaks was " << npeaks << endl; goto out; @@ -596,20 +519,21 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t //next_visual_peak_frame = min ((next_visual_peak * samples_per_visual_peak), (next_visual_peak_frame+samples_per_visual_peak) ); next_visual_peak_frame = min ((double) start+cnt, (next_visual_peak_frame+samples_per_visual_peak) ); - stored_peak_before_next_visual_peak = (uint32_t) next_visual_peak_frame / frames_per_peak; + stored_peak_before_next_visual_peak = (uint32_t) next_visual_peak_frame / samples_per_file_peak; } if (zero_fill) { - memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); - } - + memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); + } + ret = 0; } else { - - // cerr << "UPSAMPLE\n"; - /* the caller wants +#ifdef DEBUG_READ_PEAKS + cerr << "UPSAMPLE\n"; +#endif + /* the caller wants - less frames-per-peak (more resolution) - more peaks than stored in the Peakfile @@ -618,15 +542,14 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t data on the fly. */ - jack_nframes_t frames_read = 0; - jack_nframes_t current_frame = start; - jack_nframes_t i = 0; - jack_nframes_t nvisual_peaks = 0; - jack_nframes_t chunksize = (jack_nframes_t) min (cnt, (jack_nframes_t) 4096); + framecnt_t frames_read = 0; + framepos_t current_frame = start; + framecnt_t i = 0; + framecnt_t nvisual_peaks = 0; + framecnt_t chunksize = (framecnt_t) min (cnt, (framecnt_t) 4096); raw_staging = new Sample[chunksize]; - workbuf = new char[chunksize *4]; - - jack_nframes_t frame_pos = start; + + framepos_t frame_pos = start; double pixel_pos = floor (frame_pos / samples_per_visual_peak); double next_pixel_pos = ceil (frame_pos / samples_per_visual_peak); double pixels_per_frame = 1.0 / samples_per_visual_peak; @@ -637,19 +560,36 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t while (nvisual_peaks < npeaks) { if (i == frames_read) { - - to_read = min (chunksize, (_length - current_frame)); - - if ((frames_read = read_unlocked (raw_staging, current_frame, to_read, workbuf)) == 0) { - error << string_compose(_("AudioSource[%1]: peak read - cannot read %2 samples at offset %3") - , _name, to_read, current_frame) - << endmsg; - goto out; - } + to_read = min (chunksize, (framecnt_t)(_length - current_frame)); + + if (current_frame >= _length) { + + /* hmm, error condition - we've reached the end of the file + without generating all the peak data. cook up a zero-filled + data buffer and then use it. this is simpler than + 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)) + << endmsg; + goto out; + } + } + i = 0; } - + xmax = max (xmax, raw_staging[i]); xmin = min (xmin, raw_staging[i]); ++i; @@ -667,7 +607,7 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t next_pixel_pos = ceil (pixel_pos + 0.5); } } - + if (zero_fill) { memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); } @@ -676,224 +616,345 @@ AudioSource::read_peaks (PeakData *peaks, jack_nframes_t npeaks, jack_nframes_t } out: - if (peakfile >= 0) { - close (peakfile); - } + delete peakfile_descriptor; - if (staging) { - delete [] staging; - } + delete [] staging; + delete [] raw_staging; - if (raw_staging) { - delete [] raw_staging; - } +#ifdef DEBUG_READ_PEAKS + cerr << "RP DONE\n"; +#endif - if (workbuf) { - delete [] workbuf; - } - return ret; } #undef DEBUG_PEAK_BUILD int -AudioSource::build_peaks () +AudioSource::build_peaks_from_scratch () { - vector built; - int status = -1; - bool pr_signal = false; - list copy; + Sample* buf = 0; + + const framecnt_t bufsize = 65536; // 256kB per disk read for mono data is about ideal + + int ret = -1; { - Glib::Mutex::Lock lm (_lock); - copy = pending_peak_builds; - pending_peak_builds.clear (); - } - -#ifdef DEBUG_PEAK_BUILD - cerr << "build peaks with " << copy.size() << " requests pending\n"; -#endif + /* hold lock while building peaks */ - for (list::iterator i = copy.begin(); i != copy.end(); ++i) { - - if ((status = do_build_peak ((*i)->frame, (*i)->cnt)) != 0) { - unlink (peakpath.c_str()); - break; + Glib::Mutex::Lock lp (_lock); + + if (prepare_for_peakfile_writes ()) { + goto out; } - built.push_back (new PeakBuildRecord (*(*i))); - delete *i; - } - { - Glib::Mutex::Lock lm (_lock); + framecnt_t current_frame = 0; + framecnt_t cnt = _length; + + _peaks_built = false; + buf = new Sample[bufsize]; + + while (cnt) { - if (status == 0) { - _peaks_built = true; - - if (next_peak_clear_should_notify) { - next_peak_clear_should_notify = false; - pr_signal = true; + 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); + goto out; + } + + if (compute_and_write_peaks (buf, current_frame, frames_read, true, false, _FPP)) { + break; } + + current_frame += frames_read; + cnt -= frames_read; } - } - if (status == 0) { - for (vector::iterator i = built.begin(); i != built.end(); ++i) { - PeakRangeReady ((*i)->frame, (*i)->cnt); /* EMIT SIGNAL */ - delete *i; + if (cnt == 0) { + /* success */ + truncate_peakfile(); } - if (pr_signal) { - PeaksReady (); /* EMIT SIGNAL */ + done_with_peakfile_writes ((cnt == 0)); + if (cnt == 0) { + ret = 0; } } - return status; + out: + if (ret) { + unlink (peakpath.c_str()); + } + + delete [] buf; + + return ret; } int -AudioSource::do_build_peak (jack_nframes_t first_frame, jack_nframes_t cnt) +AudioSource::prepare_for_peakfile_writes () { - jack_nframes_t current_frame; - Sample buf[frames_per_peak]; - Sample xmin, xmax; - uint32_t peaki; - PeakData* peakbuf; - char * workbuf = 0; - jack_nframes_t frames_read; - jack_nframes_t frames_to_read; - off_t first_peak_byte; - int peakfile = -1; - int ret = -1; + _peakfile_descriptor = new FdFileDescriptor (peakpath, true, 0664); + if ((_peakfile_fd = _peakfile_descriptor->allocate()) < 0) { + error << string_compose(_("AudioSource: cannot open peakpath (c) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + return -1; + } + return 0; +} -#ifdef DEBUG_PEAK_BUILD - cerr << pthread_self() << ": " << _name << ": building peaks for " << first_frame << " to " << first_frame + cnt - 1 << endl; -#endif +void +AudioSource::done_with_peakfile_writes (bool done) +{ + if (peak_leftover_cnt) { + compute_and_write_peaks (0, 0, 0, true, false, _FPP); + } - first_peak_byte = (first_frame / frames_per_peak) * sizeof (PeakData); + if (done) { + Glib::Mutex::Lock lm (_peaks_ready_lock); + _peaks_built = true; + PeaksReady (); /* EMIT SIGNAL */ + } -#ifdef DEBUG_PEAK_BUILD - cerr << "seeking to " << first_peak_byte << " before writing new peak data\n"; -#endif + delete _peakfile_descriptor; + _peakfile_descriptor = 0; +} - current_frame = first_frame; - peakbuf = new PeakData[(cnt/frames_per_peak)+1]; - peaki = 0; +/** @param first_frame Offset from the source start of the first frame to process */ +int +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); +} - workbuf = new char[max(frames_per_peak, cnt) * 4]; - - if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) { - error << string_compose(_("AudioSource: cannot open peakpath \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; - return -1; +int +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; + framecnt_t to_do; + uint32_t peaks_computed; + PeakData* peakbuf = 0; + int ret = -1; + framepos_t current_frame; + framecnt_t frames_done; + const size_t blocksize = (128 * 1024); + off_t first_peak_byte; + + if (_peakfile_descriptor == 0) { + prepare_for_peakfile_writes (); } - - while (cnt) { - frames_to_read = min (frames_per_peak, cnt); + restart: + if (peak_leftover_cnt) { - /* lock for every read */ + if (first_frame != peak_leftover_frame + peak_leftover_cnt) { - if ((frames_read = read (buf, current_frame, frames_to_read, workbuf)) != frames_to_read) { - error << string_compose(_("%1: could not write read raw data for peak computation (%2)"), _name, strerror (errno)) << endmsg; - goto out; + /* uh-oh, ::seek() since the last ::compute_and_write_peaks(), + and we have leftovers. flush a single peak (since the leftovers + never represent more than that, and restart. + */ + + PeakData x; + + x.min = peak_leftovers[0]; + x.max = peak_leftovers[0]; + + off_t byte = (peak_leftover_frame / fpp) * sizeof (PeakData); + + if (::pwrite (_peakfile_fd, &x, sizeof (PeakData), byte) != sizeof (PeakData)) { + error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg; + goto out; + } + + _peak_byte_max = max (_peak_byte_max, (off_t) (byte + sizeof(PeakData))); + + { + Glib::Mutex::Lock lm (_peaks_ready_lock); + PeakRangeReady (peak_leftover_frame, peak_leftover_cnt); /* EMIT SIGNAL */ + if (intermediate_peaks_ready) { + PeaksReady (); /* EMIT SIGNAL */ + } + } + + /* left overs are done */ + + peak_leftover_cnt = 0; + goto restart; } - xmin = buf[0]; - xmax = buf[0]; + /* else ... had leftovers, but they immediately preceed the new data, so just + merge them and compute. + */ + + /* make a new contiguous buffer containing leftovers and the new stuff */ + + to_do = cnt + peak_leftover_cnt; + buf2 = new Sample[to_do]; + + /* the remnants */ + memcpy (buf2, peak_leftovers, peak_leftover_cnt * sizeof (Sample)); + + /* the new stuff */ + memcpy (buf2+peak_leftover_cnt, buf, cnt * sizeof (Sample)); + + /* no more leftovers */ + peak_leftover_cnt = 0; + + /* use the temporary buffer */ + buf = buf2; + + /* make sure that when we write into the peakfile, we startup where we left off */ - for (jack_nframes_t n = 1; n < frames_read; ++n) { - xmax = max (xmax, buf[n]); - xmin = min (xmin, buf[n]); + first_frame = peak_leftover_frame; -// if (current_frame < frames_read) { -// cerr << "sample = " << buf[n] << " max = " << xmax << " min = " << xmin << " max of 2 = " << max (xmax, buf[n]) << endl; -// } + } else { + to_do = cnt; + } + + peakbuf = new PeakData[(to_do/fpp)+1]; + peaks_computed = 0; + current_frame = first_frame; + frames_done = 0; + + while (to_do) { + + /* if some frames were passed in (i.e. we're not flushing leftovers) + and there are less than fpp to do, save them till + next time + */ + + if (force && (to_do < fpp)) { + /* keep the left overs around for next time */ + + if (peak_leftover_size < to_do) { + delete [] peak_leftovers; + peak_leftovers = new Sample[to_do]; + peak_leftover_size = to_do; + } + memcpy (peak_leftovers, buf, to_do * sizeof (Sample)); + peak_leftover_cnt = to_do; + peak_leftover_frame = current_frame; + + /* done for now */ + + break; } - peakbuf[peaki].max = xmax; - peakbuf[peaki].min = xmin; - peaki++; + framecnt_t this_time = min (fpp, to_do); + + peakbuf[peaks_computed].max = buf[0]; + peakbuf[peaks_computed].min = buf[0]; + + ARDOUR::find_peaks (buf+1, this_time-1, &peakbuf[peaks_computed].min, &peakbuf[peaks_computed].max); + + peaks_computed++; + buf += this_time; + to_do -= this_time; + frames_done += this_time; + current_frame += this_time; + } + + first_peak_byte = (first_frame / fpp) * sizeof (PeakData); + + if (can_truncate_peaks()) { + + /* on some filesystems (ext3, at least) this helps to reduce fragmentation of + the peakfiles. its not guaranteed to do so, and even on ext3 (as of december 2006) + it does not cause single-extent allocation even for peakfiles of + less than BLOCKSIZE bytes. only call ftruncate if we'll make the file larger. + */ - current_frame += frames_read; - cnt -= frames_read; + off_t endpos = lseek (_peakfile_fd, 0, SEEK_END); + 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 (::pwrite (peakfile, peakbuf, sizeof (PeakData) * peaki, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaki)) { + if (::pwrite (_peakfile_fd, peakbuf, sizeof (PeakData) * peaks_computed, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaks_computed)) { error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg; goto out; } + _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); + PeakRangeReady (first_frame, frames_done); /* EMIT SIGNAL */ + if (intermediate_peaks_ready) { + PeaksReady (); /* EMIT SIGNAL */ + } + } + ret = 0; out: delete [] peakbuf; - if (peakfile >= 0) { - close (peakfile); - } - if (workbuf) - delete [] workbuf; + delete [] buf2; + return ret; } void -AudioSource::build_peaks_from_scratch () +AudioSource::truncate_peakfile () { - Glib::Mutex::Lock lp (_lock); + if (_peakfile_descriptor == 0) { + error << string_compose (_("programming error: %1"), "AudioSource::truncate_peakfile() called without open peakfile descriptor") + << endmsg; + return; + } - next_peak_clear_should_notify = true; - pending_peak_builds.push_back (new PeakBuildRecord (0, _length)); - queue_for_peaks (*this); -} + /* truncate the peakfile down to its natural length if necessary */ -bool -AudioSource::file_changed (string path) -{ - struct stat stat_file; - struct stat stat_peak; - - int e1 = stat (path.c_str(), &stat_file); - int e2 = stat (peak_path(path).c_str(), &stat_peak); - - if (!e1 && !e2 && stat_file.st_mtime > stat_peak.st_mtime){ - return true; - } else { - return false; + off_t end = lseek (_peakfile_fd, 0, SEEK_END); + + if (end > _peak_byte_max) { + (void) ftruncate (_peakfile_fd, _peak_byte_max); } } -jack_nframes_t +framecnt_t AudioSource::available_peaks (double zoom_factor) const { - int peakfile; - off_t end; + if (zoom_factor < _FPP) { + return length(_timeline_position); // peak data will come from the audio file + } - if (zoom_factor < frames_per_peak) { - return length(); // peak data will come from the audio file - } - - /* peak data comes from peakfile */ + /* peak data comes from peakfile, but the filesize might not represent + the valid data due to ftruncate optimizations, so use _peak_byte_max state. + XXX - there might be some atomicity issues here, we should probably add a lock, + but _peak_byte_max only monotonically increases after initialization. + */ - if ((peakfile = ::open (peakpath.c_str(), O_RDONLY)) < 0) { - error << string_compose(_("AudioSource: cannot open peakpath \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; - return 0; - } + off_t end = _peak_byte_max; - { - Glib::Mutex::Lock lm (_lock); - end = lseek (peakfile, 0, SEEK_END); - } + return (end/sizeof(PeakData)) * _FPP; +} - close (peakfile); +void +AudioSource::dec_read_data_count (framecnt_t cnt) +{ + uint32_t val = cnt * sizeof (Sample); - return (end/sizeof(PeakData)) * frames_per_peak; + if (val < _read_data_count) { + _read_data_count -= val; + } else { + _read_data_count = 0; + } } void -AudioSource::update_length (jack_nframes_t pos, jack_nframes_t cnt) +AudioSource::mark_streaming_write_completed () { - if (pos + cnt > _length) { - _length = pos+cnt; + Glib::Mutex::Lock lm (_peaks_ready_lock); + + if (_peaks_built) { + PeaksReady (); /* EMIT SIGNAL */ } } -