X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg.cc;h=fa369dda429c9342c2b08eed7a4b74ee50a38c35;hb=391d85619ac19a2a93696ddc35c222eb9bb5d9d6;hp=ebe62b51fbd412cb73956b2ae86db2c6058257ab;hpb=4388fff5376a6e5a6dc8d33e244a1245a728335c;p=dcpomatic.git

diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index ebe62b51f..fa369dda4 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
@@ -22,9 +22,11 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
 }
-#include <libdcp/raw_convert.h>
+#include <dcp/raw_convert.h>
 #include "ffmpeg.h"
 #include "ffmpeg_content.h"
+#include "ffmpeg_audio_stream.h"
+#include "ffmpeg_subtitle_stream.h"
 #include "exceptions.h"
 #include "util.h"
 
@@ -33,7 +35,7 @@ extern "C" {
 using std::string;
 using std::cout;
 using boost::shared_ptr;
-using libdcp::raw_convert;
+using dcp::raw_convert;
 
 boost::mutex FFmpeg::_mutex;
 
@@ -47,8 +49,7 @@ FFmpeg::FFmpeg (boost::shared_ptr<const FFmpegContent> c)
 	, _video_stream (-1)
 {
 	setup_general ();
-	setup_video ();
-	setup_audio ();
+	setup_decoders ();
 }
 
 FFmpeg::~FFmpeg ()
@@ -56,14 +57,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);
 }
 
@@ -143,46 +140,24 @@ 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) {
+			if (avcodec_open2 (context, codec, 0) < 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
 {
@@ -192,9 +167,23 @@ FFmpeg::video_codec_context () const
 AVCodecContext *
 FFmpeg::audio_codec_context () const
 {
+	if (!_ffmpeg_content->audio_stream ()) {
+		return 0;
+	}
+	
 	return _ffmpeg_content->audio_stream()->stream(_format_context)->codec;
 }
 
+AVCodecContext *
+FFmpeg::subtitle_codec_context () const
+{
+	if (!_ffmpeg_content->subtitle_stream ()) {
+		return 0;
+	}
+	
+	return _ffmpeg_content->subtitle_stream()->stream(_format_context)->codec;
+}
+
 int
 FFmpeg::avio_read (uint8_t* buffer, int const amount)
 {