X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=119e82851ec5de9433d119e2409b1b951067104f;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hp=c0867095fed9c5279b15fb794abeaa0d59faa268;hpb=596441a4e8cf03a88113646ca6da2f90e721a38b;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index c0867095f..119e82851 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -222,7 +222,7 @@ FFmpegDecoder::setup_subtitle () } -bool +void FFmpegDecoder::pass () { int r = av_read_frame (_format_context, &_packet); @@ -232,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 */ @@ -250,7 +252,7 @@ FFmpegDecoder::pass () decode_audio_packet (); } - return true; + return; } avcodec_get_frame_defaults (_frame); @@ -270,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. @@ -404,17 +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; -} - string FFmpegDecoder::stream_name (AVStream* s) const { @@ -448,38 +443,37 @@ FFmpegDecoder::bytes_per_audio_sample () const return av_get_bytes_per_sample (audio_sample_format ()); } -bool +void FFmpegDecoder::seek (Time t) { - return do_seek (t, false, false); + do_seek (t, false, false); } -bool +void FFmpegDecoder::seek_back () { - if (next() < 2.5) { - return true; + if (next() < (2.5 * TIME_HZ / video_frame_rate())) { + return; } - return do_seek (next() - 2.5 * TIME_HZ / video_frame_rate(), true, true); + do_seek (next() - 2.5 * TIME_HZ / video_frame_rate(), true, true); } -bool +void FFmpegDecoder::seek_forward () { - if (next() >= (video_length() - video_frame_rate())) { - return true; + if (next() >= (_ffmpeg_content->length() - 0.5 * TIME_HZ / video_frame_rate())) { + return; } - return do_seek (next() - 0.5 * TIME_HZ / video_frame_rate(), true, true); + do_seek (next() - 0.5 * TIME_HZ / video_frame_rate(), true, true); } -bool +void FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate) { int64_t const vt = t / (av_q2d (_format_context->streams[_video_stream]->time_base) * TIME_HZ); - - int const r = av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0); + av_seek_frame (_format_context, _video_stream, vt, backwards ? AVSEEK_FLAG_BACKWARD : 0); avcodec_flush_buffers (_video_codec_context); if (_subtitle_codec_context) { @@ -490,7 +484,7 @@ FFmpegDecoder::do_seek (Time t, 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); @@ -510,23 +504,7 @@ FFmpegDecoder::do_seek (Time t, bool backwards, bool accurate) } } - return r < 0; -} - -void -FFmpegDecoder::film_changed (Film::Property p) -{ - switch (p) { - case Film::FILTERS: - { - boost::mutex::scoped_lock lm (_filter_graphs_mutex); - _filter_graphs.clear (); - } - break; - - default: - break; - } + return; } /** @return Length (in video frames) according to our content's header */ @@ -588,26 +566,39 @@ FFmpegDecoder::decode_video_packet () } if (i == _filter_graphs.end ()) { - graph.reset (new FilterGraph (_film, this, libdcp::Size (_frame->width, _frame->height), (AVPixelFormat) _frame->format)); + shared_ptr film = _film.lock (); + assert (film); + + graph.reset (new FilterGraph (_ffmpeg_content, 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)); + + 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); + + string post_process = Filter::ffmpeg_strings (_ffmpeg_content->filters()).second; for (list >::iterator i = images.begin(); i != images.end(); ++i) { + + shared_ptr image = *i; + if (!post_process.empty ()) { + image = image->post_process (post_process, true); + } + 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; - emit_video (*i, false, t); + video (image, false, t); } else { - _film->log()->log ("Dropping frame without PTS"); + shared_ptr film = _film.lock (); + assert (film); + film->log()->log ("Dropping frame without PTS"); } } @@ -617,5 +608,13 @@ FFmpegDecoder::decode_video_packet () Time FFmpegDecoder::next () const { - return min (_next_video, _next_audio); + if (_decode_video && _decode_audio) { + return min (_next_video, _next_audio); + } + + if (_decode_audio) { + return _next_audio; + } + + return _next_video; }