Partial work on using a no-video FFmpeg file.

7 files changed, 82 insertions, 29 deletions

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 7b1eae2b1..bfa3d4e7f 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -161,10 +161,6 @@ FFmpeg::setup_general ()
 		_video_stream = video_stream_undefined_frame_rate.get();
 	}
 
-	if (!_video_stream) {
-		throw DecodeError (N_("could not find video stream"));
-	}
-
 	/* 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
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index a0bf88c25..bb9795f25 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -64,11 +64,7 @@ int const FFmpegContentProperty::FILTERS = 102;
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::path p)
 	: Content (film, p)
 {
-	video.reset (new VideoContent (this, film));
-	audio.reset (new AudioContent (this, film));
-	subtitle.reset (new SubtitleContent (this, film));
 
-	set_default_colour_conversion ();
 }
 
 FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes)
@@ -210,35 +206,44 @@ FFmpegContent::examine (shared_ptr<Job> job)
 	Content::examine (job);
 
 	shared_ptr<FFmpegExaminer> examiner (new FFmpegExaminer (shared_from_this (), job));
-	video->take_from_examiner (examiner);
-	set_default_colour_conversion ();
+
+	if (examiner->has_video ()) {
+		video.reset (new VideoContent (this, film ()));
+		video->take_from_examiner (examiner);
+		set_default_colour_conversion ();
+	}
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
 
-		_subtitle_streams = examiner->subtitle_streams ();
-		if (!_subtitle_streams.empty ()) {
-			_subtitle_stream = _subtitle_streams.front ();
+		if (examiner->has_video ()) {
+			_first_video = examiner->first_video ();
+			_color_range = examiner->color_range ();
+			_color_primaries = examiner->color_primaries ();
+			_color_trc = examiner->color_trc ();
+			_colorspace = examiner->colorspace ();
+			_bits_per_pixel = examiner->bits_per_pixel ();
 		}
 
-		BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
-			audio->add_stream (i);
-		}
+		if (!examiner->audio_streams().empty ()) {
+			audio.reset (new AudioContent (this, film ()));
+
+			BOOST_FOREACH (shared_ptr<FFmpegAudioStream> i, examiner->audio_streams ()) {
+				audio->add_stream (i);
+			}
 
-		if (!audio->streams().empty ()) {
 			AudioStreamPtr as = audio->streams().front();
 			AudioMapping m = as->mapping ();
 			film()->make_audio_mapping_default (m);
 			as->set_mapping (m);
 		}
 
-		_first_video = examiner->first_video ();
+		_subtitle_streams = examiner->subtitle_streams ();
+		if (!_subtitle_streams.empty ()) {
+			subtitle.reset (new SubtitleContent (this, film ()));
+			_subtitle_stream = _subtitle_streams.front ();
+		}
 
-		_color_range = examiner->color_range ();
-		_color_primaries = examiner->color_primaries ();
-		_color_trc = examiner->color_trc ();
-		_colorspace = examiner->colorspace ();
-		_bits_per_pixel = examiner->bits_per_pixel ();
 	}
 
 	signal_changed (FFmpegContentProperty::SUBTITLE_STREAMS);
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 72df69126..d84bb2a52 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -77,8 +77,12 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log>
 	, SubtitleDecoder (c->subtitle)
 	, FFmpeg (c)
 	, _log (log)
-	, _pts_offset (pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->active_video_frame_rate()))
 {
+	if (c->video) {
+		_pts_offset = pts_offset (c->ffmpeg_audio_streams(), c->first_video(), c->active_video_frame_rate());
+	} else {
+		_pts_offset = ContentTime ();
+	}
 }
 
 void
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index eeb0cfc38..44d6a87df 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -72,10 +72,12 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 		}
 	}
 
-	/* See if the header has duration information in it */
-	_need_video_length = _format_context->duration == AV_NOPTS_VALUE;
-	if (!_need_video_length) {
-		_video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get ();
+	if (has_video ()) {
+		/* See if the header has duration information in it */
+		_need_video_length = _format_context->duration == AV_NOPTS_VALUE;
+		if (!_need_video_length) {
+			_video_length = (double (_format_context->duration) / AV_TIME_BASE) * video_frame_rate().get ();
+		}
 	}
 
 	if (job) {
@@ -169,7 +171,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 	   this is because we might not know the PTS offset when the first subtitle is seen.
 	   Now we know the PTS offset so we can apply it to those subtitles.
 	*/
-	if (video_frame_rate()) {
+	if (has_video() && video_frame_rate()) {
 		BOOST_FOREACH (shared_ptr<FFmpegSubtitleStream> i, _subtitle_streams) {
 			i->add_offset (pts_offset (_audio_streams, _first_video, video_frame_rate().get()));
 		}
@@ -477,3 +479,9 @@ FFmpegExaminer::yuv () const
 		return false;
 	}
 }
+
+bool
+FFmpegExaminer::has_video () const
+{
+	return static_cast<bool> (_video_stream);
+}
diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index b9ca04e4c..258c2ea53 100644
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -32,6 +32,8 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer
 public:
 	FFmpegExaminer (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Job> job = boost::shared_ptr<Job> ());
 
+	bool has_video () const;
+
 	boost::optional<double> video_frame_rate () const;
 	dcp::Size video_size () const;
 	Frame video_length () const;
diff --git a/test/ffmpeg_audio_only_test.cc b/test/ffmpeg_audio_only_test.cc
new file mode 100644
index 000000000..a0c39b9c1
--- /dev/null
+++ b/test/ffmpeg_audio_only_test.cc
@@ -0,0 +1,37 @@
+/*
+    Copyright (C) 2016 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
+    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,
+    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.
+
+*/
+
+#include "lib/film.h"
+#include "lib/ffmpeg_content.h"
+#include "test.h"
+#include <boost/test/unit_test.hpp>
+
+using boost::shared_ptr;
+
+/** Test the FFmpeg code with audio-only content */
+BOOST_AUTO_TEST_CASE (ffmpeg_audio_only_test)
+{
+	shared_ptr<Film> film = new_test_film ("ffmpeg_audio_only_test");
+	film->set_name ("test_film");
+	shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/sine_440.mp3"));
+	film->examine_and_add_content (c);
+	wait_for_jobs ();
+	film->write_metadata ();
+}
+
diff --git a/test/wscript b/test/wscript
index 7efe6e61c..a93eac661 100644
--- a/test/wscript
+++ b/test/wscript
@@ -51,6 +51,7 @@ def build(bld):
                  dcp_subtitle_test.cc
                  dcpomatic_time_test.cc
                  ffmpeg_audio_test.cc
+                 ffmpeg_audio_only_test.cc
                  ffmpeg_dcp_test.cc
                  ffmpeg_decoder_seek_test.cc
                  ffmpeg_decoder_sequential_test.cc