X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=85c65763f146e12ac31f1b18dea24b1ceac8c74c;hp=ab5148cfa0295e79f8e838282dc943974989b4db;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index ab5148cfa..85c65763f 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,6 +29,7 @@
 #include "ffmpeg_audio_stream.h"
 #include "digester.h"
 #include "compose.hpp"
+#include "config.h"
 #include <dcp/raw_convert.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -36,7 +37,6 @@ extern "C" {
 #include <libswscale/swscale.h>
 }
 #include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -45,14 +45,14 @@ using std::string;
 using std::cout;
 using std::cerr;
 using std::vector;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using dcp::raw_convert;
 using namespace dcpomatic;
 
 boost::mutex FFmpeg::_mutex;
 
-FFmpeg::FFmpeg (boost::shared_ptr<const FFmpegContent> c)
+FFmpeg::FFmpeg (std::shared_ptr<const FFmpegContent> c)
 	: _ffmpeg_content (c)
 	, _avio_buffer (0)
 	, _avio_buffer_size (4096)
@@ -68,9 +68,11 @@ FFmpeg::~FFmpeg ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
+DCPOMATIC_DISABLE_WARNINGS
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		avcodec_close (_format_context->streams[i]->codec);
 	}
+DCPOMATIC_ENABLE_WARNINGS
 
 	av_frame_free (&_frame);
 	avformat_close_input (&_format_context);
@@ -114,22 +116,19 @@ FFmpeg::setup_general ()
 	_file_group.set_paths (_ffmpeg_content->paths ());
 	_avio_buffer = static_cast<uint8_t*> (wrapped_av_malloc (_avio_buffer_size));
 	_avio_context = avio_alloc_context (_avio_buffer, _avio_buffer_size, 0, this, avio_read_wrapper, 0, avio_seek_wrapper);
+	if (!_avio_context) {
+		throw std::bad_alloc ();
+	}
 	_format_context = avformat_alloc_context ();
+	if (!_format_context) {
+		throw std::bad_alloc ();
+	}
 	_format_context->pb = _avio_context;
 
 	AVDictionary* options = 0;
-	/* These durations are in microseconds, and represent how far into the content file
-	   we will look for streams.
-	*/
-	av_dict_set (&options, "analyzeduration", raw_convert<string> (5 * 60 * 1000000).c_str(), 0);
-	av_dict_set (&options, "probesize", raw_convert<string> (5 * 60 * 1000000).c_str(), 0);
-	if (_ffmpeg_content->decryption_key()) {
-		av_dict_set (&options, "decryption_key", _ffmpeg_content->decryption_key()->c_str(), 0);
-	}
-
 	int e = avformat_open_input (&_format_context, 0, 0, &options);
 	if (e < 0) {
-		throw OpenFileError (_ffmpeg_content->path(0).string(), e, true);
+		throw OpenFileError (_ffmpeg_content->path(0).string(), e, OpenFileError::READ);
 	}
 
 	if (avformat_find_stream_info (_format_context, 0) < 0) {
@@ -140,6 +139,7 @@ FFmpeg::setup_general ()
 
 	optional<int> video_stream_undefined_frame_rate;
 
+DCPOMATIC_DISABLE_WARNINGS
 	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 && avcodec_find_decoder(s->codec->codec_id)) {
@@ -152,6 +152,7 @@ FFmpeg::setup_general ()
 			}
 		}
 	}
+DCPOMATIC_ENABLE_WARNINGS
 
 	/* 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.
@@ -160,6 +161,11 @@ FFmpeg::setup_general ()
 		_video_stream = video_stream_undefined_frame_rate.get();
 	}
 
+	/* Ignore video streams with crazy frame rates.  These are usually things like album art on MP3s. */
+	if (_video_stream && av_q2d(av_guess_frame_rate(_format_context, _format_context->streams[_video_stream.get()], 0)) > 1000) {
+		_video_stream = optional<int>();
+	}
+
 	/* Hack: if the AVStreams have duplicate IDs, replace them with our
 	   own.  We use the IDs so that we can cope with VOBs, in which streams
 	   move about in index but remain with the same ID in different
@@ -193,6 +199,7 @@ FFmpeg::setup_decoders ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
+DCPOMATIC_DISABLE_WARNINGS
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		AVCodecContext* context = _format_context->streams[i]->codec;
 
@@ -219,8 +226,10 @@ FFmpeg::setup_decoders ()
 			dcpomatic_log->log (String::compose ("No codec found for stream %1", i), LogEntry::TYPE_WARNING);
 		}
 	}
+DCPOMATIC_ENABLE_WARNINGS
 }
 
+DCPOMATIC_DISABLE_WARNINGS
 AVCodecContext *
 FFmpeg::video_codec_context () const
 {
@@ -240,6 +249,7 @@ FFmpeg::subtitle_codec_context () const
 
 	return _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec;
 }
+DCPOMATIC_ENABLE_WARNINGS
 
 int
 FFmpeg::avio_read (uint8_t* buffer, int const amount)
@@ -303,7 +313,7 @@ FFmpeg::pts_offset (vector<shared_ptr<FFmpegAudioStream> > audio_streams, option
 		po = - first_video.get ();
 	}
 
-	BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, audio_streams) {
+	for (auto i: audio_streams) {
 		if (i->first_audio) {
 			po = max (po, - i->first_audio.get ());
 		}