X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=ac179e1d62df8ffa0830056b36a39e09447d697e;hb=71a358ce70bf9156e895f3dc6515e65628950422;hp=df708d923d278d21d2aaab71c97e7263ef626a62;hpb=22873931f874a87fcf6a0077eddbec0f97eb3423;p=dcpomatic.git diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index df708d923..ac179e1d6 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-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 . */ @@ -22,12 +23,12 @@ #include "film.h" #include "exceptions.h" #include "util.h" -#include "raw_convert.h" #include "log.h" #include "ffmpeg_subtitle_stream.h" #include "ffmpeg_audio_stream.h" -#include "md5_digester.h" +#include "digester.h" #include "compose.hpp" +#include extern "C" { #include #include @@ -45,6 +46,7 @@ using std::cerr; using std::vector; using boost::shared_ptr; using boost::optional; +using dcp::raw_convert; boost::mutex FFmpeg::_mutex; boost::weak_ptr FFmpeg::_ffmpeg_log; @@ -56,7 +58,6 @@ FFmpeg::FFmpeg (boost::shared_ptr c) , _avio_context (0) , _format_context (0) , _frame (0) - , _video_stream (-1) { setup_general (); setup_decoders (); @@ -109,8 +110,6 @@ FFmpeg::ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl) void FFmpeg::setup_general () { - av_register_all (); - /* This might not work too well in some cases of multiple FFmpeg decoders, but it's probably good enough. */ @@ -130,8 +129,9 @@ FFmpeg::setup_general () av_dict_set (&options, "analyzeduration", raw_convert (5 * 60 * 1000000).c_str(), 0); av_dict_set (&options, "probesize", raw_convert (5 * 60 * 1000000).c_str(), 0); - if (avformat_open_input (&_format_context, 0, 0, &options) < 0) { - throw OpenFileError (_ffmpeg_content->path(0).string ()); + int e = avformat_open_input (&_format_context, 0, 0, &options); + if (e < 0) { + throw OpenFileError (_ffmpeg_content->path(0).string(), e, true); } if (avformat_find_stream_info (_format_context, 0) < 0) { @@ -140,11 +140,11 @@ FFmpeg::setup_general () /* Find video stream */ - int video_stream_undefined_frame_rate = -1; + optional video_stream_undefined_frame_rate; for (uint32_t i = 0; i < _format_context->nb_streams; ++i) { AVStream* s = _format_context->streams[i]; - if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO && avcodec_find_decoder(s->codec->codec_id)) { if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) { /* This is definitely our video stream */ _video_stream = i; @@ -158,12 +158,8 @@ FFmpeg::setup_general () /* Files from iTunes sometimes have two video streams, one with the avg_frame_rate.num and .den set to zero. Only use such a stream if there is no alternative. */ - if (_video_stream == -1 && video_stream_undefined_frame_rate != -1) { - _video_stream = video_stream_undefined_frame_rate; - } - - if (_video_stream < 0) { - throw DecodeError (N_("could not find video stream")); + if (!_video_stream && video_stream_undefined_frame_rate) { + _video_stream = video_stream_undefined_frame_rate.get(); } /* Hack: if the AVStreams have duplicate IDs, replace them with our @@ -205,26 +201,37 @@ FFmpeg::setup_decoders () AVCodec* codec = avcodec_find_decoder (context->codec_id); if (codec) { + AVDictionary* options = 0; /* This option disables decoding of DCA frame footers in our patched version of FFmpeg. I believe these footers are of no use to us, and they can cause problems when FFmpeg fails to decode them (mantis #352). */ - AVDictionary* options = 0; av_dict_set (&options, "disable_footer", "1", 0); + /* This allows decoding of some DNxHR 444 and HQX files; see + https://trac.ffmpeg.org/ticket/5681 + */ + av_dict_set_int (&options, "strict", FF_COMPLIANCE_EXPERIMENTAL, 0); if (avcodec_open2 (context, codec, &options) < 0) { throw DecodeError (N_("could not open decoder")); } + } else { + shared_ptr log = _ffmpeg_log.lock (); + if (log) { + log->log (String::compose ("No codec found for stream %1", i), LogEntry::TYPE_WARNING); + } } - - /* We are silently ignoring any failures to find suitable decoders here */ } } AVCodecContext * FFmpeg::video_codec_context () const { - return _format_context->streams[_video_stream]->codec; + if (!_video_stream) { + return 0; + } + + return _format_context->streams[_video_stream.get()]->codec; } AVCodecContext * @@ -272,24 +279,62 @@ FFmpeg::subtitle_period (AVSubtitle const & sub) string FFmpeg::subtitle_id (AVSubtitle const & sub) { - MD5Digester digester; - digester.add (sub.start_display_time); - digester.add (sub.end_display_time); + Digester digester; digester.add (sub.pts); for (unsigned int i = 0; i < sub.num_rects; ++i) { AVSubtitleRect* rect = sub.rects[i]; - digester.add (rect->x); - digester.add (rect->y); - digester.add (rect->w); - digester.add (rect->h); - int const line = rect->pict.linesize[0]; - for (int j = 0; j < rect->h; ++j) { - digester.add (rect->pict.data[0] + j * line, line); + if (rect->type == SUBTITLE_BITMAP) { + digester.add (rect->x); + digester.add (rect->y); + digester.add (rect->w); + digester.add (rect->h); +#ifdef DCPOMATIC_HAVE_AVSUBTITLERECT_PICT + int const line = rect->pict.linesize[0]; + for (int j = 0; j < rect->h; ++j) { + digester.add (rect->pict.data[0] + j * line, line); + } +#else + int const line = rect->linesize[0]; + for (int j = 0; j < rect->h; ++j) { + digester.add (rect->data[0] + j * line, line); + } +#endif + } else if (rect->type == SUBTITLE_TEXT) { + digester.add (string (rect->text)); + } else if (rect->type == SUBTITLE_ASS) { + digester.add (string (rect->ass)); } } return digester.get (); } +/** @return true if sub starts a new image subtitle */ +bool +FFmpeg::subtitle_starts_image (AVSubtitle const & sub) +{ + bool image = false; + bool text = false; + + for (unsigned int i = 0; i < sub.num_rects; ++i) { + switch (sub.rects[i]->type) { + case SUBTITLE_BITMAP: + image = true; + break; + case SUBTITLE_TEXT: + case SUBTITLE_ASS: + text = true; + break; + default: + break; + } + } + + /* We can't cope with mixed image/text in one AVSubtitle */ + DCPOMATIC_ASSERT (!image || !text); + + return image; +} + /** Compute the pts offset to use given a set of audio streams and some video details. * Sometimes these parameters will have just been determined by an Examiner, sometimes * they will have been retrieved from a piece of Content, hence the need for this method @@ -337,7 +382,7 @@ FFmpeg::pts_offset (vector > audio_streams, option /* Now adjust so that the video pts starts on a frame */ if (first_video) { ContentTime const fvc = first_video.get() + po; - po += fvc.round_up (video_frame_rate) - fvc; + po += fvc.ceil (video_frame_rate) - fvc; } return po;