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.
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);
if (video_frame.len - video_offset == 0 ||
video_frame.len - video_offset != expected_length) {
if (video_frame.len != 0) {
- printf("%s: Dropping video frame with wrong length (%ld; expected %ld)\n",
+ printf("%s: Dropping video frame with wrong length (%zu; expected %zu)\n",
spec_to_string(device).c_str(), video_frame.len - video_offset, expected_length);
}
if (video_frame.owner) {
}
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;
}
// 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()) {