X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=b6b6e594d9f41055843220706c960dcb6f5756fd;hb=b3234e76d2f614c2b05034c0bdae8d5a4e9de9ea;hp=e3a42537535621e1f8cfb5e4543696a5a4d1d557;hpb=49a1e2a600bd7b9d2d4a926256378e6134704a1a;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index e3a425375..b6b6e594d 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -36,9 +37,10 @@ #include "raw_image_proxy.h" #include "video_decoder.h" #include "film.h" -#include "md5_digester.h" #include "audio_decoder.h" #include "compose.hpp" +#include "subtitle_content.h" +#include "audio_content.h" #include #include #include @@ -72,9 +74,11 @@ using std::map; using boost::shared_ptr; using boost::is_any_of; using boost::split; +using boost::optional; +using boost::dynamic_pointer_cast; using dcp::Size; -FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log, bool fast) +FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log) : FFmpeg (c) , _log (log) { @@ -86,7 +90,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr } if (c->audio) { - audio.reset (new AudioDecoder (this, c->audio, fast, log)); + audio.reset (new AudioDecoder (this, c->audio, log)); } if (c->subtitle) { @@ -94,6 +98,7 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr new SubtitleDecoder ( this, c->subtitle, + log, bind (&FFmpegDecoder::image_subtitles_during, this, _1, _2), bind (&FFmpegDecoder::text_subtitles_during, this, _1, _2) ) @@ -133,7 +138,7 @@ FFmpegDecoder::pass (PassReason reason, bool accurate) /* Maybe we should fail here, but for now we'll just finish off instead */ char buf[256]; av_strerror (r, buf, sizeof(buf)); - LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), buf, r); + LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), &buf[0], r); } flush (); @@ -228,7 +233,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream) const int sample = 0; int channel = 0; for (int i = 0; i < total_samples; ++i) { - audio->data(channel)[sample] = static_cast(*p++) / (1 << 31); + audio->data(channel)[sample] = static_cast(*p++) / 2147483648; ++channel; if (channel == stream->channels()) { @@ -244,7 +249,7 @@ FFmpegDecoder::deinterleave_audio (shared_ptr stream) const 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); + audio->data(i)[j] = static_cast(p[i][j]) / 2147483648; } } } @@ -325,7 +330,18 @@ FFmpegDecoder::seek (ContentTime time, bool accurate) http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html */ - DCPOMATIC_ASSERT (_video_stream); + optional stream; + + if (_video_stream) { + stream = _video_stream; + } else { + shared_ptr s = dynamic_pointer_cast (_ffmpeg_content->audio->stream ()); + if (s) { + stream = s->index (_format_context); + } + } + + DCPOMATIC_ASSERT (stream); ContentTime u = time - _pts_offset; if (u < ContentTime ()) { @@ -333,12 +349,14 @@ FFmpegDecoder::seek (ContentTime time, bool accurate) } av_seek_frame ( _format_context, - _video_stream.get(), - u.seconds() / av_q2d (_format_context->streams[_video_stream.get()]->time_base), + stream.get(), + u.seconds() / av_q2d (_format_context->streams[stream.get()]->time_base), AVSEEK_FLAG_BACKWARD ); - avcodec_flush_buffers (video_codec_context()); + if (video_codec_context ()) { + avcodec_flush_buffers (video_codec_context()); + } /* XXX: should be flushing audio buffers? */ @@ -375,7 +393,7 @@ FFmpegDecoder::decode_audio_packet () if (decode_result < 0) { /* avcodec_decode_audio4 can sometimes return an error even though it has decoded some valid data; for example dca_subframe_footer can return AVERROR_INVALIDDATA - if it overreads the auxiliary data. ffplay carries on if frame_finished is true, + if it overreads the auxiliary data. ffplay carries on if frame_finished is true, even in the face of such an error, so I think we should too. Returning from the method here caused mantis #352. @@ -404,7 +422,12 @@ FFmpegDecoder::decode_audio_packet () ct += ContentTime::from_frames (remove, (*stream)->frame_rate ()); } - if (data->frames() > 0) { + if (ct < ContentTime()) { + LOG_WARNING ("Crazy timestamp %1", to_string (ct)); + } + + /* Give this data provided there is some, and its time is sane */ + if (ct >= ContentTime() && data->frames() > 0) { audio->give (*stream, data, ct); } } @@ -484,13 +507,11 @@ FFmpegDecoder::decode_subtitle_packet () FFmpegSubtitlePeriod sub_period = subtitle_period (sub); ContentTimePeriod period; period.from = sub_period.from + _pts_offset; - if (sub_period.to) { - /* We already know the subtitle period `to' time */ - 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 (subtitle_id (sub)); - } + /* We can't trust the `to' time from sub_period as there are some decoders which + give a sub_period time for `to' which is subsequently overridden by a `stop' subtitle; + see also FFmpegExaminer. + */ + period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (subtitle_id (sub)); for (unsigned int i = 0; i < sub.num_rects; ++i) { AVSubtitleRect const * rect = sub.rects[i]; @@ -586,12 +607,13 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP out_p += image->stride()[0] / sizeof (uint32_t); } - dcp::Size const vs = _ffmpeg_content->video->size (); + int const target_width = subtitle_codec_context()->width; + int const target_height = subtitle_codec_context()->height; dcpomatic::Rect const scaled_rect ( - static_cast (rect->x) / vs.width, - static_cast (rect->y) / vs.height, - static_cast (rect->w) / vs.width, - static_cast (rect->h) / vs.height + static_cast (rect->x) / target_width, + static_cast (rect->y) / target_height, + static_cast (rect->w) / target_width, + static_cast (rect->h) / target_height ); subtitle->give_image (period, image, scaled_rect); @@ -612,54 +634,8 @@ FFmpegDecoder::decode_ass_subtitle (string ass, ContentTimePeriod period) 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 () - ) - ); - } - } + BOOST_FOREACH (sub::Subtitle const & i, sub::collect > (raw)) { + subtitle->give_text (period, i); } - - subtitle->give_text (period, ss); }