X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudiosource.cc;h=b993a093b50b0eda3087bee4ac25154c4e08c9f9;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=fd481c973009f2cfb0912e42e2e32c3a596c00b8;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index fd481c9730..b993a093b5 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -48,7 +48,6 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using Glib::ustring; bool AudioSource::_build_missing_peakfiles = false; @@ -57,13 +56,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 = -1; + _peakfile_descriptor = 0; _read_data_count = 0; _write_data_count = 0; peak_leftover_cnt = 0; @@ -78,7 +77,7 @@ AudioSource::AudioSource (Session& s, const XMLNode& node) _peaks_built = false; _peak_byte_max = 0; - peakfile = -1; + _peakfile_descriptor = 0; _read_data_count = 0; _write_data_count = 0; peak_leftover_cnt = 0; @@ -98,10 +97,7 @@ AudioSource::~AudioSource () cerr << "AudioSource destroyed with leftover peak data pending" << endl; } - if (peakfile >= 0) { - ::close (peakfile); - } - + delete _peakfile_descriptor; delete [] peak_leftovers; } @@ -129,14 +125,20 @@ AudioSource::set_state (const XMLNode& node, int /*version*/) 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 (framepos_t pos, framecnt_t cnt) { if (pos + cnt > _length) { _length = pos + cnt; @@ -148,18 +150,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 (boost::function doThisWhenReady, boost::signals2::connection& connect_here_if_not) 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. - */ - if (!(ret = _peaks_built)) { - connect_here_if_not = PeaksReady.connect (doThisWhenReady); + *connect_here_if_not = new ScopedConnection; + PeaksReady.connect (**connect_here_if_not, MISSING_INVALIDATOR, doThisWhenReady, event_loop); } return ret; @@ -183,11 +191,11 @@ 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 (rename (oldpath.c_str(), newpath.c_str()) != 0) { @@ -202,7 +210,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; @@ -230,7 +238,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 { @@ -265,15 +273,15 @@ AudioSource::initialize_peakfile (bool newfile, ustring audio_path) 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); 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); /* any write makes the fill not removable */ @@ -282,7 +290,7 @@ AudioSource::write (Sample *dst, nframes_t 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); } @@ -292,8 +300,8 @@ AudioSource::read_peaks (PeakData *peaks, nframes_t npeaks, sframes_t start, nfr */ 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 +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; @@ -302,11 +310,13 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s PeakData::PeakDatum xmin; int32_t to_read; uint32_t nread; - nframes_t zero_fill = 0; + framecnt_t zero_fill = 0; int ret = -1; PeakData* staging = 0; Sample* raw_staging = 0; - int _peakfile = -1; + + FdFileDescriptor* peakfile_descriptor = new FdFileDescriptor (peakpath, false, 0664); + int peakfile_fd = -1; expected_peaks = (cnt / (double) samples_per_file_peak); scale = npeaks/expected_peaks; @@ -329,8 +339,8 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s 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; } @@ -352,11 +362,12 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s 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 peakfile_descriptor; delete [] raw_staging; return 0; } @@ -367,8 +378,9 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s /* 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; + delete peakfile_descriptor; return -1; } @@ -376,8 +388,8 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s cerr << "DIRECT PEAKS\n"; #endif - nread = ::pread (_peakfile, peaks, sizeof (PeakData)* npeaks, first_peak_byte); - close (_peakfile); + nread = ::pread (peakfile_fd, peaks, sizeof (PeakData)* npeaks, first_peak_byte); + delete peakfile_descriptor; if (nread != sizeof (PeakData) * npeaks) { cerr << "AudioSource[" @@ -392,6 +404,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s << first_peak_byte << ')' << endl; + delete peakfile_descriptor; return -1; } @@ -399,11 +412,12 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s memset (&peaks[npeaks], 0, sizeof (PeakData) * zero_fill); } + delete peakfile_descriptor; return 0; } - nframes_t tnp; + framecnt_t tnp; if (scale < 1.0) { @@ -420,20 +434,20 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s 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); - + const framecnt_t chunksize = (framecnt_t) min (expected_peaks, 65536.0); + 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 */ @@ -441,8 +455,10 @@ 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; + delete peakfile_descriptor; + delete [] staging; return 0; } @@ -451,17 +467,17 @@ 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)) + if ((nread = ::pread (peakfile_fd, staging, sizeof (PeakData) * to_read, start_byte)) != sizeof (PeakData) * to_read) { - off_t fend = lseek (_peakfile, 0, SEEK_END); + off_t fend = lseek (peakfile_fd, 0, SEEK_END); cerr << "AudioSource[" << _name @@ -526,14 +542,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); + 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]; - 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; @@ -545,24 +561,32 @@ 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. - */ - 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; - } + 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; } @@ -592,9 +616,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s } out: - if (_peakfile >= 0) { - close (_peakfile); - } + delete peakfile_descriptor; delete [] staging; delete [] raw_staging; @@ -611,12 +633,9 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t s 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 int ret = -1; @@ -629,14 +648,16 @@ AudioSource::build_peaks_from_scratch () goto out; } - current_frame = 0; - cnt = _length; + framecnt_t current_frame = 0; + framecnt_t cnt = _length; + _peaks_built = false; buf = new Sample[bufsize]; while (cnt) { - frames_to_read = min (bufsize, cnt); + 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; @@ -658,13 +679,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; } } @@ -682,7 +697,8 @@ AudioSource::build_peaks_from_scratch () 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; } @@ -697,37 +713,38 @@ AudioSource::done_with_peakfile_writes (bool done) } if (done) { + Glib::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; - if (peakfile < 0) { + if (_peakfile_descriptor == 0) { prepare_for_peakfile_writes (); } @@ -748,7 +765,7 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe off_t byte = (peak_leftover_frame / fpp) * sizeof (PeakData); - if (::pwrite (peakfile, &x, sizeof (PeakData), byte) != 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; } @@ -827,7 +844,7 @@ 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]; @@ -851,16 +868,16 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe 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); + (void) ftruncate (_peakfile_fd, target_length); /* error doesn't actually matter though, so continue on without testing */ } } - if (::pwrite (peakfile, peakbuf, sizeof (PeakData) * peaks_computed, first_peak_byte) != (ssize_t) (sizeof (PeakData) * peaks_computed)) { + 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; } @@ -887,7 +904,7 @@ AudioSource::compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframe 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; @@ -895,14 +912,14 @@ AudioSource::truncate_peakfile () /* truncate the peakfile down to its natural length if necessary */ - off_t end = lseek (peakfile, 0, SEEK_END); + off_t end = lseek (_peakfile_fd, 0, SEEK_END); if (end > _peak_byte_max) { - ftruncate (peakfile, _peak_byte_max); + (void) ftruncate (_peakfile_fd, _peak_byte_max); } } -nframes_t +framecnt_t AudioSource::available_peaks (double zoom_factor) const { if (zoom_factor < _FPP) { @@ -920,3 +937,24 @@ AudioSource::available_peaks (double zoom_factor) const return (end/sizeof(PeakData)) * _FPP; } +void +AudioSource::dec_read_data_count (framecnt_t cnt) +{ + uint32_t val = cnt * sizeof (Sample); + + if (val < _read_data_count) { + _read_data_count -= val; + } else { + _read_data_count = 0; + } +} + +void +AudioSource::mark_streaming_write_completed () +{ + Glib::Mutex::Lock lm (_peaks_ready_lock); + + if (_peaks_built) { + PeaksReady (); /* EMIT SIGNAL */ + } +}