#include "filter_graph.h"
#include "subtitle.h"
+#include "i18n.h"
+
using std::cout;
using std::string;
using std::vector;
using boost::dynamic_pointer_cast;
using libdcp::Size;
-FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
- : Decoder (f, o, j)
- , VideoDecoder (f, o, j)
- , AudioDecoder (f, o, j)
+FFmpegDecoder::FFmpegDecoder (shared_ptr<Film> f, DecodeOptions o)
+ : Decoder (f, o)
+ , VideoDecoder (f, o)
+ , AudioDecoder (f, o)
, _format_context (0)
, _video_stream (-1)
, _frame (0)
}
if (avformat_find_stream_info (_format_context, 0) < 0) {
- throw DecodeError ("could not find stream information");
+ throw DecodeError (_("could not find stream information"));
}
/* Find video, audio and subtitle streams and choose the first of each */
/* This is a hack; sometimes it seems that _audio_codec_context->channel_layout isn't set up,
so bodge it here. No idea why we should have to do this.
*/
-
+
if (s->codec->channel_layout == 0) {
s->codec->channel_layout = av_get_default_channel_layout (s->codec->channels);
}
}
if (_video_stream < 0) {
- throw DecodeError ("could not find video stream");
+ throw DecodeError (N_("could not find video stream"));
}
_frame = avcodec_alloc_frame ();
if (_frame == 0) {
- throw DecodeError ("could not allocate frame");
+ throw DecodeError (N_("could not allocate frame"));
}
}
_video_codec = avcodec_find_decoder (_video_codec_context->codec_id);
if (_video_codec == 0) {
- throw DecodeError ("could not find video decoder");
+ throw DecodeError (_("could not find video decoder"));
}
if (avcodec_open2 (_video_codec_context, _video_codec, 0) < 0) {
- throw DecodeError ("could not open video decoder");
+ throw DecodeError (N_("could not open video decoder"));
}
}
_audio_codec = avcodec_find_decoder (_audio_codec_context->codec_id);
if (_audio_codec == 0) {
- throw DecodeError ("could not find audio decoder");
+ throw DecodeError (_("could not find audio decoder"));
}
if (avcodec_open2 (_audio_codec_context, _audio_codec, 0) < 0) {
- throw DecodeError ("could not open audio decoder");
+ throw DecodeError (N_("could not open audio decoder"));
}
}
_subtitle_codec = avcodec_find_decoder (_subtitle_codec_context->codec_id);
if (_subtitle_codec == 0) {
- throw DecodeError ("could not find subtitle decoder");
+ throw DecodeError (_("could not find subtitle decoder"));
}
if (avcodec_open2 (_subtitle_codec_context, _subtitle_codec, 0) < 0) {
- throw DecodeError ("could not open subtitle decoder");
+ throw DecodeError (N_("could not open subtitle decoder"));
}
}
/* Maybe we should fail here, but for now we'll just finish off instead */
char buf[256];
av_strerror (r, buf, sizeof(buf));
- _film->log()->log (String::compose ("error on av_read_frame (%1) (%2)", buf, r));
+ _film->log()->log (String::compose (N_("error on av_read_frame (%1) (%2)"), buf, r));
}
/* Get any remaining frames */
);
assert (_audio_codec_context->channels == _film->audio_channels());
- Audio (deinterleave_audio (_frame->data[0], data_size));
+ Audio (deinterleave_audio (_frame->data, data_size));
}
}
if (r >= 0 && frame_finished) {
if (r != _packet.size) {
- _film->log()->log (String::compose ("Used only %1 bytes of %2 in packet", r, _packet.size));
+ _film->log()->log (String::compose (N_("Used only %1 bytes of %2 in packet"), r, _packet.size));
}
if (_opt.video_sync) {
_film->log()->log (
String::compose (
- "First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)",
+ N_("First video at %1, first audio at %2, pushing %3 audio frames of silence for %4 channels (%5 bytes per sample)"),
_first_video.get(), _first_audio.get(), s, ffa->channels(), bytes_per_audio_sample()
)
);
);
assert (_audio_codec_context->channels == _film->audio_channels());
- Audio (deinterleave_audio (_frame->data[0], data_size));
+ Audio (deinterleave_audio (_frame->data, data_size));
}
}
return false;
}
+/** @param data pointer to array of pointers to buffers.
+ * Only the first buffer will be used for non-planar data, otherwise there will be one per channel.
+ */
shared_ptr<AudioBuffers>
-FFmpegDecoder::deinterleave_audio (uint8_t* data, int size)
+FFmpegDecoder::deinterleave_audio (uint8_t** data, int size)
{
assert (_film->audio_channels());
assert (bytes_per_audio_sample());
switch (audio_sample_format()) {
case AV_SAMPLE_FMT_S16:
{
- int16_t* p = reinterpret_cast<int16_t *> (data);
+ int16_t* p = reinterpret_cast<int16_t *> (data[0]);
int sample = 0;
int channel = 0;
for (int i = 0; i < total_samples; ++i) {
case AV_SAMPLE_FMT_S16P:
{
- int16_t* p = reinterpret_cast<int16_t *> (data);
+ int16_t** p = reinterpret_cast<int16_t **> (data);
for (int i = 0; i < _film->audio_channels(); ++i) {
for (int j = 0; j < frames; ++j) {
- audio->data(i)[j] = static_cast<float>(*p++) / (1 << 15);
+ audio->data(i)[j] = static_cast<float>(p[i][j]) / (1 << 15);
}
}
}
case AV_SAMPLE_FMT_S32:
{
- int32_t* p = reinterpret_cast<int32_t *> (data);
+ int32_t* p = reinterpret_cast<int32_t *> (data[0]);
int sample = 0;
int channel = 0;
for (int i = 0; i < total_samples; ++i) {
case AV_SAMPLE_FMT_FLT:
{
- float* p = reinterpret_cast<float*> (data);
+ float* p = reinterpret_cast<float*> (data[0]);
int sample = 0;
int channel = 0;
for (int i = 0; i < total_samples; ++i) {
case AV_SAMPLE_FMT_FLTP:
{
- float* p = reinterpret_cast<float*> (data);
+ 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;
+ memcpy (audio->data(i), p[i], frames * sizeof(float));
}
}
break;
default:
- throw DecodeError (String::compose ("Unrecognised audio sample format (%1)", static_cast<int> (audio_sample_format())));
+ throw DecodeError (String::compose (_("Unrecognised audio sample format (%1)"), static_cast<int> (audio_sample_format())));
}
return audio;
return _audio_codec_context->sample_fmt;
}
-Size
+libdcp::Size
FFmpegDecoder::native_size () const
{
- return Size (_video_codec_context->width, _video_codec_context->height);
+ return libdcp::Size (_video_codec_context->width, _video_codec_context->height);
}
PixelFormat
{
stringstream n;
- AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
+ AVDictionaryEntry const * lang = av_dict_get (s->metadata, N_("language"), 0, 0);
if (lang) {
n << lang->value;
}
- AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
+ AVDictionaryEntry const * title = av_dict_get (s->metadata, N_("title"), 0, 0);
if (title) {
if (!n.str().empty()) {
- n << " ";
+ n << N_(" ");
}
n << title->value;
}
if (n.str().empty()) {
- n << "unknown";
+ n << N_("unknown");
}
return n.str ();
shared_ptr<FilterGraph> graph;
list<shared_ptr<FilterGraph> >::iterator i = _filter_graphs.begin();
- while (i != _filter_graphs.end() && !(*i)->can_process (Size (frame->width, frame->height), (AVPixelFormat) frame->format)) {
+ while (i != _filter_graphs.end() && !(*i)->can_process (libdcp::Size (frame->width, frame->height), (AVPixelFormat) frame->format)) {
++i;
}
if (i == _filter_graphs.end ()) {
- graph.reset (new FilterGraph (_film, this, Size (frame->width, frame->height), (AVPixelFormat) frame->format));
+ graph.reset (new FilterGraph (_film, this, libdcp::Size (frame->width, frame->height), (AVPixelFormat) frame->format));
_filter_graphs.push_back (graph);
- _film->log()->log (String::compose ("New graph for %1x%2, pixel format %3", frame->width, frame->height, frame->format));
+ _film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), frame->width, frame->height, frame->format));
} else {
graph = *i;
}
stringstream s (t);
string type;
s >> type;
- if (type != "ffmpeg") {
+ if (type != N_("ffmpeg")) {
return shared_ptr<FFmpegAudioStream> ();
}
string type;
/* Current (marked version 1) */
n >> type >> _id >> _sample_rate >> _channel_layout;
- assert (type == "ffmpeg");
+ assert (type == N_("ffmpeg"));
}
for (int i = 0; i < name_index; ++i) {
string
FFmpegAudioStream::to_string () const
{
- return String::compose ("ffmpeg %1 %2 %3 %4", _id, _sample_rate, _channel_layout, _name);
+ return String::compose (N_("ffmpeg %1 %2 %3 %4"), _id, _sample_rate, _channel_layout, _name);
}
void
* av_frame_get_best_effort_timestamp(_frame);
_film->log()->log (
- String::compose ("Source video frame ready; source at %1, output at %2", source_pts_seconds, out_pts_seconds),
+ String::compose (N_("Source video frame ready; source at %1, output at %2"), source_pts_seconds, out_pts_seconds),
Log::VERBOSE
);
repeat_last_video ();
_film->log()->log (
String::compose (
- "Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)",
+ N_("Extra video frame inserted at %1s; source frame %2, source PTS %3 (at %4 fps)"),
out_pts_seconds, video_frame(), source_pts_seconds, frames_per_second()
)
);
filter_and_emit_video (_frame);
} else {
/* Otherwise we are omitting a frame to keep things right */
- _film->log()->log (String::compose ("Frame removed at %1s", out_pts_seconds));
+ _film->log()->log (String::compose (N_("Frame removed at %1s"), out_pts_seconds));
}
}
projects / dcpomatic.git / blobdiff