projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
lib
/
sndfile_decoder.cc
diff --git
a/src/lib/sndfile_decoder.cc
b/src/lib/sndfile_decoder.cc
index d6537843e8970ebde3ae6872bb99f04fd66e5de3..2fa9ae2a3c48df0328f618016c65a5f1bc64e599 100644
(file)
--- a/
src/lib/sndfile_decoder.cc
+++ b/
src/lib/sndfile_decoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,7
+21,6
@@
#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,25
+32,18
@@
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)
- , _sndfile_content (c)
+SndfileDecoder::SndfileDecoder (shared_ptr<const SndfileContent> c)
+ : Sndfile (c)
+ , AudioDecoder (c)
+ , _done (0)
+ , _remaining (_info.frames)
, _deinterleave_buffer (0)
{
, _deinterleave_buffer (0)
{
- _info.format = 0;
- _sndfile = sf_open (_sndfile_content->path(0).string().c_str(), SFM_READ, &_info);
- if (!_sndfile) {
- throw DecodeError (_("could not open audio file for reading"));
- }
- _done = 0;
- _remaining = _info.frames;
}
SndfileDecoder::~SndfileDecoder ()
{
}
SndfileDecoder::~SndfileDecoder ()
{
- sf_close (_sndfile);
delete[] _deinterleave_buffer;
}
delete[] _deinterleave_buffer;
}
@@
-61,18
+53,18
@@
SndfileDecoder::pass ()
if (_remaining == 0) {
return true;
}
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->
content_audio_
frame_rate() / 2;
+ sf_count_t const block = _sndfile_content->
audio_stream()->
frame_rate() / 2;
sf_count_t const this_time = min (block, _remaining);
sf_count_t const this_time = min (block, _remaining);
- int const channels = _sndfile_content->audio_channels ();
-
+ int const channels = _sndfile_content->audio_
stream()->
channels ();
+
shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
shared_ptr<AudioBuffers> data (new AudioBuffers (channels, this_time));
- if (_sndfile_content->audio_channels() == 1) {
+ if (_sndfile_content->audio_
stream()->
channels() == 1) {
/* No de-interleaving required */
sf_read_float (_sndfile, data->data(0), this_time);
} else {
/* No de-interleaving required */
sf_read_float (_sndfile, data->data(0), this_time);
} else {
@@
-92,39
+84,20
@@
SndfileDecoder::pass ()
}
}
}
}
}
}
-
+
data->set_frames (this_time);
data->set_frames (this_time);
- audio (
data, _done * TIME_HZ / audio_frame_rate (
));
+ audio (
_sndfile_content->audio_stream (), data, ContentTime::from_frames (_done, _info.samplerate
));
_done += this_time;
_remaining -= this_time;
return _remaining == 0;
}
_done += this_time;
_remaining -= this_time;
return _remaining == 0;
}
-int
-SndfileDecoder::audio_channels () const
-{
- return _info.channels;
-}
-
-AudioFrame
-SndfileDecoder::audio_length () const
-{
- return _info.frames;
-}
-
-int
-SndfileDecoder::audio_frame_rate () const
-{
- return _info.samplerate;
-}
-
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
* audio_frame_rate() / TIME_HZ
;
+ _done = t
.frames (_info.samplerate)
;
_remaining = _info.frames - _done;
}
_remaining = _info.frames - _done;
}