+ if (ignore ()) {
+ return;
+ }
+
+ /* Amount of error we will tolerate on audio timestamps; see comment below.
+ * We'll use 1 24fps video frame at 48kHz as this seems to be roughly how
+ * ffplay does it.
+ */
+ static Frame const slack_frames = 48000 / 24;
+
+ int const resampled_rate = _content->resampled_frame_rate(film);
+ if (!time_already_delayed) {
+ time += ContentTime::from_seconds (_content->delay() / 1000.0);
+ }
+
+ /* first_since_seek is set to true if this is the first data we have
+ received since initialisation or seek. We'll set the position based
+ on the ContentTime that was given. After this first time we just
+ count samples unless the timestamp is more than slack_frames away
+ from where we think it should be. This is because ContentTimes seem
+ to be slightly unreliable from FFmpegDecoder (i.e. not sample
+ accurate), but we still need to obey them sometimes otherwise we get
+ sync problems such as #1833.
+ */
+
+ auto const first_since_seek = _positions[stream] == 0;
+ auto const need_reset = !first_since_seek && (std::abs(_positions[stream] - time.frames_round(resampled_rate)) > slack_frames);
+
+ if (need_reset) {
+ LOG_GENERAL (
+ "Reset audio position: was %1, new data at %2, slack: %3 frames",
+ _positions[stream],
+ time.frames_round(resampled_rate),
+ std::abs(_positions[stream] - time.frames_round(resampled_rate))
+ );
+ }
+
+ if (first_since_seek || need_reset) {
+ _positions[stream] = time.frames_round (resampled_rate);
+ }
+
+ if (first_since_seek && _content->delay() > 0) {
+ silence (stream, _content->delay());
+ }
+
+ shared_ptr<Resampler> resampler;
+ auto i = _resamplers.find(stream);
+ if (i != _resamplers.end()) {
+ resampler = i->second;
+ } else {
+ if (stream->frame_rate() != resampled_rate) {
+ LOG_GENERAL (
+ "Creating new resampler from %1 to %2 with %3 channels",
+ stream->frame_rate(),
+ resampled_rate,
+ stream->channels()
+ );
+
+ resampler = make_shared<Resampler>(stream->frame_rate(), resampled_rate, stream->channels());
+ if (_fast) {
+ resampler->set_fast ();
+ }
+ _resamplers[stream] = resampler;
+ }
+ }
+
+ if (resampler) {
+ auto ro = resampler->run (data);
+ if (ro->frames() == 0) {
+ return;
+ }
+ data = ro;
+ }
+
+ Data(stream, ContentAudio (data, _positions[stream]));
+ _positions[stream] += data->frames();
+}
+
+
+/** @return Time just after the last thing that was emitted from a given stream */
+ContentTime
+AudioDecoder::stream_position (shared_ptr<const Film> film, AudioStreamPtr stream) const
+{
+ auto i = _positions.find (stream);
+ DCPOMATIC_ASSERT (i != _positions.end ());
+ return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));