X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=ee9d9eecbc8258e68615aa47d965dbc48704de23;hb=bd709c1e98e7653dafe7dff302440a7890140c7d;hp=7923be59bb6c3e696ee372135cc39e512c3c4dbd;hpb=4c60c74890ee16333ecf3adb87e69fc49d9a304f;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 7923be59b..ee9d9eecb 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -47,10 +47,10 @@ extern "C" {
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
-#define LOG_ERROR(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR);
-#define LOG_WARNING_NC(...) _log->log (__VA_ARGS__, Log::TYPE_WARNING);
-#define LOG_WARNING(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING);
+#define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+#define LOG_ERROR(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_ERROR);
+#define LOG_WARNING_NC(...) _log->log (__VA_ARGS__, LogEntry::TYPE_WARNING);
+#define LOG_WARNING(...) _log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_WARNING);
 
 using std::cout;
 using std::vector;
@@ -89,7 +89,7 @@ FFmpegDecoder::flush ()
 }
 
 bool
-FFmpegDecoder::pass ()
+FFmpegDecoder::pass (PassReason reason)
 {
 	int r = av_read_frame (_format_context, &_packet);
 
@@ -112,11 +112,11 @@ FFmpegDecoder::pass ()
 	int const si = _packet.stream_index;
 	shared_ptr<const FFmpegContent> fc = _ffmpeg_content;
 
-	if (si == _video_stream && !_ignore_video) {
+	if (si == _video_stream && !_ignore_video && reason != PASS_REASON_SUBTITLE) {
 		decode_video_packet ();
 	} else if (fc->subtitle_stream() && fc->subtitle_stream()->uses_index (_format_context, si)) {
 		decode_subtitle_packet ();
-	} else {
+	} else if (reason != PASS_REASON_SUBTITLE) {
 		decode_audio_packet ();
 	}
 
@@ -337,7 +337,7 @@ FFmpegDecoder::decode_audio_packet ()
 
 			if (ct < ContentTime ()) {
 				/* Discard audio data that comes before time 0 */
-				Frame const remove = min (int64_t (data->frames()), -ct.frames_round ((*stream)->frame_rate ()));
+				Frame const remove = min (int64_t (data->frames()), (-ct).frames_ceil(double((*stream)->frame_rate ())));
 				data->move (remove, 0, data->frames() - remove);
 				data->set_frames (data->frames() - remove);
 				ct += ContentTime::from_frames (remove, (*stream)->frame_rate ());
@@ -412,8 +412,6 @@ FFmpegDecoder::decode_subtitle_packet ()
 		   indicate that the previous subtitle should stop.  We can ignore it here.
 		*/
 		return;
-	} else if (sub.num_rects > 1) {
-		throw DecodeError (_("multi-part subtitles not yet supported"));
 	}
 
 	/* Subtitle PTS (within the source, not taking into account any of the
@@ -430,20 +428,22 @@ FFmpegDecoder::decode_subtitle_packet ()
 		period.to = ffmpeg_content()->subtitle_stream()->find_subtitle_to (period.from);
 	}
 
-	AVSubtitleRect const * rect = sub.rects[0];
-
-	switch (rect->type) {
-	case SUBTITLE_NONE:
-		break;
-	case SUBTITLE_BITMAP:
-		decode_bitmap_subtitle (rect, period);
-		break;
-	case SUBTITLE_TEXT:
-		cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
-		break;
-	case SUBTITLE_ASS:
-		cout << "XXX: SUBTITLE_ASS " << rect->ass << "\n";
-		break;
+	for (unsigned int i = 0; i < sub.num_rects; ++i) {
+		AVSubtitleRect const * rect = sub.rects[i];
+
+		switch (rect->type) {
+		case SUBTITLE_NONE:
+			break;
+		case SUBTITLE_BITMAP:
+			decode_bitmap_subtitle (rect, period);
+			break;
+		case SUBTITLE_TEXT:
+			cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
+			break;
+		case SUBTITLE_ASS:
+			cout << "XXX: SUBTITLE_ASS " << rect->ass << "\n";
+			break;
+		}
 	}
 
 	avsubtitle_free (&sub);
@@ -467,7 +467,7 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
 	/* Note RGBA is expressed little-endian, so the first byte in the word is R, second
 	   G, third B, fourth A.
 	*/
-	shared_ptr<Image> image (new Image (PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true));
+	shared_ptr<Image> image (new Image (AV_PIX_FMT_RGBA, dcp::Size (rect->w, rect->h), true));
 
 	/* Start of the first line in the subtitle */
 	uint8_t* sub_p = rect->pict.data[0];