X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=0e15880024f9d0a1eb3ebbbcb9246a6509b3ae79;hb=ebd735b9ccbf4b959029da0a6cc33bb01fb3bcdd;hp=7d152e4904a32682a8c64f0e84ee4d9470efd280;hpb=a83e1ca3f9fd1550020054b8e064a8e2048b6410;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 7d152e490..0e1588002 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -43,10 +43,16 @@ extern "C" { #include "filter_graph.h" #include "audio_buffers.h" #include "ffmpeg_content.h" -#include "image_proxy.h" +#include "raw_image_proxy.h" +#include "film.h" +#include "timer.h" #include "i18n.h" +#define LOG_GENERAL(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_ERROR(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); +#define LOG_WARNING(...) _video_content->film()->log()->log (__VA_ARGS__, Log::TYPE_WARNING); + using std::cout; using std::string; using std::vector; @@ -54,6 +60,7 @@ using std::stringstream; using std::list; using std::min; using std::pair; +using std::make_pair; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; @@ -62,10 +69,9 @@ using dcp::Size; FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr log) : VideoDecoder (c) , AudioDecoder (c) + , SubtitleDecoder (c) , FFmpeg (c) , _log (log) - , _subtitle_codec_context (0) - , _subtitle_codec (0) { /* Audio and video frame PTS values may not start with 0. We want to fiddle them so that: @@ -100,15 +106,6 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr c, shared_ptr } } -FFmpegDecoder::~FFmpegDecoder () -{ - boost::mutex::scoped_lock lm (_mutex); - - if (_subtitle_codec_context) { - avcodec_close (_subtitle_codec_context); - } -} - void FFmpegDecoder::flush () { @@ -137,7 +134,7 @@ FFmpegDecoder::pass () /* Maybe we should fail here, but for now we'll just finish off instead */ char buf[256]; av_strerror (r, buf, sizeof(buf)); - _log->log (String::compose (N_("error on av_read_frame (%1) (%2)"), buf, r)); + LOG_ERROR (N_("error on av_read_frame (%1) (%2)"), buf, r); } flush (); @@ -145,7 +142,7 @@ FFmpegDecoder::pass () } int const si = _packet.stream_index; - + if (si == _video_stream) { decode_video_packet (); } else if (_ffmpeg_content->audio_stream() && _ffmpeg_content->audio_stream()->uses_index (_format_context, si)) { @@ -287,75 +284,27 @@ FFmpegDecoder::bytes_per_audio_sample () const return av_get_bytes_per_sample (audio_sample_format ()); } -int -FFmpegDecoder::minimal_run (boost::function, optional, int)> finished) +void +FFmpegDecoder::seek (ContentTime time, bool accurate) { - int frames_read = 0; - optional last_video; - optional last_audio; - - while (!finished (last_video, last_audio, frames_read)) { - int r = av_read_frame (_format_context, &_packet); - if (r < 0) { - /* We should flush our decoders here, possibly yielding a few more frames, - but the consequence of having to do that is too hideous to contemplate. - Instead we give up and say that you can't seek too close to the end - of a file. - */ - return frames_read; - } - - ++frames_read; - - double const time_base = av_q2d (_format_context->streams[_packet.stream_index]->time_base); - - if (_packet.stream_index == _video_stream) { - - avcodec_get_frame_defaults (_frame); - - int got_picture = 0; - r = avcodec_decode_video2 (video_codec_context(), _frame, &got_picture, &_packet); - if (r >= 0 && got_picture) { - last_video = ContentTime::from_seconds (av_frame_get_best_effort_timestamp (_frame) * time_base) + _pts_offset; - } + VideoDecoder::seek (time, accurate); + AudioDecoder::seek (time, accurate); + + /* If we are doing an `accurate' seek, we need to use pre-roll, as + we don't really know what the seek will give us. + */ - } else if (_ffmpeg_content->audio_stream() && _ffmpeg_content->audio_stream()->uses_index (_format_context, _packet.stream_index)) { - AVPacket copy_packet = _packet; - while (copy_packet.size > 0) { - - int got_frame; - r = avcodec_decode_audio4 (audio_codec_context(), _frame, &got_frame, &_packet); - if (r >= 0 && got_frame) { - last_audio = ContentTime::from_seconds (av_frame_get_best_effort_timestamp (_frame) * time_base) + _pts_offset; - } - - copy_packet.data += r; - copy_packet.size -= r; - } - } - - av_free_packet (&_packet); + ContentTime pre_roll = accurate ? ContentTime::from_seconds (2) : ContentTime (0); + time -= pre_roll; + if (time < ContentTime (0)) { + time = ContentTime (0); } - return frames_read; -} - -bool -FFmpegDecoder::seek_overrun_finished (ContentTime seek, optional last_video, optional last_audio) const -{ - return (last_video && last_video.get() >= seek) || (last_audio && last_audio.get() >= seek); -} - -bool -FFmpegDecoder::seek_final_finished (int n, int done) const -{ - return n == done; -} - -void -FFmpegDecoder::seek_and_flush (ContentTime t) -{ - ContentTime const u = t - _pts_offset; + /* XXX: it seems debatable whether PTS should be used here... + http://www.mjbshaw.com/2012/04/seeking-in-ffmpeg-know-your-timestamp.html + */ + + ContentTime const u = time - _pts_offset; int64_t s = u.seconds() / av_q2d (_format_context->streams[_video_stream]->time_base); if (_ffmpeg_content->audio_stream ()) { @@ -376,42 +325,8 @@ FFmpegDecoder::seek_and_flush (ContentTime t) if (audio_codec_context ()) { avcodec_flush_buffers (audio_codec_context ()); } - if (_subtitle_codec_context) { - avcodec_flush_buffers (_subtitle_codec_context); - } -} - -void -FFmpegDecoder::seek (ContentTime time, bool accurate) -{ - VideoDecoder::seek (time, accurate); - AudioDecoder::seek (time, accurate); - - /* If we are doing an accurate seek, our initial shot will be 2s (2 being - a number plucked from the air) earlier than we want to end up. The loop below - will hopefully then step through to where we want to be. - */ - - ContentTime pre_roll = accurate ? ContentTime::from_seconds (2) : ContentTime (0); - ContentTime initial_seek = time - pre_roll; - if (initial_seek < ContentTime (0)) { - initial_seek = ContentTime (0); - } - - /* Initial seek time in the video stream's timebase */ - - seek_and_flush (initial_seek); - - if (!accurate) { - /* That'll do */ - return; - } - - int const N = minimal_run (boost::bind (&FFmpegDecoder::seek_overrun_finished, this, time, _1, _2)); - - seek_and_flush (initial_seek); - if (N > 0) { - minimal_run (boost::bind (&FFmpegDecoder::seek_final_finished, this, N - 1, _3)); + if (subtitle_codec_context ()) { + avcodec_flush_buffers (subtitle_codec_context ()); } } @@ -430,7 +345,7 @@ FFmpegDecoder::decode_audio_packet () int const decode_result = avcodec_decode_audio4 (audio_codec_context(), _frame, &frame_finished, ©_packet); if (decode_result < 0) { - _log->log (String::compose ("avcodec_decode_audio4 failed (%1)", decode_result)); + LOG_ERROR ("avcodec_decode_audio4 failed (%1)", decode_result); return; } @@ -472,7 +387,7 @@ FFmpegDecoder::decode_video_packet () if (i == _filter_graphs.end ()) { graph.reset (new FilterGraph (_ffmpeg_content, dcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)); _filter_graphs.push_back (graph); - _log->log (String::compose (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format)); + LOG_GENERAL (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format); } else { graph = *i; } @@ -485,9 +400,12 @@ FFmpegDecoder::decode_video_packet () if (i->second != AV_NOPTS_VALUE) { double const pts = i->second * av_q2d (_format_context->streams[_video_stream]->time_base) + _pts_offset.seconds (); - video (shared_ptr (new RawImageProxy (image)), rint (pts * _ffmpeg_content->video_frame_rate ())); + video ( + shared_ptr (new RawImageProxy (image, _video_content->film()->log())), + rint (pts * _ffmpeg_content->video_frame_rate ()) + ); } else { - _log->log ("Dropping frame without PTS"); + LOG_WARNING ("Dropping frame without PTS"); } } @@ -499,7 +417,7 @@ FFmpegDecoder::decode_subtitle_packet () { int got_subtitle; AVSubtitle sub; - if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) < 0 || !got_subtitle) { + if (avcodec_decode_subtitle2 (subtitle_codec_context(), &sub, &got_subtitle, &_packet) < 0 || !got_subtitle) { return; } @@ -516,12 +434,7 @@ FFmpegDecoder::decode_subtitle_packet () /* Subtitle PTS (within the source, not taking into account any of the source that we may have chopped off for the DCP) */ - ContentTime packet_time = ContentTime::from_seconds (static_cast (sub.pts) / AV_TIME_BASE) + _pts_offset; - - ContentTimePeriod period ( - packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3), - packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3) - ); + ContentTimePeriod period = subtitle_period (sub) + _pts_offset; AVSubtitleRect const * rect = sub.rects[0]; @@ -571,3 +484,9 @@ FFmpegDecoder::decode_subtitle_packet () avsubtitle_free (&sub); } + +list +FFmpegDecoder::subtitles_during (ContentTimePeriod p, bool starting) const +{ + return _ffmpeg_content->subtitles_during (p, starting); +}