X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiosource.cc;h=65540d4e3dd153a8b00e9caa9068f36a143ea0bb;hb=bb8cb93789b2eec65e4d82e5ceb64054673cbc4f;hp=78e3cd2c6bc56db622b0fe77d922f0b4d42ac8d2;hpb=d64faaa4b1c07c20bf575396b743753a7a043d52;p=ardour.git diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index 78e3cd2c6b..65540d4e3d 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 @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -31,25 +30,33 @@ #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/rc_configuration.h" #include "ardour/runtime_functions.h" #include "i18n.h" +#include "ardour/debug.h" + 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,35 +64,31 @@ 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 = -1; - _read_data_count = 0; - _write_data_count = 0; + _peakfile_descriptor = 0; peak_leftover_cnt = 0; peak_leftover_size = 0; peak_leftovers = 0; } -AudioSource::AudioSource (Session& s, const XMLNode& node) +AudioSource::AudioSource (Session& s, const XMLNode& node) : Source (s, node) , _length (0) { - + _peaks_built = false; _peak_byte_max = 0; - peakfile = -1; - _read_data_count = 0; - _write_data_count = 0; + _peakfile_descriptor = 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(); } } @@ -93,15 +96,12 @@ AudioSource::AudioSource (Session& s, const XMLNode& node) 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; } - if (peakfile >= 0) { - ::close (peakfile); - } - + delete _peakfile_descriptor; delete [] peak_leftovers; } @@ -118,7 +118,7 @@ AudioSource::get_state () } int -AudioSource::set_state (const XMLNode& node) +AudioSource::set_state (const XMLNode& node, int /*version*/) { const XMLProperty* prop; @@ -129,17 +129,23 @@ AudioSource::set_state (const XMLNode& node) return 0; } -sframes_t -AudioSource::length (sframes_t /*pos*/) const +bool +AudioSource::empty () const +{ + return _length == 0; +} + +framecnt_t +AudioSource::length (framepos_t /*pos*/) const { return _length; } void -AudioSource::update_length (sframes_t pos, sframes_t cnt) +AudioSource::update_length (framecnt_t len) { - if (pos + cnt > _length) { - _length = pos + cnt; + if (len > _length) { + _length = len; } } @@ -148,18 +154,24 @@ AudioSource::update_length (sframes_t pos, sframes_t cnt) PEAK FILE STUFF ***********************************************************************/ +/** 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 (sigc::slot the_slot, sigc::connection& conn) const +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)) { - conn = PeaksReady.connect (the_slot); + *connect_here_if_not = new ScopedConnection; + PeaksReady.connect (**connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop); } return ret; @@ -170,27 +182,27 @@ AudioSource::touch_peakfile () { struct stat statbuf; - if (stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) { + if (g_stat (peakpath.c_str(), &statbuf) != 0 || statbuf.st_size == 0) { return; } - + struct utimbuf tbuf; - + tbuf.actime = statbuf.st_atime; - tbuf.modtime = time ((time_t) 0); - - utime (peakpath.c_str(), &tbuf); + tbuf.modtime = time ((time_t*) 0); + + g_utime (peakpath.c_str(), &tbuf); } 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 (rename (oldpath.c_str(), newpath.c_str()) != 0) { + if (Glib::file_test (oldpath, Glib::FILE_TEST_EXISTS)) { + if (g_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; } @@ -202,45 +214,54 @@ AudioSource::rename_peakfile (ustring newpath) } int -AudioSource::initialize_peakfile (bool newfile, ustring audio_path) +AudioSource::initialize_peakfile (string audio_path) { struct stat statbuf; peakpath = peak_path (audio_path); + DEBUG_TRACE(DEBUG::Peaks, string_compose ("Initialize Peakfile %1 for Audio file %2\n", peakpath, audio_path)); + /* if the peak file should be there, but isn't .... */ - - if (!newfile && !Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) { + + if (!empty() && !Glib::file_test (peakpath.c_str(), Glib::FILE_TEST_EXISTS)) { peakpath = find_broken_peakfile (peakpath, audio_path); } - if (stat (peakpath.c_str(), &statbuf)) { + if (g_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; } - /* peakfile does not exist */ - + DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 does not exist\n", peakpath)); + _peaks_built = false; - + } else { - + /* 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)))) { - // empty + + if (statbuf.st_size == 0 || (statbuf.st_size < (off_t) ((length(_timeline_position) / _FPP) * sizeof (PeakData)))) { + DEBUG_TRACE(DEBUG::Peaks, string_compose("Peakfile %1 is empty\n", peakpath)); _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) { - _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. + */ + DEBUG_TRACE(DEBUG::Peaks, string_compose("Error when calling stat on Peakfile %1\n", peakpath)); + + _peaks_built = true; + _peak_byte_max = statbuf.st_size; + } else { /* allow 6 seconds slop on checking peak vs. file times because of various @@ -258,29 +279,33 @@ AudioSource::initialize_peakfile (bool newfile, ustring audio_path) } } - if (!newfile && !_peaks_built && _build_missing_peakfiles && _build_peakfiles) { + if (!empty() && !_peaks_built && _build_missing_peakfiles && _build_peakfiles) { build_peaks_from_scratch (); - } - + } + return 0; } -nframes_t -AudioSource::read (Sample *dst, sframes_t start, nframes_t cnt, int /*channel*/) const +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); } -nframes_t -AudioSource::write (Sample *dst, nframes_t 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); } int -AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt, double samples_per_visual_peak) const +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); } @@ -289,107 +314,89 @@ AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, sframes_t start, nfr * @param npeaks Number of peaks to write. */ -int -AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt, - double samples_per_visual_peak, nframes_t samples_per_file_peak) const +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; PeakData::PeakDatum xmin; int32_t to_read; uint32_t nread; - nframes_t zero_fill = 0; - int ret = -1; - PeakData* staging = 0; - Sample* raw_staging = 0; - int _peakfile = -1; + framecnt_t zero_fill = 0; + + boost::scoped_ptr peakfile_descriptor(new FdFileDescriptor (peakpath, false, 0664)); + int peakfile_fd = -1; expected_peaks = (cnt / (double) samples_per_file_peak); scale = npeaks/expected_peaks; -#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 - <RP: npeaks = %1 start = %2 cnt = %3 len = %4 samples_per_visual_peak = %5 expected was %6 ... scale = %7 PD ptr = %8\n" + , npeaks, start, cnt, _length, samples_per_visual_peak, expected_peaks, scale, peaks)); /* fix for near-end-of-file conditions */ if (cnt > _length - start) { // cerr << "too close to end @ " << _length << " given " << start << " + " << cnt << endl; cnt = _length - start; - nframes_t old = npeaks; - npeaks = min ((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) { -#ifdef DEBUG_READ_PEAKS - cerr << "RAW DATA\n"; -#endif + DEBUG_TRACE (DEBUG::Peaks, "RAW DATA\n"); + /* 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]; - - if (read_unlocked (raw_staging, start, cnt) != cnt) { + boost::scoped_array raw_staging(new Sample[cnt]); + + if (read_unlocked (raw_staging.get(), start, cnt) != cnt) { error << _("cannot read sample data for unscaled peak computation") << endmsg; return -1; } - for (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 [] raw_staging; return 0; } if (scale == 1.0) { + off_t offset = 0; off_t first_peak_byte = (start / samples_per_file_peak) * sizeof (PeakData); - + ssize_t bytes_to_read = sizeof (PeakData)* npeaks; /* open, read, close */ - if ((_peakfile = ::open (peakpath.c_str(), O_RDONLY, 0664)) < 0) { + if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) { error << string_compose(_("AudioSource: cannot open peakpath (a) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; return -1; } -#ifdef DEBUG_READ_PEAKS - cerr << "DIRECT PEAKS\n"; -#endif - - nread = ::pread (_peakfile, peaks, sizeof (PeakData)* npeaks, first_peak_byte); - close (_peakfile); - - if (nread != sizeof (PeakData) * npeaks) { - cerr << "AudioSource[" - << _name - << "]: cannot read peaks from peakfile! (read only " - << nread - << " not " - << npeaks - << "at sample " - << start - << " = byte " - << first_peak_byte - << ')' - << endl; + DEBUG_TRACE (DEBUG::Peaks, "DIRECT PEAKS\n"); + + offset = lseek (peakfile_fd, first_peak_byte, SEEK_SET); + + if (offset != first_peak_byte) { + error << string_compose(_("AudioSource: could not seek to correct location in peak file \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + return -1; + } + + nread = ::read (peakfile_fd, peaks, bytes_to_read); + + if (nread != bytes_to_read) { + DEBUG_TRACE (DEBUG::Peaks, string_compose ("[%1]: Cannot read peaks from peakfile! (read only %2 not %3 at sample %4 = byte %5 )\n" + , _name, nread, npeaks, start, first_peak_byte)); return -1; } @@ -401,13 +408,12 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s } - nframes_t tnp; + framecnt_t tnp; if (scale < 1.0) { -#ifdef DEBUG_READ_PEAKS - cerr << "DOWNSAMPLE\n"; -#endif + DEBUG_TRACE (DEBUG::Peaks, "DOWNSAMPLE\n"); + /* the caller wants: - more frames-per-peak (lower resolution) than the peakfile, or to put it another way, @@ -415,23 +421,23 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s 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, 65536.0); - - staging = new PeakData[chunksize]; - + const framecnt_t chunksize = (framecnt_t) min (expected_peaks, 65536.0); + + boost::scoped_array staging(new PeakData[chunksize]); + /* compute the rounded up frame position */ - - nframes_t current_frame = start; - nframes_t current_stored_peak = (nframes_t) ceil (current_frame / (double) samples_per_file_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 = (nframes_t) next_visual_peak_frame / samples_per_file_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 */ @@ -439,7 +445,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s /* open ... close during out: handling */ - if ((_peakfile = ::open (peakpath.c_str(), O_RDONLY, 0664)) < 0) { + if ((peakfile_fd = peakfile_descriptor->allocate ()) < 0) { error << string_compose(_("AudioSource: cannot open peakpath (b) \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; return 0; } @@ -449,39 +455,33 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s if (i == stored_peaks_read) { uint32_t start_byte = current_stored_peak * sizeof(PeakData); - tnp = min ((nframes_t)(_length/samples_per_file_peak - current_stored_peak), (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); - -#ifdef DEBUG_READ_PEAKS - cerr << "read " << sizeof (PeakData) * to_read << " from peakfile @ " << start_byte << endl; -#endif - - if ((nread = ::pread (_peakfile, staging, sizeof (PeakData) * to_read, start_byte)) - != sizeof (PeakData) * to_read) { - - off_t fend = lseek (_peakfile, 0, SEEK_END); - - cerr << "AudioSource[" - << _name - << "]: cannot read peak data from peakfile (" - << (nread / sizeof(PeakData)) - << " peaks instead of " - << to_read - << ") (" - << strerror (errno) - << ')' - << " at start_byte = " << start_byte - << " _length = " << _length << " versus len = " << fend - << " expected maxpeaks = " << (_length - current_frame)/samples_per_file_peak - << " npeaks was " << npeaks - << endl; - goto out; + ssize_t bytes_to_read = sizeof (PeakData) * to_read; + + DEBUG_TRACE (DEBUG::Peaks, string_compose ("reading %1 bytes from peakfile @ %2\n" + , bytes_to_read, start_byte)); + + + off_t offset = lseek (peakfile_fd, start_byte, SEEK_SET); + + if (offset != start_byte) { + error << string_compose(_("AudioSource: could not seek to correct location in peak file \"%1\" (%2)"), peakpath, strerror (errno)) << endmsg; + return -1; + } + + if ((nread = ::read (peakfile_fd, staging.get(), bytes_to_read)) != bytes_to_read) { + + off_t fend = lseek (peakfile_fd, 0, SEEK_END); + + DEBUG_TRACE (DEBUG::Peaks, string_compose ("[%1]: cannot read peak data from peakfile (%2 peaks instead of %3) (%4) at start_byte = %5 _length = %6 versus len = %7 expected maxpeaks = %8 npeaks was %9" + , _name, (nread / sizeof(PeakData)), to_read, g_strerror (errno), start_byte, _length, fend, ((_length - current_frame)/samples_per_file_peak), npeaks)); + return -1; } - i = 0; stored_peaks_read = nread / sizeof(PeakData); } - + xmax = -1.0; xmin = 1.0; @@ -501,21 +501,18 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s //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 / samples_per_file_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); - } - - ret = 0; + memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); + } } else { - -#ifdef DEBUG_READ_PEAKS - cerr << "UPSAMPLE\n"; -#endif - /* the caller wants + + DEBUG_TRACE (DEBUG::Peaks, "UPSAMPLE\n"); + + /* the caller wants - less frames-per-peak (more resolution) - more peaks than stored in the Peakfile @@ -524,14 +521,14 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s data on the fly. */ - nframes_t frames_read = 0; - nframes_t current_frame = start; - nframes_t i = 0; - nframes_t nvisual_peaks = 0; - nframes_t chunksize = (nframes_t) min (cnt, (nframes_t) 4096); - raw_staging = new Sample[chunksize]; - - nframes_t frame_pos = start; + 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); + boost::scoped_array raw_staging(new Sample[chunksize]); + + 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; @@ -543,27 +540,35 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s if (i == frames_read) { - to_read = min (chunksize, nframes_t(_length - current_frame)); + to_read = min (chunksize, (framecnt_t)(_length - current_frame)); - if (to_read == 0) { - /* XXX ARGH .. out by one error ... need to figure out why this happens - and fix it rather than do this band-aid move. + 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 */ - zero_fill = npeaks - nvisual_peaks; - npeaks -= zero_fill; - break; - } - 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; - } - + memset (raw_staging.get(), 0, sizeof (Sample) * chunksize); + + } else { + + to_read = min (chunksize, (_length - current_frame)); + + + if ((frames_read = read_unlocked (raw_staging.get(), 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; + return -1; + } + } + i = 0; } - + xmax = max (xmax, raw_staging[i]); xmin = min (xmin, raw_staging[i]); ++i; @@ -581,71 +586,55 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s next_pixel_pos = ceil (pixel_pos + 0.5); } } - + if (zero_fill) { memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); } - - ret = 0; } - out: - if (_peakfile >= 0) { - close (_peakfile); - } - - delete [] staging; - delete [] raw_staging; - -#ifdef DEBUG_READ_PEAKS - cerr << "RP DONE\n"; -#endif - - return ret; + DEBUG_TRACE (DEBUG::Peaks, "READPEAKS DONE\n"); + return 0; } -#undef DEBUG_PEAK_BUILD - int AudioSource::build_peaks_from_scratch () { - nframes_t current_frame; - nframes_t cnt; - Sample* buf = 0; - nframes_t frames_read; - nframes_t frames_to_read; - const nframes_t bufsize = 65536; // 256kB per disk read for mono data is about ideal + const framecnt_t bufsize = 65536; // 256kB per disk read for mono data is about ideal + + DEBUG_TRACE (DEBUG::Peaks, "Building peaks from scratch\n"); int ret = -1; { /* hold lock while building peaks */ - Glib::Mutex::Lock lp (_lock); - + Glib::Threads::Mutex::Lock lp (_lock); + if (prepare_for_peakfile_writes ()) { goto out; } - - current_frame = 0; - cnt = _length; + + framecnt_t current_frame = 0; + framecnt_t cnt = _length; + _peaks_built = false; - buf = new Sample[bufsize]; + boost::scoped_array buf(new Sample[bufsize]); while (cnt) { - - frames_to_read = min (bufsize, cnt); - if ((frames_read = read_unlocked (buf, current_frame, frames_to_read)) != frames_to_read) { + framecnt_t frames_to_read = min (bufsize, cnt); + framecnt_t frames_read; + + if ((frames_read = read_unlocked (buf.get(), 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)) { + if (compute_and_write_peaks (buf.get(), current_frame, frames_read, true, false, _FPP)) { break; } - + current_frame += frames_read; cnt -= frames_read; } @@ -653,34 +642,28 @@ AudioSource::build_peaks_from_scratch () if (cnt == 0) { /* success */ truncate_peakfile(); - } + } done_with_peakfile_writes ((cnt == 0)); - } - - { - Glib::Mutex::Lock lm (_peaks_ready_lock); - - if (_peaks_built) { - PeaksReady (); /* EMIT SIGNAL */ + if (cnt == 0) { ret = 0; } } out: if (ret) { - unlink (peakpath.c_str()); + DEBUG_TRACE (DEBUG::Peaks, string_compose("Could not write peak data, attempting to remove peakfile %1\n", peakpath)); + ::g_unlink (peakpath.c_str()); } - delete [] buf; - return ret; } int AudioSource::prepare_for_peakfile_writes () { - if ((peakfile = ::open (peakpath.c_str(), O_RDWR|O_CREAT, 0664)) < 0) { + _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; } @@ -693,39 +676,38 @@ AudioSource::done_with_peakfile_writes (bool done) if (peak_leftover_cnt) { compute_and_write_peaks (0, 0, 0, true, false, _FPP); } - + if (done) { + Glib::Threads::Mutex::Lock lm (_peaks_ready_lock); _peaks_built = true; + PeaksReady (); /* EMIT SIGNAL */ } - if (peakfile >= 0) { - close (peakfile); - peakfile = -1; - } + 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, sframes_t first_frame, nframes_t cnt, - bool force, bool intermediate_peaks_ready) +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, sframes_t first_frame, nframes_t cnt, - bool force, bool intermediate_peaks_ready, nframes_t fpp) +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; - nframes_t to_do; + framecnt_t to_do; uint32_t peaks_computed; - PeakData* peakbuf = 0; - int ret = -1; - nframes_t current_frame; - nframes_t frames_done; + framepos_t current_frame; + framecnt_t frames_done; const size_t blocksize = (128 * 1024); off_t first_peak_byte; + boost::scoped_array buf2; - if (peakfile < 0) { + if (_peakfile_descriptor == 0) { prepare_for_peakfile_writes (); } @@ -734,31 +716,38 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe if (first_frame != peak_leftover_frame + peak_leftover_cnt) { - /* uh-oh, ::seek() since the last ::compute_and_write_peaks(), + /* 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, &x, sizeof (PeakData), byte) != sizeof (PeakData)) { + off_t offset = lseek (_peakfile_fd, byte, SEEK_SET); + + if (offset != byte) { + error << string_compose(_("%1: could not seek in peak file data (%2)"), _name, strerror (errno)) << endmsg; + return -1; + } + + if (::write (_peakfile_fd, &x, sizeof (PeakData)) != sizeof (PeakData)) { error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg; - goto out; + return -1; } _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 */ - } + } } /* left overs are done */ @@ -774,29 +763,29 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe /* make a new contiguous buffer containing leftovers and the new stuff */ to_do = cnt + peak_leftover_cnt; - buf2 = new Sample[to_do]; + buf2.reset(new Sample[to_do]); /* the remnants */ - memcpy (buf2, peak_leftovers, peak_leftover_cnt * sizeof (Sample)); + memcpy (buf2.get(), peak_leftovers, peak_leftover_cnt * sizeof (Sample)); /* the new stuff */ - memcpy (buf2+peak_leftover_cnt, buf, cnt * sizeof (Sample)); + memcpy (buf2.get()+peak_leftover_cnt, buf, cnt * sizeof (Sample)); /* no more leftovers */ peak_leftover_cnt = 0; /* use the temporary buffer */ - buf = buf2; + buf = buf2.get(); /* make sure that when we write into the peakfile, we startup where we left off */ first_frame = peak_leftover_frame; - + } else { to_do = cnt; } - peakbuf = new PeakData[(to_do/fpp)+1]; + boost::scoped_array peakbuf(new PeakData[(to_do/fpp)+1]); peaks_computed = 0; current_frame = first_frame; frames_done = 0; @@ -824,8 +813,8 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe break; } - - nframes_t this_time = min (fpp, to_do); + + framecnt_t this_time = min (fpp, to_do); peakbuf[peaks_computed].max = buf[0]; peakbuf[peaks_computed].min = buf[0]; @@ -838,54 +827,62 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe 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 + 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. */ - - off_t endpos = lseek (peakfile, 0, SEEK_END); + + off_t endpos = lseek (_peakfile_fd, 0, SEEK_END); off_t target_length = blocksize * ((first_peak_byte + blocksize + 1) / blocksize); - + if (endpos < target_length) { - ftruncate (peakfile, target_length); - /* error doesn't actually matter though, so continue on without testing */ + DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", peakpath)); + if (ftruncate (_peakfile_fd, target_length)) { + /* error doesn't actually matter so continue on without testing */ + } } } - if (::pwrite (peakfile, peakbuf, sizeof (PeakData) * peaks_computed, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaks_computed)) { + + off_t offset = lseek(_peakfile_fd, first_peak_byte, SEEK_SET); + + if (offset != first_peak_byte) { + error << string_compose(_("%1: could not seek in peak file data (%2)"), _name, strerror (errno)) << endmsg; + return -1; + } + + ssize_t bytes_to_write = sizeof (PeakData) * peaks_computed; + + ssize_t bytes_written = ::write (_peakfile_fd, peakbuf.get(), bytes_to_write); + + if (bytes_written != bytes_to_write) { error << string_compose(_("%1: could not write peak file data (%2)"), _name, strerror (errno)) << endmsg; - goto out; + return -1; } - _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + sizeof(PeakData)*peaks_computed)); + _peak_byte_max = max (_peak_byte_max, (off_t) (first_peak_byte + bytes_to_write)); 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 */ } } - ret = 0; - - out: - delete [] peakbuf; - delete [] buf2; - - return ret; + return 0; } void AudioSource::truncate_peakfile () { - if (peakfile < 0) { + if (_peakfile_descriptor == 0) { error << string_compose (_("programming error: %1"), "AudioSource::truncate_peakfile() called without open peakfile descriptor") << endmsg; return; @@ -893,36 +890,24 @@ AudioSource::truncate_peakfile () /* truncate the peakfile down to its natural length if necessary */ - off_t end = lseek (peakfile, 0, SEEK_END); - - if (end > _peak_byte_max) { - ftruncate (peakfile, _peak_byte_max); - } -} - -bool -AudioSource::file_changed (ustring path) -{ - struct stat stat_file; - struct stat stat_peak; + off_t end = lseek (_peakfile_fd, 0, SEEK_END); - 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; + if (end > _peak_byte_max) { + DEBUG_TRACE(DEBUG::Peaks, string_compose ("Truncating Peakfile %1\n", peakpath)); + 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; + } } } -nframes_t +framecnt_t AudioSource::available_peaks (double zoom_factor) const { if (zoom_factor < _FPP) { return length(_timeline_position); // peak data will come from the audio file - } - + } + /* 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, @@ -934,3 +919,58 @@ 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); + + /* this may be called because either "level" or "frame_rate" have + * changed. and it may be called with "level" smaller than the current + * number of buffers, because a new compound region has been created at + * a more shallow level than the deepest one we currently have. + */ + + uint32_t limit = max ((size_t) level, _mixdown_buffers.size()); + + _mixdown_buffers.clear (); + _gain_buffers.clear (); + + for (uint32_t n = 0; n < limit; ++n) { + _mixdown_buffers.push_back (boost::shared_array (new Sample[nframes])); + _gain_buffers.push_back (boost::shared_array (new gain_t[nframes])); + } +}