X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=5240decb24dfd69e74650b31a2de3b13ab8c8f18;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=c25efa463c8f61121d70a5e6fcac98a88bb63211;hpb=22873931f874a87fcf6a0077eddbec0f97eb3423;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index c25efa463..5240decb2 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -36,11 +36,16 @@ #include "film.h" #include "md5_digester.h" #include "compose.hpp" +#include +#include +#include +#include extern "C" { #include #include } #include +#include #include #include #include @@ -54,21 +59,25 @@ extern "C" { #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 std::map; using boost::shared_ptr; +using boost::is_any_of; +using boost::split; using dcp::Size; FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log, bool fast) - : VideoDecoder (c) + : VideoDecoder (c->video, log) , AudioDecoder (c, fast) , SubtitleDecoder (c) , FFmpeg (c) , _log (log) - , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video_frame_rate())) + , _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->video->video_frame_rate())) { } @@ -121,7 +130,7 @@ FFmpegDecoder::pass (PassReason reason, bool accurate) decode_audio_packet (); } - av_free_packet (&_packet); + av_packet_unref (&_packet); return false; } @@ -129,10 +138,14 @@ FFmpegDecoder::pass (PassReason reason, bool accurate) * Only the first buffer will be used for non-planar data, otherwise there will be one per channel. */ shared_ptr -FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t** data, int size) +FFmpegDecoder::deinterleave_audio (shared_ptr 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 @@ -145,7 +158,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t switch (audio_sample_format (stream)) { case AV_SAMPLE_FMT_U8: { - uint8_t* p = reinterpret_cast (data[0]); + uint8_t* p = reinterpret_cast (_frame->data[0]); int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { @@ -162,7 +175,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t case AV_SAMPLE_FMT_S16: { - int16_t* p = reinterpret_cast (data[0]); + int16_t* p = reinterpret_cast (_frame->data[0]); int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { @@ -179,7 +192,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t case AV_SAMPLE_FMT_S16P: { - int16_t** p = reinterpret_cast (data); + int16_t** p = reinterpret_cast (_frame->data); for (int i = 0; i < stream->channels(); ++i) { for (int j = 0; j < frames; ++j) { audio->data(i)[j] = static_cast(p[i][j]) / (1 << 15); @@ -190,7 +203,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t case AV_SAMPLE_FMT_S32: { - int32_t* p = reinterpret_cast (data[0]); + int32_t* p = reinterpret_cast (_frame->data[0]); int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { @@ -205,9 +218,20 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t } break; + case AV_SAMPLE_FMT_S32P: + { + int32_t** p = reinterpret_cast (_frame->data); + for (int i = 0; i < stream->channels(); ++i) { + for (int j = 0; j < frames; ++j) { + audio->data(i)[j] = static_cast(p[i][j]) / (1 << 31); + } + } + } + break; + case AV_SAMPLE_FMT_FLT: { - float* p = reinterpret_cast (data[0]); + float* p = reinterpret_cast (_frame->data[0]); int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { @@ -224,10 +248,14 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream, uint8_t case AV_SAMPLE_FMT_FLTP: { - float** p = reinterpret_cast (data); - for (int i = 0; i < stream->channels(); ++i) { + float** p = reinterpret_cast (_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; @@ -330,11 +358,7 @@ FFmpegDecoder::decode_audio_packet () 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 data = deinterleave_audio (*stream, _frame->data, data_size); + shared_ptr data = deinterleave_audio (*stream); if (ct < ContentTime ()) { /* Discard audio data that comes before time 0 */ @@ -390,7 +414,7 @@ FFmpegDecoder::decode_video_packet () double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds (); video ( shared_ptr (new RawImageProxy (image)), - llrint (pts * _ffmpeg_content->video_frame_rate ()) + llrint (pts * _ffmpeg_content->video->video_frame_rate ()) ); } else { LOG_WARNING_NC ("Dropping frame without PTS"); @@ -443,7 +467,7 @@ FFmpegDecoder::decode_subtitle_packet () 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; } } @@ -454,13 +478,13 @@ FFmpegDecoder::decode_subtitle_packet () list 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 -FFmpegDecoder::text_subtitles_during (ContentTimePeriod, bool) const +FFmpegDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const { - return list (); + return _ffmpeg_content->text_subtitles_during (p, starting); } void @@ -471,12 +495,40 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP */ shared_ptr image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true)); +#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT /* Start of the first line in the subtitle */ uint8_t* sub_p = rect->pict.data[0]; /* sub_p looks up into a BGRA palette which is here (i.e. first byte B, second G, third R, fourth A) */ uint32_t const * palette = (uint32_t *) rect->pict.data[1]; +#else + /* Start of the first line in the subtitle */ + uint8_t* sub_p = rect->data[0]; + /* sub_p looks up into a BGRA palette which is here + (i.e. first byte B, second G, third R, fourth A) + */ + uint32_t const * palette = (uint32_t *) rect->data[1]; +#endif + /* And the stream has a map of those palette colours to colours + chosen by the user; created a `mapped' palette from those settings. + */ + map colour_map = ffmpeg_content()->subtitle_stream()->colours (); + vector mapped_palette (rect->nb_colors); + for (int i = 0; i < rect->nb_colors; ++i) { + RGBA c ((palette[i] & 0xff0000) >> 16, (palette[i] & 0xff00) >> 8, palette[i] & 0xff, (palette[i] & 0xff000000) >> 24); + map::const_iterator j = colour_map.find (c); + if (j != colour_map.end ()) { + mapped_palette[i] = j->second; + } else { + /* This colour was not found in the FFmpegSubtitleStream's colour map; probably because + it is from a project that was created before this stuff was added. Just use the + colour straight from the original palette. + */ + mapped_palette[i] = c; + } + } + /* Start of the output data */ uint32_t* out_p = (uint32_t *) image->data()[0]; @@ -484,14 +536,19 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP uint8_t* sub_line_p = sub_p; uint32_t* out_line_p = out_p; for (int x = 0; x < rect->w; ++x) { - uint32_t const p = palette[*sub_line_p++]; - *out_line_p++ = ((p & 0xff) << 16) | (p & 0xff00) | ((p & 0xff0000) >> 16) | (p & 0xff000000); + RGBA const p = mapped_palette[*sub_line_p++]; + /* XXX: this seems to be wrong to me (isn't the output image RGBA?) but it looks right on screen */ + *out_line_p++ = (p.a << 24) | (p.r << 16) | (p.g << 8) | p.b; } +#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT sub_p += rect->pict.linesize[0]; +#else + sub_p += rect->linesize[0]; +#endif out_p += image->stride()[0] / sizeof (uint32_t); } - dcp::Size const vs = _ffmpeg_content->video_size (); + dcp::Size const vs = _ffmpeg_content->video->video_size (); dcpomatic::Rect const scaled_rect ( static_cast (rect->x) / vs.width, static_cast (rect->y) / vs.height, @@ -501,3 +558,70 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP 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 bits; + split (bits, ass, is_any_of (",")); + if (bits.size() < 10) { + return; + } + + sub::RawSubtitle base; + list raw = sub::SSAReader::parse_line (base, bits[9]); + list subs = sub::collect > (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 ss; + + BOOST_FOREACH (sub::Subtitle i, sub::collect > (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 (), + k.italic, + k.bold, + 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, + dcp::DIRECTION_LTR, + k.text, + static_cast (0), + dcp::Colour (255, 255, 255), + dcp::Time (), + dcp::Time () + ) + ); + } + } + } + + text_subtitle (period, ss); +}