projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avfilter_graph_parse frees inputs and outputs passed in, so we should not.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.cc
diff --git
a/src/lib/sndfile_decoder.cc
b/src/lib/sndfile_decoder.cc
index 1c651e6142abb1cc583011adee35723dad6d505f..09059a8b0717adbf2b8df12b11c6ec48a941477b 100644
(file)
--- a/
src/lib/sndfile_decoder.cc
+++ b/
src/lib/sndfile_decoder.cc
@@
-18,10
+18,13
@@
*/
#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 <sndfile.h>
#include "sndfile_content.h"
#include "sndfile_decoder.h"
-#include "film.h"
#include "exceptions.h"
#include "audio_buffers.h"
#include "exceptions.h"
#include "audio_buffers.h"
@@
-33,18
+36,25
@@
using std::min;
using std::cout;
using boost::shared_ptr;
using std::cout;
using boost::shared_ptr;
-SndfileDecoder::SndfileDecoder (shared_ptr<const Film> f, shared_ptr<const SndfileContent> c)
- : Decoder (f)
- , AudioDecoder (f, c)
+SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c)
+ : AudioDecoder (c)
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
_info.format = 0;
, _sndfile_content (c)
, _deinterleave_buffer (0)
{
_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);
_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"));
}
+ _done = 0;
_remaining = _info.frames;
}
_remaining = _info.frames;
}
@@
-55,7
+65,7
@@
SndfileDecoder::~SndfileDecoder ()
}
bool
}
bool
-SndfileDecoder::pass ()
+SndfileDecoder::pass (
PassReason
)
{
if (_remaining == 0) {
return true;
{
if (_remaining == 0) {
return true;
@@
-64,7
+74,7
@@
SndfileDecoder::pass ()
/* 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->
content_
audio_frame_rate() / 2;
+ sf_count_t const block = _sndfile_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 ();
@@
-93,7
+103,8
@@
SndfileDecoder::pass ()
}
data->set_frames (this_time);
}
data->set_frames (this_time);
- audio (data);
+ audio (data, ContentTime::from_frames (_done, audio_frame_rate ()));
+ _done += this_time;
_remaining -= this_time;
return _remaining == 0;
_remaining -= this_time;
return _remaining == 0;
@@
-105,10
+116,10
@@
SndfileDecoder::audio_channels () const
return _info.channels;
}
return _info.channels;
}
-
AudioFra
me
+
ContentTi
me
SndfileDecoder::audio_length () const
{
SndfileDecoder::audio_length () const
{
- return
_info.frames
;
+ return
ContentTime::from_frames (_info.frames, audio_frame_rate ())
;
}
int
}
int
@@
-120,8
+131,8
@@
SndfileDecoder::audio_frame_rate () const
void
SndfileDecoder::seek (ContentTime t, bool accurate)
{
void
SndfileDecoder::seek (ContentTime t, bool accurate)
{
- Decoder::seek (t, accurate);
AudioDecoder::seek (t, accurate);
AudioDecoder::seek (t, accurate);
+ _done = t.frames (audio_frame_rate ());
_remaining = _info.frames - _done;
}
_remaining = _info.frames - _done;
}