projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New DCPTime/ContentTime types.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.cc
diff --git
a/src/lib/sndfile_decoder.cc
b/src/lib/sndfile_decoder.cc
index dc22475cdfd344dd6fc2046cdd774b9dfa74c909..3a71fab528508ece0dfdf713356308b2e8af8cfa 100644
(file)
--- a/
src/lib/sndfile_decoder.cc
+++ b/
src/lib/sndfile_decoder.cc
@@
-18,11
+18,16
@@
*/
#include <iostream>
*/
#include <iostream>
+#ifdef DCPOMATIC_WINDOWS
+#include <windows.h>
+#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+#endif
#include <sndfile.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "film.h"
#include "exceptions.h"
#include <sndfile.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
#include "film.h"
#include "exceptions.h"
+#include "audio_buffers.h"
#include "i18n.h"
#include "i18n.h"
@@
-38,7
+43,15
@@
SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const Sndfi
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
- _sndfile = sf_open (_sndfile_content->file().string().c_str(), SFM_READ, &_info);
+ _info.format = 0;
+
+ /* Here be monsters. See fopen_boost for similar shenanigans */
+#ifdef DCPOMATIC_WINDOWS
+ _sndfile = sf_wchar_open (_sndfile_content->path(0).c_str(), SFM_READ, &_info);
+#else
+ _sndfile = sf_open (_sndfile_content->path(0).string().c_str(), SFM_READ, &_info);
+#endif
+
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
}
if (!_sndfile) {
throw DecodeError (_("could not open audio file for reading"));
}
@@
-56,19
+69,23
@@
SndfileDecoder::~SndfileDecoder ()
bool
SndfileDecoder::pass ()
{
bool
SndfileDecoder::pass ()
{
+ if (_remaining == 0) {
+ return true;
+ }
+
/* Do things in half second blocks as I think there may be limits
to what FFmpeg (and in particular the resampler) can cope with.
*/
/* Do things in half second blocks as I think there may be limits
to what FFmpeg (and in particular the resampler) can cope with.
*/
- sf_count_t const block = _sndfile_content->audio_frame_rate() / 2;
+ sf_count_t const block = _sndfile_content->
content_
audio_frame_rate() / 2;
sf_count_t const this_time = min (block, _remaining);
int const channels = _sndfile_content->audio_channels ();
sf_count_t const this_time = min (block, _remaining);
int const channels = _sndfile_content->audio_channels ();
- shared_ptr<AudioBuffers>
audio
(new AudioBuffers (channels, this_time));
+ shared_ptr<AudioBuffers>
data
(new AudioBuffers (channels, this_time));
if (_sndfile_content->audio_channels() == 1) {
/* No de-interleaving required */
if (_sndfile_content->audio_channels() == 1) {
/* No de-interleaving required */
- sf_read_float (_sndfile,
audio
->data(0), this_time);
+ sf_read_float (_sndfile,
data
->data(0), this_time);
} else {
/* Deinterleave */
if (!_deinterleave_buffer) {
} else {
/* Deinterleave */
if (!_deinterleave_buffer) {
@@
-77,7
+94,7
@@
SndfileDecoder::pass ()
sf_readf_float (_sndfile, _deinterleave_buffer, this_time);
vector<float*> out_ptr (channels);
for (int i = 0; i < channels; ++i) {
sf_readf_float (_sndfile, _deinterleave_buffer, this_time);
vector<float*> out_ptr (channels);
for (int i = 0; i < channels; ++i) {
- out_ptr[i] =
audio
->data(i);
+ out_ptr[i] =
data
->data(i);
}
float* in_ptr = _deinterleave_buffer;
for (int i = 0; i < this_time; ++i) {
}
float* in_ptr = _deinterleave_buffer;
for (int i = 0; i < this_time; ++i) {
@@
-87,12
+104,12
@@
SndfileDecoder::pass ()
}
}
}
}
-
audio
->set_frames (this_time);
-
Audio (audio, double(_done) / audio_frame_rate(
));
+
data
->set_frames (this_time);
+
audio (data, ContentTime::from_frames (_done, audio_frame_rate ()
));
_done += this_time;
_remaining -= this_time;
_done += this_time;
_remaining -= this_time;
- return
(_remaining == 0)
;
+ return
_remaining == 0
;
}
int
}
int
@@
-101,10
+118,10
@@
SndfileDecoder::audio_channels () const
return _info.channels;
}
return _info.channels;
}
-Content
AudioFra
me
+Content
Ti
me
SndfileDecoder::audio_length () const
{
SndfileDecoder::audio_length () const
{
- return
_info.frames
;
+ return
ContentTime::from_frames (_info.frames, audio_frame_rate ())
;
}
int
}
int
@@
-112,3
+129,13
@@
SndfileDecoder::audio_frame_rate () const
{
return _info.samplerate;
}
{
return _info.samplerate;
}
+
+void
+SndfileDecoder::seek (ContentTime t, bool accurate)
+{
+ Decoder::seek (t, accurate);
+ AudioDecoder::seek (t, accurate);
+
+ _done = t.frames (audio_frame_rate ());
+ _remaining = _info.frames - _done;
+}