X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=d1b52ef2dc54b4a9db8ad84e755bbadc4ac76411;hb=39889eeed810016fd7d277d8bbfcc58e6f305c82;hp=7ef2a4c576d185fb72a9e0895cb9cd3142248a8b;hpb=0b3495b854b286a3c0e54b80148d9dbca6921b96;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 7ef2a4c..d1b52ef 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -779,12 +779,12 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 
 		bool success;
 		do {
-			success = audio_mixer->add_silence(device, silence_samples, dropped_frames, frame_length);
+			success = audio_mixer->add_silence(device, silence_samples, dropped_frames);
 		} while (!success);
 	}
 
 	if (num_samples > 0) {
-		audio_mixer->add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, frame_length, audio_frame.received_timestamp);
+		audio_mixer->add_audio(device, audio_frame.data + audio_offset, num_samples, audio_format, audio_frame.received_timestamp);
 	}
 
 	// Done with the audio, so release it.
@@ -795,6 +795,11 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 	card->last_timecode = timecode;
 
 	PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)video_frame.userdata;
+	if (card->type == CardType::FFMPEG_INPUT && userdata != nullptr) {
+		FFmpegCapture *ffmpeg_capture = static_cast<FFmpegCapture *>(card->capture.get());
+		userdata->has_last_subtitle = ffmpeg_capture->get_has_last_subtitle();
+		userdata->last_subtitle = ffmpeg_capture->get_last_subtitle();
+	}
 
 	size_t cbcr_width, cbcr_height, cbcr_offset, y_offset;
 	size_t expected_length = video_format.stride * (video_format.height + video_format.extra_lines_top + video_format.extra_lines_bottom);
@@ -860,6 +865,7 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 		}
 		frame_upload_start = steady_clock::now();
 	}
+	assert(userdata != nullptr);
 	userdata->last_interlaced = video_format.interlaced;
 	userdata->last_has_signal = video_format.has_signal;
 	userdata->last_is_connected = video_format.is_connected;
@@ -1076,7 +1082,7 @@ void Mixer::thread_func()
 			}
 
 			// Only bother doing MJPEG encoding if there are any connected clients
-			// that want the stream.
+			// that want the stream. FIXME: We should also stop memcpy-ing if there are none!
 			if (httpd.get_num_connected_multicam_clients() > 0) {
 				auto stream_it = global_flags.card_to_mjpeg_stream_export.find(card_index);
 				if (stream_it != global_flags.card_to_mjpeg_stream_export.end()) {