#include "mjpeg_encoder.h"
+#include <assert.h>
#include <jpeglib.h>
#include <unistd.h>
#if __SSE2__
int MJPEGEncoder::write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)
{
- MJPEGEncoder *engine = (MJPEGEncoder *)opaque;
- return engine->write_packet2(buf, buf_size, type, time);
+ WritePacket2Context *ctx = (WritePacket2Context *)opaque;
+ return ctx->mjpeg_encoder->write_packet2(ctx->stream_id, buf, buf_size, type, time);
}
-int MJPEGEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)
+int MJPEGEncoder::write_packet2(HTTPD::StreamID stream_id, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time)
{
+ string *mux_header = &streams[stream_id].mux_header;
if (type == AVIO_DATA_MARKER_HEADER) {
- mux_header.append((char *)buf, buf_size);
- httpd->set_header(HTTPD::MULTICAM_STREAM, mux_header);
+ mux_header->append((char *)buf, buf_size);
+ httpd->set_header(stream_id, *mux_header);
} else {
- httpd->add_data(HTTPD::MULTICAM_STREAM, (char *)buf, buf_size, /*keyframe=*/true, AV_NOPTS_VALUE, AVRational{ AV_TIME_BASE, 1 });
+ httpd->add_data(stream_id, (char *)buf, buf_size, /*keyframe=*/true, AV_NOPTS_VALUE, AVRational{ AV_TIME_BASE, 1 });
}
return buf_size;
}
MJPEGEncoder::MJPEGEncoder(HTTPD *httpd, const string &va_display)
: httpd(httpd)
{
- // Set up the mux. We don't use the Mux wrapper, because it's geared towards
- // a situation with only one video stream (and possibly one audio stream)
- // with known width/height, and we don't need the extra functionality it provides.
- avctx.reset(avformat_alloc_context());
- avctx->oformat = av_guess_format("nut", nullptr, nullptr);
-
- uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
- avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, this, nullptr, nullptr, nullptr);
- avctx->pb->write_data_type = &MJPEGEncoder::write_packet2_thunk;
- avctx->flags = AVFMT_FLAG_CUSTOM_IO;
-
- for (unsigned card_idx = 0; card_idx < global_flags.card_to_mjpeg_stream_export.size(); ++card_idx) {
- add_video_stream(avctx.get());
+ create_ffmpeg_context(HTTPD::StreamID{ HTTPD::MULTICAM_STREAM, 0 });
+ for (unsigned stream_idx = 0; stream_idx < MAX_VIDEO_CARDS; ++stream_idx) {
+ create_ffmpeg_context(HTTPD::StreamID{ HTTPD::SIPHON_STREAM, stream_idx });
}
- for (unsigned card_idx = 0; card_idx < global_flags.card_to_mjpeg_stream_export.size(); ++card_idx) {
- add_audio_stream(avctx.get());
- }
- finalize_mux(avctx.get());
+
+ add_stream(HTTPD::StreamID{ HTTPD::MULTICAM_STREAM, 0 });
// Initialize VA-API.
string error;
MJPEGEncoder::~MJPEGEncoder()
{
- av_free(avctx->pb->buffer);
+ for (auto &id_and_stream : streams) {
+ av_free(id_and_stream.second.avctx->pb->buffer);
+ }
global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "zero_size" }});
global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "interlaced" }});
{
// Only bother doing MJPEG encoding if there are any connected clients
// that want the stream.
- if (httpd->get_num_connected_multicam_clients() == 0) {
+ if (httpd->get_num_connected_multicam_clients() == 0 &&
+ httpd->get_num_connected_siphon_clients(card_index) == 0) {
return false;
}
// Will call back in the receiver thread.
encode_jpeg_va(move(qf));
} else {
+ update_siphon_streams();
+
+ HTTPD::StreamID multicam_id{ HTTPD::MULTICAM_STREAM, 0 };
+ HTTPD::StreamID siphon_id{ HTTPD::SIPHON_STREAM, qf.card_index };
+ assert(streams.count(multicam_id));
+
// Write audio before video, since Futatabi expects it.
if (qf.audio.size() > 0) {
- write_audio_packet(qf.pts, stream_index, qf.audio);
+ write_audio_packet(streams[multicam_id].avctx.get(), qf.pts, stream_index + global_flags.card_to_mjpeg_stream_export.size(), qf.audio);
+ if (streams.count(siphon_id)) {
+ write_audio_packet(streams[siphon_id].avctx.get(), qf.pts, /*stream_index=*/1, qf.audio);
+ }
}
// Encode synchronously, in the same thread.
vector<uint8_t> jpeg = encode_jpeg_libjpeg(qf);
- write_mjpeg_packet(qf.pts, stream_index, jpeg.data(), jpeg.size());
+ write_mjpeg_packet(streams[multicam_id].avctx.get(), qf.pts, stream_index, jpeg.data(), jpeg.size());
+ if (streams.count(siphon_id)) {
+ write_mjpeg_packet(streams[siphon_id].avctx.get(), qf.pts, /*stream_index=*/0, jpeg.data(), jpeg.size());
+ }
}
}
free(tmp_cr);
}
-void MJPEGEncoder::write_mjpeg_packet(int64_t pts, unsigned card_index, const uint8_t *jpeg, size_t jpeg_size)
+void MJPEGEncoder::write_mjpeg_packet(AVFormatContext *avctx, int64_t pts, unsigned stream_index, const uint8_t *jpeg, size_t jpeg_size)
{
AVPacket pkt;
memset(&pkt, 0, sizeof(pkt));
pkt.buf = nullptr;
pkt.data = const_cast<uint8_t *>(jpeg);
pkt.size = jpeg_size;
- pkt.stream_index = card_index;
+ pkt.stream_index = stream_index;
pkt.flags = AV_PKT_FLAG_KEY;
AVRational time_base = avctx->streams[pkt.stream_index]->time_base;
pkt.pts = pkt.dts = av_rescale_q(pts, AVRational{ 1, TIMEBASE }, time_base);
pkt.duration = 0;
- if (av_write_frame(avctx.get(), &pkt) < 0) {
+ if (av_write_frame(avctx, &pkt) < 0) {
fprintf(stderr, "av_write_frame() failed\n");
abort();
}
}
-void MJPEGEncoder::write_audio_packet(int64_t pts, unsigned card_index, const vector<int32_t> &audio)
+void MJPEGEncoder::write_audio_packet(AVFormatContext *avctx, int64_t pts, unsigned stream_index, const vector<int32_t> &audio)
{
AVPacket pkt;
memset(&pkt, 0, sizeof(pkt));
pkt.buf = nullptr;
pkt.data = reinterpret_cast<uint8_t *>(const_cast<int32_t *>(&audio[0]));
pkt.size = audio.size() * sizeof(audio[0]);
- pkt.stream_index = card_index + global_flags.card_to_mjpeg_stream_export.size();
+ pkt.stream_index = stream_index;
pkt.flags = AV_PKT_FLAG_KEY;
AVRational time_base = avctx->streams[pkt.stream_index]->time_base;
pkt.pts = pkt.dts = av_rescale_q(pts, AVRational{ 1, TIMEBASE }, time_base);
size_t num_stereo_samples = audio.size() / 2;
pkt.duration = av_rescale_q(num_stereo_samples, AVRational{ 1, OUTPUT_FREQUENCY }, time_base);
- if (av_write_frame(avctx.get(), &pkt) < 0) {
+ if (av_write_frame(avctx, &pkt) < 0) {
fprintf(stderr, "av_write_frame() failed\n");
abort();
}
frames_encoding.pop();
}
+ update_siphon_streams();
+
assert(global_flags.card_to_mjpeg_stream_export.count(qf.card_index)); // Or should_encode_mjpeg_for_card() would have returned false.
int stream_index = global_flags.card_to_mjpeg_stream_export[qf.card_index];
+ HTTPD::StreamID multicam_id{ HTTPD::MULTICAM_STREAM, 0 };
+ HTTPD::StreamID siphon_id{ HTTPD::SIPHON_STREAM, qf.card_index };
+ assert(streams.count(multicam_id));
+ assert(streams[multicam_id].avctx != nullptr);
+
// Write audio before video, since Futatabi expects it.
if (qf.audio.size() > 0) {
- write_audio_packet(qf.pts, stream_index, qf.audio);
+ write_audio_packet(streams[multicam_id].avctx.get(), qf.pts, stream_index + global_flags.card_to_mjpeg_stream_export.size(), qf.audio);
+ if (streams.count(siphon_id)) {
+ write_audio_packet(streams[siphon_id].avctx.get(), qf.pts, /*stream_index=*/1, qf.audio);
+ }
}
VAStatus va_status = vaSyncSurface(va_dpy->va_dpy, qf.resources.surface);
CHECK_VASTATUS(va_status, "vaMapBuffer");
const uint8_t *coded_buf = reinterpret_cast<uint8_t *>(segment->buf);
- write_mjpeg_packet(qf.pts, stream_index, coded_buf, segment->size);
+ write_mjpeg_packet(streams[multicam_id].avctx.get(), qf.pts, stream_index, coded_buf, segment->size);
+ if (streams.count(siphon_id)) {
+ write_mjpeg_packet(streams[siphon_id].avctx.get(), qf.pts, /*stream_index=*/0, coded_buf, segment->size);
+ }
va_status = vaUnmapBuffer(va_dpy->va_dpy, qf.resources.data_buffer);
CHECK_VASTATUS(va_status, "vaUnmapBuffer");
return dest.dest;
}
+
+void MJPEGEncoder::add_stream(HTTPD::StreamID stream_id)
+{
+ AVFormatContextWithCloser avctx;
+
+ // Set up the mux. We don't use the Mux wrapper, because it's geared towards
+ // a situation with only one video stream (and possibly one audio stream)
+ // with known width/height, and we don't need the extra functionality it provides.
+ avctx.reset(avformat_alloc_context());
+ avctx->oformat = av_guess_format("nut", nullptr, nullptr);
+
+ uint8_t *buf = (uint8_t *)av_malloc(MUX_BUFFER_SIZE);
+ avctx->pb = avio_alloc_context(buf, MUX_BUFFER_SIZE, 1, &ffmpeg_contexts[stream_id], nullptr, nullptr, nullptr);
+ avctx->pb->write_data_type = &MJPEGEncoder::write_packet2_thunk;
+ avctx->flags = AVFMT_FLAG_CUSTOM_IO;
+
+ if (stream_id.type == HTTPD::MULTICAM_STREAM) {
+ for (unsigned card_idx = 0; card_idx < global_flags.card_to_mjpeg_stream_export.size(); ++card_idx) {
+ add_video_stream(avctx.get());
+ }
+ for (unsigned card_idx = 0; card_idx < global_flags.card_to_mjpeg_stream_export.size(); ++card_idx) {
+ add_audio_stream(avctx.get());
+ }
+ } else {
+ assert(stream_id.type == HTTPD::SIPHON_STREAM);
+ add_video_stream(avctx.get());
+ add_audio_stream(avctx.get());
+ }
+ finalize_mux(avctx.get());
+
+ Stream s;
+ s.avctx = move(avctx);
+ streams[stream_id] = move(s);
+}
+
+void MJPEGEncoder::update_siphon_streams()
+{
+ // Bring the list of streams into sync with what the clients need.
+ for (auto it = streams.begin(); it != streams.end(); ) {
+ if (it->first.type != HTTPD::SIPHON_STREAM) {
+ ++it;
+ continue;
+ }
+ if (httpd->get_num_connected_siphon_clients(it->first.index) == 0) {
+ av_free(it->second.avctx->pb->buffer);
+ streams.erase(it++);
+ } else {
+ ++it;
+ }
+ }
+ for (unsigned stream_idx = 0; stream_idx < MAX_VIDEO_CARDS; ++stream_idx) {
+ HTTPD::StreamID stream_id{ HTTPD::SIPHON_STREAM, stream_idx };
+ if (streams.count(stream_id) == 0 && httpd->get_num_connected_siphon_clients(stream_idx) > 0) {
+ add_stream(stream_id);
+ }
+ }
+}
+
+void MJPEGEncoder::create_ffmpeg_context(HTTPD::StreamID stream_id)
+{
+ ffmpeg_contexts.emplace(stream_id, WritePacket2Context{ this, stream_id });
+}
projects / nageru / blobdiff