MJPEGEncoder::MJPEGEncoder(HTTPD *httpd, const string &va_display)
: httpd(httpd)
{
- encoder_thread = thread(&MJPEGEncoder::encoder_thread_func, this);
-
// 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->pb->write_data_type = &MJPEGEncoder::write_packet2_thunk;
avctx->flags = AVFMT_FLAG_CUSTOM_IO;
- for (int card_idx = 0; card_idx < global_flags.num_cards; ++card_idx) {
+ for (unsigned card_idx = 0; card_idx < global_flags.card_to_mjpeg_stream_export.size(); ++card_idx) {
AVStream *stream = avformat_new_stream(avctx.get(), nullptr);
if (stream == nullptr) {
fprintf(stderr, "avformat_new_stream() failed\n");
fprintf(stderr, "Could not initialize VA-API for MJPEG encoding: %s. JPEGs will be encoded in software if needed.\n", error.c_str());
}
+ encoder_thread = thread(&MJPEGEncoder::encoder_thread_func, this);
+ if (va_dpy != nullptr) {
+ va_receiver_thread = thread(&MJPEGEncoder::va_receiver_thread_func, this);
+ }
+
running = true;
}
+MJPEGEncoder::~MJPEGEncoder()
+{
+ av_free(avctx->pb->buffer);
+}
+
void MJPEGEncoder::stop()
{
if (!running) {
should_quit = true;
any_frames_to_be_encoded.notify_all();
encoder_thread.join();
+ if (va_dpy != nullptr) {
+ va_receiver_thread.join();
+ }
}
unique_ptr<VADisplayWithCleanup> MJPEGEncoder::try_open_va(const string &va_display, string *error, VAConfigID *config_id)
}
lock_guard<mutex> lock(mu);
+ if (frames_to_be_encoded.size() + frames_encoding.size() > 50) {
+ fprintf(stderr, "WARNING: MJPEG encoding doesn't keep up, discarding frame.\n");
+ return;
+ }
frames_to_be_encoded.push(QueuedFrame{ pts, card_index, frame, video_format, y_offset, cbcr_offset });
any_frames_to_be_encoded.notify_all();
}
posix_memalign((void **)&tmp_cb, 4096, 4096 * 8);
posix_memalign((void **)&tmp_cr, 4096, 4096 * 8);
- unique_lock<mutex> lock(mu);
for (;;) {
- any_frames_to_be_encoded.wait(lock, [this] { return !frames_to_be_encoded.empty() || should_quit; });
- if (should_quit) return;
- QueuedFrame qf = move(frames_to_be_encoded.front());
- frames_to_be_encoded.pop();
-
- vector<uint8_t> jpeg = encode_jpeg(qf);
-
- AVPacket pkt;
- memset(&pkt, 0, sizeof(pkt));
- pkt.buf = nullptr;
- pkt.data = &jpeg[0];
- pkt.size = jpeg.size();
- pkt.stream_index = qf.card_index;
- pkt.flags = AV_PKT_FLAG_KEY;
- pkt.pts = pkt.dts = qf.pts;
-
- if (av_write_frame(avctx.get(), &pkt) < 0) {
- fprintf(stderr, "av_write_frame() failed\n");
- exit(1);
+ QueuedFrame qf;
+ {
+ unique_lock<mutex> lock(mu);
+ any_frames_to_be_encoded.wait(lock, [this] { return !frames_to_be_encoded.empty() || should_quit; });
+ if (should_quit) break;
+ qf = move(frames_to_be_encoded.front());
+ frames_to_be_encoded.pop();
+ }
+
+ if (va_dpy != nullptr) {
+ // Will call back in the receiver thread.
+ encode_jpeg_va(move(qf));
+ } else {
+ // Encode synchronously, in the same thread.
+ vector<uint8_t> jpeg = encode_jpeg_libjpeg(qf);
+ write_mjpeg_packet(qf.pts, qf.card_index, jpeg);
}
}
+
+ free(tmp_y);
+ free(tmp_cbcr);
+ free(tmp_cb);
+ free(tmp_cr);
+}
+
+void MJPEGEncoder::write_mjpeg_packet(int64_t pts, unsigned card_index, const vector<uint8_t> &jpeg)
+{
+ AVPacket pkt;
+ memset(&pkt, 0, sizeof(pkt));
+ pkt.buf = nullptr;
+ pkt.data = const_cast<uint8_t *>(&jpeg[0]);
+ pkt.size = jpeg.size();
+ pkt.stream_index = card_index;
+ pkt.flags = AV_PKT_FLAG_KEY;
+ pkt.pts = pkt.dts = pts;
+
+ if (av_write_frame(avctx.get(), &pkt) < 0) {
+ fprintf(stderr, "av_write_frame() failed\n");
+ exit(1);
+ }
}
class VABufferDestroyer {
return ret;
}
-vector<uint8_t> MJPEGEncoder::encode_jpeg(const QueuedFrame &qf)
-{
- if (va_dpy != nullptr) {
- return encode_jpeg_va(qf);
- } else {
- return encode_jpeg_libjpeg(qf);
- }
-}
-
-vector<uint8_t> MJPEGEncoder::encode_jpeg_va(const QueuedFrame &qf)
+void MJPEGEncoder::encode_jpeg_va(QueuedFrame &&qf)
{
unsigned width = qf.video_format.width;
unsigned height = qf.video_format.height;
va_status = vaEndPicture(va_dpy->va_dpy, resources.context);
CHECK_VASTATUS(va_status, "vaEndPicture");
- va_status = vaSyncSurface(va_dpy->va_dpy, resources.surface);
- CHECK_VASTATUS(va_status, "vaSyncSurface");
+ qf.resources = move(resources);
+ qf.resource_releaser = move(release);
- VACodedBufferSegment *segment;
- va_status = vaMapBuffer(va_dpy->va_dpy, resources.data_buffer, (void **)&segment);
- CHECK_VASTATUS(va_status, "vaMapBuffer");
+ lock_guard<mutex> lock(mu);
+ frames_encoding.push(move(qf));
+ any_frames_encoding.notify_all();
+}
- const char *coded_buf = reinterpret_cast<char *>(segment->buf);
- vector<uint8_t> jpeg(coded_buf, coded_buf + segment->size);
+void MJPEGEncoder::va_receiver_thread_func()
+{
+ pthread_setname_np(pthread_self(), "MJPEG_Receive");
+ for (;;) {
+ QueuedFrame qf;
+ {
+ unique_lock<mutex> lock(mu);
+ any_frames_encoding.wait(lock, [this] { return !frames_encoding.empty() || should_quit; });
+ if (should_quit) return;
+ qf = move(frames_encoding.front());
+ frames_encoding.pop();
+ }
- va_status = vaUnmapBuffer(va_dpy->va_dpy, resources.data_buffer);
- CHECK_VASTATUS(va_status, "vaUnmapBuffer");
+ VAStatus va_status = vaSyncSurface(va_dpy->va_dpy, qf.resources.surface);
+ CHECK_VASTATUS(va_status, "vaSyncSurface");
- return jpeg;
+ VACodedBufferSegment *segment;
+ va_status = vaMapBuffer(va_dpy->va_dpy, qf.resources.data_buffer, (void **)&segment);
+ CHECK_VASTATUS(va_status, "vaMapBuffer");
+
+ const char *coded_buf = reinterpret_cast<char *>(segment->buf);
+ vector<uint8_t> jpeg(coded_buf, coded_buf + segment->size);
+
+ va_status = vaUnmapBuffer(va_dpy->va_dpy, qf.resources.data_buffer);
+ CHECK_VASTATUS(va_status, "vaUnmapBuffer");
+
+ write_mjpeg_packet(qf.pts, qf.card_index, jpeg);
+ }
}
vector<uint8_t> MJPEGEncoder::encode_jpeg_libjpeg(const QueuedFrame &qf)
projects / nageru / blobdiff