X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=d9bcedfc528f196ba9a85b064d1f3900f32fdbbc;hp=d73063083f894fa82a39e5dd316796ac97f79589;hb=3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0;hpb=8fb0f4eaa6d91ca9369f45dd7a57c29149edaaac

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index d73063083..d9bcedfc5 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.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
@@ -23,6 +23,9 @@ extern "C" {
 }
 #include "ffmpeg_examiner.h"
 #include "ffmpeg_content.h"
+#include "ffmpeg_audio_stream.h"
+#include "ffmpeg_subtitle_stream.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -61,55 +64,93 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c)
 		}
 	}
 
-	/* Run through until we find the first audio (for each stream) and video */
-
+	/* Run through until we find:
+	 *   - the first video.
+	 *   - the first audio for each stream.
+	 *   - the subtitle periods for each stream.
+	 *
+	 * We have to note subtitle periods as otherwise we have no way of knowing
+	 * where we should look for subtitles (video and audio are always present,
+	 * so they are ok).
+	 */
 	while (1) {
 		int r = av_read_frame (_format_context, &_packet);
 		if (r < 0) {
 			break;
 		}
 
-		int frame_finished;
-
 		AVCodecContext* context = _format_context->streams[_packet.stream_index]->codec;
 
-		if (_packet.stream_index == _video_stream && !_first_video) {
-			if (avcodec_decode_video2 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-				_first_video = frame_time (_format_context->streams[_video_stream]);
-			}
-		} else {
-			for (size_t i = 0; i < _audio_streams.size(); ++i) {
-				if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index) && !_audio_streams[i]->first_audio) {
-					if (avcodec_decode_audio4 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
-						_audio_streams[i]->first_audio = frame_time (_audio_streams[i]->stream (_format_context));
-					}
-				}
+		if (_packet.stream_index == _video_stream) {
+			video_packet (context);
+		}
+		
+		for (size_t i = 0; i < _audio_streams.size(); ++i) {
+			if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index)) {
+				audio_packet (context, _audio_streams[i]);
 			}
 		}
 
-		bool have_all_audio = true;
-		size_t i = 0;
-		while (i < _audio_streams.size() && have_all_audio) {
-			have_all_audio = _audio_streams[i]->first_audio;
-			++i;
+		for (size_t i = 0; i < _subtitle_streams.size(); ++i) {
+			if (_subtitle_streams[i]->uses_index (_format_context, _packet.stream_index)) {
+				subtitle_packet (context, _subtitle_streams[i]);
+			}
 		}
 
 		av_free_packet (&_packet);
-		
-		if (_first_video && have_all_audio) {
-			break;
+	}
+}
+
+void
+FFmpegExaminer::video_packet (AVCodecContext* context)
+{
+	if (_first_video) {
+		return;
+	}
+
+	int frame_finished;
+	if (avcodec_decode_video2 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+		_first_video = frame_time (_format_context->streams[_video_stream]);
+	}
+}
+
+void
+FFmpegExaminer::audio_packet (AVCodecContext* context, shared_ptr<FFmpegAudioStream> stream)
+{
+	if (stream->first_audio) {
+		return;
+	}
+
+	int frame_finished;
+	if (avcodec_decode_audio4 (context, _frame, &frame_finished, &_packet) >= 0 && frame_finished) {
+		stream->first_audio = frame_time (stream->stream (_format_context));
+	}
+}
+
+void
+FFmpegExaminer::subtitle_packet (AVCodecContext* context, shared_ptr<FFmpegSubtitleStream> stream)
+{
+	int frame_finished;
+	AVSubtitle sub;
+	if (avcodec_decode_subtitle2 (context, &sub, &frame_finished, &_packet) >= 0 && frame_finished) {
+		ContentTimePeriod const period = subtitle_period (sub);
+		if (sub.num_rects == 0 && !stream->periods.empty () && stream->periods.back().to > period.from) {
+			/* Finish the last subtitle */
+			stream->periods.back().to = period.from;
+		} else if (sub.num_rects == 1) {
+			stream->periods.push_back (period);
 		}
 	}
 }
 
-optional<double>
+optional<ContentTime>
 FFmpegExaminer::frame_time (AVStream* s) const
 {
-	optional<double> t;
+	optional<ContentTime> t;
 	
 	int64_t const bet = av_frame_get_best_effort_timestamp (_frame);
 	if (bet != AV_NOPTS_VALUE) {
-		t = bet * av_q2d (s->time_base);
+		t = ContentTime::from_seconds (bet * av_q2d (s->time_base));
 	}
 
 	return t;
@@ -118,27 +159,25 @@ FFmpegExaminer::frame_time (AVStream* s) const
 float
 FFmpegExaminer::video_frame_rate () const
 {
-	AVStream* s = _format_context->streams[_video_stream];
-
-	if (s->avg_frame_rate.num && s->avg_frame_rate.den) {
-		return av_q2d (s->avg_frame_rate);
-	}
-
-	return av_q2d (s->r_frame_rate);
+	/* This use of r_frame_rate is debateable; there's a few different
+	 * frame rates in the format context, but this one seems to be the most
+	 * reliable.
+	 */
+	return av_q2d (av_stream_get_r_frame_rate (_format_context->streams[_video_stream]));
 }
 
-libdcp::Size
+dcp::Size
 FFmpegExaminer::video_size () const
 {
-	return libdcp::Size (video_codec_context()->width, video_codec_context()->height);
+	return dcp::Size (video_codec_context()->width, video_codec_context()->height);
 }
 
-/** @return Length (in video frames) according to our content's header */
-VideoContent::Frame
+/** @return Length according to our content's header */
+ContentTime
 FFmpegExaminer::video_length () const
 {
-	VideoContent::Frame const length = (double (_format_context->duration - _format_context->start_time) / AV_TIME_BASE) * video_frame_rate();
-	return max (1, length);
+	ContentTime const length = ContentTime::from_seconds (double (_format_context->duration - _format_context->start_time) / AV_TIME_BASE);
+	return ContentTime (max (int64_t (1), length.get ()));
 }
 
 string