X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=f7bb979441870c707454df55e23ed15c94dfc926;hb=e8819ad7580f25eea7ca3c59cf0a3979d76a6b44;hp=d5285b73abea9448a971670017b823a9dbd507e0;hpb=f861018389acd9d277fe34d7621182b9b54f977f;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index d5285b73a..f7bb97944 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -1,3 +1,5 @@ +/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ + /* Copyright (C) 2012 Carl Hetherington @@ -48,6 +50,7 @@ extern "C" { #include "ffmpeg_decoder.h" #include "filter_graph.h" #include "subtitle.h" +#include "audio_buffers.h" #include "i18n.h" @@ -56,6 +59,7 @@ using std::string; using std::vector; using std::stringstream; using std::list; +using std::min; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; @@ -65,8 +69,8 @@ boost::mutex FFmpegDecoder::_mutex; FFmpegDecoder::FFmpegDecoder (shared_ptr f, shared_ptr c, bool video, bool audio, bool subtitles) : Decoder (f) - , VideoDecoder (f) - , AudioDecoder (f) + , VideoDecoder (f, c) + , AudioDecoder (f, c) , _ffmpeg_content (c) , _format_context (0) , _video_stream (-1) @@ -138,11 +142,13 @@ FFmpegDecoder::setup_general () } _audio_streams.push_back ( - FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channels) + shared_ptr ( + new FFmpegAudioStream (stream_name (s), i, s->codec->sample_rate, s->codec->channels) + ) ); - + } else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) { - _subtitle_streams.push_back (FFmpegSubtitleStream (stream_name (s), i)); + _subtitle_streams.push_back (shared_ptr (new FFmpegSubtitleStream (stream_name (s), i))); } } @@ -216,17 +222,19 @@ FFmpegDecoder::setup_subtitle () } -bool +void FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); - + if (r < 0) { if (r != AVERROR_EOF) { /* 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 (N_("error on av_read_frame (%1) (%2)"), buf, r)); + shared_ptr film = _film.lock (); + assert (film); + film->log()->log (String::compose (N_("error on av_read_frame (%1) (%2)"), buf, r)); } /* Get any remaining frames */ @@ -236,36 +244,21 @@ FFmpegDecoder::pass () /* XXX: should we reset _packet.data and size after each *_decode_* call? */ - int frame_finished; - if (_decode_video) { - while (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) { - filter_and_emit_video (); - } + while (decode_video_packet ()); } if (_ffmpeg_content->audio_stream() && _decode_audio) { decode_audio_packet (); } - return true; + return; } avcodec_get_frame_defaults (_frame); if (_packet.stream_index == _video_stream && _decode_video) { - - int frame_finished; - int const r = avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet); - if (r >= 0 && frame_finished) { - - if (r != _packet.size) { - _film->log()->log (String::compose (N_("Used only %1 bytes of %2 in packet"), r, _packet.size)); - } - - filter_and_emit_video (); - } - + decode_video_packet (); } else if (_ffmpeg_content->audio_stream() && _packet.stream_index == _ffmpeg_content->audio_stream()->id && _decode_audio) { decode_audio_packet (); } else if (_ffmpeg_content->subtitle_stream() && _packet.stream_index == _ffmpeg_content->subtitle_stream()->id && _decode_subtitles) { @@ -279,19 +272,18 @@ FFmpegDecoder::pass () if (sub.num_rects > 0) { shared_ptr ts; try { - emit_subtitle (shared_ptr (new TimedSubtitle (sub))); + subtitle (shared_ptr (new TimedSubtitle (sub))); } catch (...) { /* some problem with the subtitle; we probably didn't understand it */ } } else { - emit_subtitle (shared_ptr ()); + subtitle (shared_ptr ()); } avsubtitle_free (&sub); } } - + av_free_packet (&_packet); - return false; } /** @param data pointer to array of pointers to buffers. @@ -413,41 +405,11 @@ FFmpegDecoder::audio_sample_format () const } libdcp::Size -FFmpegDecoder::native_size () const +FFmpegDecoder::video_size () const { return libdcp::Size (_video_codec_context->width, _video_codec_context->height); } -PixelFormat -FFmpegDecoder::pixel_format () const -{ - return _video_codec_context->pix_fmt; -} - -int -FFmpegDecoder::time_base_numerator () const -{ - return _video_codec_context->time_base.num; -} - -int -FFmpegDecoder::time_base_denominator () const -{ - return _video_codec_context->time_base.den; -} - -int -FFmpegDecoder::sample_aspect_ratio_numerator () const -{ - return _video_codec_context->sample_aspect_ratio.num; -} - -int -FFmpegDecoder::sample_aspect_ratio_denominator () const -{ - return _video_codec_context->sample_aspect_ratio.den; -} - string FFmpegDecoder::stream_name (AVStream* s) const { @@ -482,69 +444,36 @@ FFmpegDecoder::bytes_per_audio_sample () const } void -FFmpegDecoder::filter_and_emit_video () +FFmpegDecoder::seek (Time t) { - boost::mutex::scoped_lock lm (_filter_graphs_mutex); - - shared_ptr graph; - - list >::iterator i = _filter_graphs.begin(); - 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, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)); - _filter_graphs.push_back (graph); - _film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format)); - } else { - graph = *i; - } - - list > images = graph->process (_frame); - - for (list >::iterator i = images.begin(); i != images.end(); ++i) { - int64_t const bet = av_frame_get_best_effort_timestamp (_frame); - if (bet != AV_NOPTS_VALUE) { - emit_video (*i, false, bet * av_q2d (_format_context->streams[_video_stream]->time_base)); - } else { - _film->log()->log ("Dropping frame without PTS"); - } - } + do_seek (t, false, false); } -bool -FFmpegDecoder::seek (double p) -{ - return do_seek (p, false, false); -} - -bool +void FFmpegDecoder::seek_back () { - if (last_content_time() < 2.5) { - return true; + if (next() < 2.5) { + return; } - return do_seek (last_content_time() - 2.5 / video_frame_rate(), true, true); + do_seek (next() - 2.5 * TIME_HZ / video_frame_rate(), true, true); } -bool +void FFmpegDecoder::seek_forward () { - if (last_content_time() >= (video_length() - video_frame_rate())) { - return true; + if (next() >= (video_length() - video_frame_rate())) { + return; } - return do_seek (last_content_time() - 0.5 / video_frame_rate(), true, true); + do_seek (next() - 0.5 * TIME_HZ / video_frame_rate(), true, true); } -bool -FFmpegDecoder::do_seek (double p, bool backwards, bool accurate) +void +FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate) { - int64_t const vt = p / av_q2d (_format_context->streams[_video_stream]->time_base); - - int const r = av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0); + int64_t const vt = t / (av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ); + av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0); avcodec_flush_buffers (_video_codec_context); if (_subtitle_codec_context) { @@ -555,7 +484,7 @@ FFmpegDecoder::do_seek (double p, bool backwards, bool accurate) while (1) { int r = av_read_frame (_format_context, &_packet); if (r < 0) { - return true; + return; } avcodec_get_frame_defaults (_frame); @@ -574,15 +503,14 @@ FFmpegDecoder::do_seek (double p, bool backwards, bool accurate) av_free_packet (&_packet); } } - - return r < 0; + + return; } void FFmpegDecoder::film_changed (Film::Property p) { switch (p) { - case Film::CROP: case Film::FILTERS: { boost::mutex::scoped_lock lm (_filter_graphs_mutex); @@ -635,3 +563,58 @@ FFmpegDecoder::decode_audio_packet () } } } + +bool +FFmpegDecoder::decode_video_packet () +{ + int frame_finished; + if (avcodec_decode_video2 (_video_codec_context, _frame, &frame_finished, &_packet) < 0 || !frame_finished) { + return false; + } + + boost::mutex::scoped_lock lm (_filter_graphs_mutex); + + shared_ptr graph; + + list >::iterator i = _filter_graphs.begin(); + 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, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)); + _filter_graphs.push_back (graph); + + shared_ptr film = _film.lock (); + assert (film); + film->log()->log (String::compose (N_("New graph for %1x%2, pixel format %3"), _frame->width, _frame->height, _frame->format)); + } else { + graph = *i; + } + + + list > images = graph->process (_frame); + + for (list >::iterator i = images.begin(); i != images.end(); ++i) { + int64_t const bet = av_frame_get_best_effort_timestamp (_frame); + if (bet != AV_NOPTS_VALUE) { + /* XXX: may need to insert extra frames / remove frames here ... + (as per old Matcher) + */ + Time const t = bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ; + video (*i, false, t); + } else { + shared_ptr film = _film.lock (); + assert (film); + film->log()->log ("Dropping frame without PTS"); + } + } + + return true; +} + +Time +FFmpegDecoder::next () const +{ + return min (_next_video, _next_audio); +}