X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=1f16514d7496b780b31d1ff5a4002d54c0f63923;hp=29dda1b9eaa0bbab513bd110d2dfe41c402ae43a;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hpb=54d17e98a597334bf1ba2615e3eb6191088f606f

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 29dda1b9e..1f16514d7 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
@@ -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 <dcp/raw_convert.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -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<Log> FFmpeg::_ffmpeg_log;
@@ -56,7 +58,6 @@ FFmpeg::FFmpeg (boost::shared_ptr<const FFmpegContent> c)
 	, _avio_context (0)
 	, _format_context (0)
 	, _frame (0)
-	, _video_stream (-1)
 {
 	setup_general ();
 	setup_decoders ();
@@ -140,7 +141,7 @@ FFmpeg::setup_general ()
 
 	/* Find video stream */
 
-	int video_stream_undefined_frame_rate = -1;
+	optional<int> video_stream_undefined_frame_rate;
 
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		AVStream* s = _format_context->streams[i];
@@ -158,12 +159,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,12 +202,16 @@ 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"));
@@ -224,7 +225,11 @@ FFmpeg::setup_decoders ()
 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,7 +277,7 @@ FFmpeg::subtitle_period (AVSubtitle const & sub)
 string
 FFmpeg::subtitle_id (AVSubtitle const & sub)
 {
-	MD5Digester digester;
+	Digester digester;
 	digester.add (sub.pts);
 	for (unsigned int i = 0; i < sub.num_rects; ++i) {
 		AVSubtitleRect* rect = sub.rects[i];
@@ -280,16 +285,24 @@ FFmpeg::subtitle_id (AVSubtitle const & sub)
 		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
 	}
 	return digester.get ();
 }
 
+/** @return true if sub starts a new image subtitle */
 bool
-FFmpeg::subtitle_is_image (AVSubtitle const & sub)
+FFmpeg::subtitle_starts_image (AVSubtitle const & sub)
 {
 	bool image = false;
 	bool text = false;