X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=f7bb979441870c707454df55e23ed15c94dfc926;hb=e8819ad7580f25eea7ca3c59cf0a3979d76a6b44;hp=a637160ae918228ad73c7e9aba46ce49dbdc1e7d;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index a637160ae..f7bb97944 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -59,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; @@ -68,7 +69,7 @@ boost::mutex FFmpegDecoder::_mutex; FFmpegDecoder::FFmpegDecoder (shared_ptr f, shared_ptr c, bool video, bool audio, bool subtitles) : Decoder (f) - , VideoDecoder (f) + , VideoDecoder (f, c) , AudioDecoder (f, c) , _ffmpeg_content (c) , _format_context (0) @@ -221,7 +222,7 @@ FFmpegDecoder::setup_subtitle () } -bool +void FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); @@ -231,7 +232,9 @@ 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)); - _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 */ @@ -249,7 +252,7 @@ FFmpegDecoder::pass () decode_audio_packet (); } - return true; + return; } avcodec_get_frame_defaults (_frame); @@ -269,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. @@ -403,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 { @@ -471,38 +443,37 @@ FFmpegDecoder::bytes_per_audio_sample () const return av_get_bytes_per_sample (audio_sample_format ()); } -bool -FFmpegDecoder::seek (double p) +void +FFmpegDecoder::seek (Time t) { - return do_seek (p, false, false); + do_seek (t, 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) { @@ -513,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); @@ -532,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); @@ -603,22 +573,26 @@ FFmpegDecoder::decode_video_packet () } 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)); + + 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) { @@ -627,11 +601,20 @@ FFmpegDecoder::decode_video_packet () /* XXX: may need to insert extra frames / remove frames here ... (as per old Matcher) */ - emit_video (*i, false, bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ); + Time const t = bet * av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ; + video (*i, false, t); } else { - _film->log()->log ("Dropping frame without PTS"); + 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); +}