* @param size Number of bytes of data.
*/
void
-Decoder::process_audio (uint8_t* data, int size)
+Decoder::process_audio (shared_ptr<AudioBuffers> audio)
{
- /* XXX: could this be removed? */
- if (size == 0) {
- return;
- }
-
- assert (_film->audio_channels());
- assert (bytes_per_audio_sample());
-
- /* Deinterleave and convert to float */
-
- assert ((size % (bytes_per_audio_sample() * audio_channels())) == 0);
-
- int const total_samples = size / bytes_per_audio_sample();
- int const frames = total_samples / _film->audio_channels();
- shared_ptr<AudioBuffers> audio (new AudioBuffers (audio_channels(), frames));
-
- switch (audio_sample_format()) {
- case AV_SAMPLE_FMT_S16:
- {
- int16_t* p = (int16_t *) data;
- int sample = 0;
- int channel = 0;
- for (int i = 0; i < total_samples; ++i) {
- audio->data(channel)[sample] = float(*p++) / (1 << 15);
-
- ++channel;
- if (channel == _film->audio_channels()) {
- channel = 0;
- ++sample;
- }
- }
- }
- break;
-
- case AV_SAMPLE_FMT_S32:
- {
- int32_t* p = (int32_t *) data;
- int sample = 0;
- int channel = 0;
- for (int i = 0; i < total_samples; ++i) {
- audio->data(channel)[sample] = float(*p++) / (1 << 31);
-
- ++channel;
- if (channel == _film->audio_channels()) {
- channel = 0;
- ++sample;
- }
- }
- }
-
- case AV_SAMPLE_FMT_FLTP:
- {
- float* p = reinterpret_cast<float*> (data);
- for (int i = 0; i < _film->audio_channels(); ++i) {
- memcpy (audio->data(i), p, frames * sizeof(float));
- p += frames;
- }
- }
- break;
-
- default:
- assert (false);
- }
-
/* Maybe apply gain */
if (_film->audio_gain() != 0) {
float const linear_gain = pow (10, _film->audio_gain() / 20);
- for (int i = 0; i < _film->audio_channels(); ++i) {
- for (int j = 0; j < frames; ++j) {
+ for (int i = 0; i < audio->channels(); ++i) {
+ for (int j = 0; j < audio->frames(); ++j) {
audio->data(i)[j] *= linear_gain;
}
}
virtual PixelFormat pixel_format () const = 0;
void process_video (AVFrame *);
- void process_audio (uint8_t *, int);
+ void process_audio (boost::shared_ptr<AudioBuffers>);
void process_subtitle (boost::shared_ptr<TimedSubtitle>);
void repeat_last_video ();
);
assert (_audio_codec_context->channels == _film->audio_channels());
- process_audio (_frame->data[0], data_size);
+ process_audio (deinterleave_audio (_frame->data[0], data_size));
}
}
);
if (s) {
- /* hence bytes */
- int const b = s * audio_channels() * bytes_per_audio_sample();
-
- /* XXX: this assumes that it won't be too much, and there are shaky assumptions
- that all sound representations are silent with memset()ed zero data.
- */
- uint8_t silence[b];
- memset (silence, 0, b);
- process_audio (silence, b);
+ shared_ptr<AudioBuffers> audio (new AudioBuffers (audio_channels(), s));
+ audio->make_silent ();
+ process_audio (audio);
}
}
);
assert (_audio_codec_context->channels == _film->audio_channels());
- process_audio (_frame->data[0], data_size);
+ process_audio (deinterleave_audio (_frame->data[0], data_size));
}
}
return false;
}
+shared_ptr<AudioBuffers>
+FFmpegDecoder::deinterleave_audio (uint8_t* data, int size)
+{
+ assert (_film->audio_channels());
+ assert (bytes_per_audio_sample());
+
+ /* Deinterleave and convert to float */
+
+ assert ((size % (bytes_per_audio_sample() * audio_channels())) == 0);
+
+ int const total_samples = size / bytes_per_audio_sample();
+ int const frames = total_samples / _film->audio_channels();
+ shared_ptr<AudioBuffers> audio (new AudioBuffers (audio_channels(), frames));
+
+ switch (audio_sample_format()) {
+ case AV_SAMPLE_FMT_S16:
+ {
+ int16_t* p = (int16_t *) data;
+ int sample = 0;
+ int channel = 0;
+ for (int i = 0; i < total_samples; ++i) {
+ audio->data(channel)[sample] = float(*p++) / (1 << 15);
+
+ ++channel;
+ if (channel == _film->audio_channels()) {
+ channel = 0;
+ ++sample;
+ }
+ }
+ }
+ break;
+
+ case AV_SAMPLE_FMT_S32:
+ {
+ int32_t* p = (int32_t *) data;
+ int sample = 0;
+ int channel = 0;
+ for (int i = 0; i < total_samples; ++i) {
+ audio->data(channel)[sample] = float(*p++) / (1 << 31);
+
+ ++channel;
+ if (channel == _film->audio_channels()) {
+ channel = 0;
+ ++sample;
+ }
+ }
+ }
+
+ case AV_SAMPLE_FMT_FLTP:
+ {
+ float* p = reinterpret_cast<float*> (data);
+ for (int i = 0; i < _film->audio_channels(); ++i) {
+ memcpy (audio->data(i), p, frames * sizeof(float));
+ p += frames;
+ }
+ }
+ break;
+
+ default:
+ assert (false);
+ }
+
+ return audio;
+}
+
float
FFmpegDecoder::frames_per_second () const
{
void setup_subtitle ();
void maybe_add_subtitle ();
+ boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t* data, int size);
std::string stream_name (AVStream* s) const;