X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=741716b0400acc818c23d965b02eb97071d8278e;hb=0a93237cb5e4642d3b698ff9b7d0cfae5401478c;hp=a98aa98289e6839dedf04ccc557c33b68d1e9c71;hpb=b666a794a130386bc01ede2143ef40bd6973eb32;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index a98aa9828..741716b04 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,16 +24,17 @@ extern "C" {
 }
 #include "ffmpeg.h"
 #include "ffmpeg_content.h"
+#include "ffmpeg_audio_stream.h"
+#include "ffmpeg_subtitle_stream.h"
 #include "exceptions.h"
 #include "util.h"
+#include "raw_convert.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
-using boost::lexical_cast;
 
 boost::mutex FFmpeg::_mutex;
 
@@ -47,8 +48,7 @@ FFmpeg::FFmpeg (boost::shared_ptr<const FFmpegContent> c)
 	, _video_stream (-1)
 {
 	setup_general ();
-	setup_video ();
-	setup_audio ();
+	setup_decoders ();
 }
 
 FFmpeg::~FFmpeg ()
@@ -56,14 +56,10 @@ FFmpeg::~FFmpeg ()
 	boost::mutex::scoped_lock lm (_mutex);
 
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
-		AVCodecContext* context = _format_context->streams[i]->codec;
-		if (context->codec_type == AVMEDIA_TYPE_VIDEO || context->codec_type == AVMEDIA_TYPE_AUDIO) {
-			avcodec_close (context);
-		}
+		avcodec_close (_format_context->streams[i]->codec);
 	}
 
 	av_frame_free (&_frame);
-	
 	avformat_close_input (&_format_context);
 }
 
@@ -94,8 +90,8 @@ FFmpeg::setup_general ()
 	/* These durations are in microseconds, and represent how far into the content file
 	   we will look for streams.
 	*/
-	av_dict_set (&options, "analyzeduration", lexical_cast<string> (5 * 60 * 1e6).c_str(), 0);
-	av_dict_set (&options, "probesize", lexical_cast<string> (5 * 60 * 1e6).c_str(), 0);
+	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 (avformat_open_input (&_format_context, 0, 0, &options) < 0) {
 		throw OpenFileError (_ffmpeg_content->path(0).string ());
@@ -107,13 +103,31 @@ FFmpeg::setup_general ()
 
 	/* Find video stream */
 
+	int video_stream_undefined_frame_rate = -1;
+
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		AVStream* s = _format_context->streams[i];
+		/* Files from iTunes sometimes have two video streams, one with the avg_frame_rate.num and .den set
+		   to zero.  Ignore these streams.
+		*/
 		if (s->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
-			_video_stream = i;
+			if (s->avg_frame_rate.num > 0 && s->avg_frame_rate.den > 0) {
+				/* This is definitely our video stream */
+				_video_stream = i;
+			} else {
+				/* This is our video stream if we don't get a better offer */
+				video_stream_undefined_frame_rate = i;
+			}
 		}
 	}
 
+	/* 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"));
 	}
@@ -143,46 +157,32 @@ FFmpeg::setup_general ()
 }
 
 void
-FFmpeg::setup_video ()
-{
-	boost::mutex::scoped_lock lm (_mutex);
-
-	assert (_video_stream >= 0);
-	AVCodecContext* context = _format_context->streams[_video_stream]->codec;
-	AVCodec* codec = avcodec_find_decoder (context->codec_id);
-
-	if (codec == 0) {
-		throw DecodeError (_("could not find video decoder"));
-	}
-
-	if (avcodec_open2 (context, codec, 0) < 0) {
-		throw DecodeError (N_("could not open video decoder"));
-	}
-}
-
-void
-FFmpeg::setup_audio ()
+FFmpeg::setup_decoders ()
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
 	for (uint32_t i = 0; i < _format_context->nb_streams; ++i) {
 		AVCodecContext* context = _format_context->streams[i]->codec;
-		if (context->codec_type != AVMEDIA_TYPE_AUDIO) {
-			continue;
-		}
 		
 		AVCodec* codec = avcodec_find_decoder (context->codec_id);
-		if (codec == 0) {
-			throw DecodeError (_("could not find audio decoder"));
-		}
-		
-		if (avcodec_open2 (context, codec, 0) < 0) {
-			throw DecodeError (N_("could not open audio decoder"));
+		if (codec) {
+
+			/* 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);
+			
+			if (avcodec_open2 (context, codec, &options) < 0) {
+				throw DecodeError (N_("could not open decoder"));
+			}
 		}
+
+		/* We are silently ignoring any failures to find suitable decoders here */
 	}
 }
 
-
 AVCodecContext *
 FFmpeg::video_codec_context () const
 {
@@ -190,13 +190,13 @@ FFmpeg::video_codec_context () const
 }
 
 AVCodecContext *
-FFmpeg::audio_codec_context () const
+FFmpeg::subtitle_codec_context () const
 {
-	if (!_ffmpeg_content->audio_stream ()) {
+	if (!_ffmpeg_content->subtitle_stream ()) {
 		return 0;
 	}
 	
-	return _ffmpeg_content->audio_stream()->stream(_format_context)->codec;
+	return _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec;
 }
 
 int