X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.cc;h=250bce9558513da6bd7d4899dfee416fe4feb641;hb=6917c511507bee74297845267811e7bcc042e62e;hp=d49878217338fb40e29eab6892b62d44c788ef9d;hpb=80430058f5eefb55147218a85225adeb6b616f4d;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index d49878217..250bce955 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -93,8 +93,10 @@ FFmpegDecoder::FFmpegDecoder (shared_ptr<const Film> film, shared_ptr<const FFmp
 	}
 
 	if (c->only_text()) {
-		/* XXX: this time here should be the time of the first subtitle, not 0 */
-		text.push_back (make_shared<TextDecoder>(this, c->only_text(), ContentTime()));
+		text.push_back (make_shared<TextDecoder>(this, c->only_text()));
+		/* XXX: we should be calling maybe_set_position() on this TextDecoder, but we can't easily find
+		 * the time of the first subtitle at this point.
+		 */
 	}
 
 	for (auto i: c->ffmpeg_audio_streams()) {
@@ -144,7 +146,7 @@ FFmpegDecoder::flush ()
 		auto const f = full_length.frames_round (vfr);
 		auto v = video->position(film()).get_value_or(ContentTime()).frames_round(vfr) + 1;
 		while (v < f) {
-			video->emit (film(), shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)), v);
+			video->emit (film(), make_shared<const RawImageProxy>(_black_image), v);
 			++v;
 		}
 	}
@@ -450,6 +452,8 @@ FFmpegDecoder::process_audio_frame (shared_ptr<FFmpegAudioStream> stream)
 	auto frame = audio_frame (stream);
 	auto data = deinterleave_audio (frame);
 
+	auto const time_base = stream->stream(_format_context)->time_base;
+
 	ContentTime ct;
 	if (frame->pts == AV_NOPTS_VALUE) {
 		/* In some streams we see not every frame coming through with a timestamp; for those
@@ -462,8 +466,16 @@ FFmpegDecoder::process_audio_frame (shared_ptr<FFmpegAudioStream> stream)
 	} else {
 		ct = ContentTime::from_seconds (
 			frame->best_effort_timestamp *
-			av_q2d (stream->stream(_format_context)->time_base))
+			av_q2d(time_base))
 			+ _pts_offset;
+		LOG_DEBUG_PLAYER(
+			"Process audio with timestamp %1 (BET %2, timebase %3/%4, (PTS offset %5)",
+			to_string(ct),
+			frame->best_effort_timestamp,
+			time_base.num,
+			time_base.den,
+			to_string(_pts_offset)
+			);
 	}
 
 	_next_time[stream] = ct + ContentTime::from_frames(data->frames(), stream->frame_rate());
@@ -483,7 +495,7 @@ FFmpegDecoder::process_audio_frame (shared_ptr<FFmpegAudioStream> stream)
 			data->frames(),
 			stream->id(),
 			frame->best_effort_timestamp,
-			av_q2d(stream->stream(_format_context)->time_base),
+			av_q2d(time_base),
 			to_string(_pts_offset)
 			);
 	}
@@ -506,6 +518,7 @@ FFmpegDecoder::decode_and_process_audio_packet (AVPacket* packet)
 	auto context = _codec_context[stream->index(_format_context)];
 	auto frame = audio_frame (stream);
 
+	LOG_DEBUG_PLAYER("Send audio packet on stream %1", stream->index(_format_context));
 	int r = avcodec_send_packet (context, packet);
 	if (r < 0) {
 		LOG_WARNING("avcodec_send_packet returned %1 for an audio packet", r);
@@ -514,6 +527,7 @@ FFmpegDecoder::decode_and_process_audio_packet (AVPacket* packet)
 		r = avcodec_receive_frame (context, frame);
 		if (r == AVERROR(EAGAIN)) {
 			/* More input is required */
+			LOG_DEBUG_PLAYER_NC("EAGAIN after trying to receive auido frame");
 			return;
 		}
 
@@ -644,6 +658,7 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet)
 		_have_current_subtitle = true;
 	}
 
+	ContentBitmapText bitmap_text(from);
 	for (unsigned int i = 0; i < sub.num_rects; ++i) {
 		auto const rect = sub.rects[i];
 
@@ -651,7 +666,7 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet)
 		case SUBTITLE_NONE:
 			break;
 		case SUBTITLE_BITMAP:
-			process_bitmap_subtitle (rect, from);
+			bitmap_text.subs.push_back(process_bitmap_subtitle(rect));
 			break;
 		case SUBTITLE_TEXT:
 			cout << "XXX: SUBTITLE_TEXT " << rect->text << "\n";
@@ -662,6 +677,10 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet)
 		}
 	}
 
+	if (!bitmap_text.subs.empty()) {
+		only_text()->emit_bitmap_start(bitmap_text);
+	}
+
 	if (_current_subtitle_to) {
 		only_text()->emit_stop (*_current_subtitle_to);
 	}
@@ -670,8 +689,8 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet)
 }
 
 
-void
-FFmpegDecoder::process_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from)
+BitmapText
+FFmpegDecoder::process_bitmap_subtitle (AVSubtitleRect const * rect)
 {
 	/* Note BGRA is expressed little-endian, so the first byte in the word is B, second
 	   G, third R, fourth A.
@@ -754,7 +773,7 @@ FFmpegDecoder::process_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime
 		static_cast<double>(rect->h) / target_height
 		);
 
-	only_text()->emit_bitmap_start (from, image, scaled_rect);
+	return { image, scaled_rect };
 }
 
 
@@ -784,7 +803,8 @@ FFmpegDecoder::process_ass_subtitle (string ass, ContentTime from)
 		base,
 		text,
 		_ffmpeg_content->video->size().width,
-		_ffmpeg_content->video->size().height
+		_ffmpeg_content->video->size().height,
+		sub::Colour(1, 1, 1)
 		);
 
 	for (auto const& i: sub::collect<vector<sub::Subtitle>>(raw)) {