projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1e5bc53
)
Seek correctly in AudioDecoder; the frame parameter is in resampled frames, so we...
author
Carl Hetherington
<cth@carlh.net>
Tue, 20 Jan 2015 13:50:49 +0000
(13:50 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 20 Jan 2015 13:50:49 +0000
(13:50 +0000)
src/lib/audio_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index 0c47b9f51a0b876650b4e7e9c8fa3ea2b3221d05..22376e3e36bb2c19d19fb77f82000f3a7cba987e 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-63,7
+63,7
@@
AudioDecoder::get_audio (AudioFrame frame, AudioFrame length, bool accurate)
if (frame < _decoded_audio.frame || end > (_decoded_audio.frame + length * 4)) {
/* Either we have no decoded data, or what we do have is a long way from what we want: seek */
if (frame < _decoded_audio.frame || end > (_decoded_audio.frame + length * 4)) {
/* Either we have no decoded data, or what we do have is a long way from what we want: seek */
- seek (ContentTime::from_frames (frame, _audio_content->audio_frame_rate()), accurate);
+ seek (ContentTime::from_frames (frame, _audio_content->
resampled_
audio_frame_rate()), accurate);
}
/* Offset of the data that we want from the start of _decoded_audio.audio
}
/* Offset of the data that we want from the start of _decoded_audio.audio