/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 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
#include "ffmpeg_decoder.h"
#include "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
-#include "filter_graph.h"
+#include "video_filter_graph.h"
#include "audio_buffers.h"
#include "ffmpeg_content.h"
#include "raw_image_proxy.h"
#include "film.h"
+#include "md5_digester.h"
#include "compose.hpp"
+#include <dcp/subtitle_string.h>
+#include <sub/ssa_reader.h>
+#include <sub/subtitle.h>
+#include <sub/collect.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
}
#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
#include <vector>
#include <iomanip>
#include <iostream>
#define LOG_WARNING(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING);
using std::cout;
+using std::string;
using std::vector;
using std::list;
using std::min;
using std::pair;
using std::max;
using boost::shared_ptr;
+using boost::is_any_of;
+using boost::split;
using dcp::Size;
FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log, bool fast)
}
bool
-FFmpegDecoder::pass ()
+FFmpegDecoder::pass (PassReason reason, bool accurate)
{
int r = av_read_frame (_format_context, &_packet);
int const si = _packet.stream_index;
shared_ptr<const FFmpegContent> fc = _ffmpeg_content;
- if (si == _video_stream && !_ignore_video) {
+ if (si == _video_stream && !_ignore_video && (accurate || reason != PASS_REASON_SUBTITLE)) {
decode_video_packet ();
} else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) {
decode_subtitle_packet ();
- } else {
+ } else if (accurate || reason != PASS_REASON_SUBTITLE) {
decode_audio_packet ();
}
* Only the first buffer will be used for non-planar data, otherwise there will be one per channel.
*/
shared_ptr<AudioBuffers>
-FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream, uint8_t** data, int size)
+FFmpegDecoder::deinterleave_audio (shared_ptr<FFmpegAudioStream> stream) const
{
DCPOMATIC_ASSERT (bytes_per_audio_sample (stream));
+ int const size = av_samples_get_buffer_size (
+ 0, stream->stream(_format_context)->codec->channels, _frame->nb_samples, audio_sample_format (stream), 1
+ );
+
/* Deinterleave and convert to float */
/* total_samples and frames will be rounded down here, so if there are stray samples at the end
switch (audio_sample_format (stream)) {
case AV_SAMPLE_FMT_U8:
{
- uint8_t* p = reinterpret_cast<uint8_t *> (data[0]);
+ uint8_t* p = reinterpret_cast<uint8_t *> (_frame->data[0]);
int sample = 0;
int channel = 0;
for (int i = 0; i < total_samples; ++i) {
case AV_SAMPLE_FMT_S16:
{
- int16_t* p = reinterpret_cast<int16_t *> (data[0]);
+ int16_t* p = reinterpret_cast<int16_t *> (_frame->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 **> (_frame->data);
for (int i = 0; i < stream->channels(); ++i) {
for (int j = 0; j < frames; ++j) {
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[0]);
+ int32_t* p = reinterpret_cast<int32_t *> (_frame->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[0]);
+ float* p = reinterpret_cast<float*> (_frame->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);
- for (int i = 0; i < stream->channels(); ++i) {
+ float** p = reinterpret_cast<float**> (_frame->data);
+ /* Sometimes there aren't as many channels in the _frame as in the stream */
+ for (int i = 0; i < _frame->channels; ++i) {
memcpy (audio->data(i), p[i], frames * sizeof(float));
}
+ for (int i = _frame->channels; i < stream->channels(); ++i) {
+ audio->make_silent (i);
+ }
}
break;
av_q2d ((*stream)->stream (_format_context)->time_base))
+ _pts_offset;
- int const data_size = av_samples_get_buffer_size (
- 0, (*stream)->stream(_format_context)->codec->channels, _frame->nb_samples, audio_sample_format (*stream), 1
- );
-
- shared_ptr<AudioBuffers> data = deinterleave_audio (*stream, _frame->data, data_size);
+ shared_ptr<AudioBuffers> data = deinterleave_audio (*stream);
if (ct < ContentTime ()) {
/* Discard audio data that comes before time 0 */
boost::mutex::scoped_lock lm (_filter_graphs_mutex);
- shared_ptr<FilterGraph> graph;
+ shared_ptr<VideoFilterGraph> graph;
- list<shared_ptr<FilterGraph> >::iterator i = _filter_graphs.begin();
+ list<shared_ptr<VideoFilterGraph> >::iterator i = _filter_graphs.begin();
while (i != _filter_graphs.end() && !(*i)->can_process (dcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)) {
++i;
}
if (i == _filter_graphs.end ()) {
- graph.reset (new FilterGraph (_ffmpeg_content, dcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format));
+ graph.reset (new VideoFilterGraph (dcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format));
+ graph->setup (_ffmpeg_content->filters ());
_filter_graphs.push_back (graph);
LOG_GENERAL (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format);
} else {
period.to = sub_period.to.get() + _pts_offset;
} else {
/* We have to look up the `to' time in the stream's records */
- period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (period.from);
+ period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub));
}
for (unsigned int i = 0; i < sub.num_rects; ++i) {
cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
break;
case SUBTITLE_ASS:
- cout << "XXX: SUBTITLE_ASS " << rect->ass << "\n";
+ decode_ass_subtitle (rect->ass, period);
break;
}
}
list<ContentTimePeriod>
FFmpegDecoder::image_subtitles_during (ContentTimePeriod p, bool starting) const
{
- return _ffmpeg_content->subtitles_during (p, starting);
+ return _ffmpeg_content->image_subtitles_during (p, starting);
}
list<ContentTimePeriod>
-FFmpegDecoder::text_subtitles_during (ContentTimePeriod, bool) const
+FFmpegDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
{
- return list<ContentTimePeriod> ();
+ return _ffmpeg_content->text_subtitles_during (p, starting);
}
void
image_subtitle (period, image, scaled_rect);
}
+
+void
+FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period)
+{
+ /* We have no styles and no Format: line, so I'm assuming that FFmpeg
+ produces a single format of Dialogue: lines...
+ */
+
+ vector<string> bits;
+ split (bits, ass, is_any_of (","));
+ if (bits.size() < 10) {
+ return;
+ }
+
+ sub::RawSubtitle base;
+ list<sub::RawSubtitle> raw = sub::SSAReader::parse_line (base, bits[9]);
+ list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (raw);
+
+ /* XXX: lots of this is copied from TextSubtitle; there should probably be some sharing */
+
+ /* Highest line index in this subtitle */
+ int highest = 0;
+ BOOST_FOREACH (sub::Subtitle i, subs) {
+ BOOST_FOREACH (sub::Line j, i.lines) {
+ DCPOMATIC_ASSERT (j.vertical_position.reference && j.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE);
+ DCPOMATIC_ASSERT (j.vertical_position.line);
+ highest = max (highest, j.vertical_position.line.get());
+ }
+ }
+
+ list<dcp::SubtitleString> ss;
+
+ BOOST_FOREACH (sub::Subtitle i, sub::collect<list<sub::Subtitle> > (sub::SSAReader::parse_line (base, bits[9]))) {
+ BOOST_FOREACH (sub::Line j, i.lines) {
+ BOOST_FOREACH (sub::Block k, j.blocks) {
+ ss.push_back (
+ dcp::SubtitleString (
+ boost::optional<string> (),
+ k.italic,
+ dcp::Colour (255, 255, 255),
+ /* 48pt is 1/22nd of the screen height */
+ 48,
+ 1,
+ dcp::Time (i.from.seconds(), 1000),
+ dcp::Time (i.to.seconds(), 1000),
+ 0,
+ dcp::HALIGN_CENTER,
+ /* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
+ of the screen a bit to a pleasing degree.
+ */
+ 1.015 - ((1 + highest - j.vertical_position.line.get()) * 1.5 / 22),
+ dcp::VALIGN_TOP,
+ k.text,
+ static_cast<dcp::Effect> (0),
+ dcp::Colour (255, 255, 255),
+ dcp::Time (),
+ dcp::Time ()
+ )
+ );
+ }
+ }
+ }
+
+ text_subtitle (period, ss);
+}
projects / dcpomatic.git / blobdiff