X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmjpeg_encoder.cpp;h=07e302c4e93148c2b9a83edfc1034e5465f1e8bc;hb=0b776ba19a0b0703f87e5529b2e4f82af6b50435;hp=614cb5cc8836a80b3eb4831d91a1465c8cd4a73e;hpb=012f5333c8958ed3da410ef53493c347028b44c4;p=nageru diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp index 614cb5c..07e302c 100644 --- a/nageru/mjpeg_encoder.cpp +++ b/nageru/mjpeg_encoder.cpp @@ -16,6 +16,7 @@ extern "C" { #include "flags.h" #include "shared/httpd.h" #include "shared/memcpy_interleaved.h" +#include "shared/metrics.h" #include "pbo_frame_allocator.h" #include "shared/timebase.h" #include "va_display_with_cleanup.h" @@ -119,8 +120,6 @@ int MJPEGEncoder::write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType t 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. @@ -132,7 +131,7 @@ MJPEGEncoder::MJPEGEncoder(HTTPD *httpd, const string &va_display) 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"); @@ -174,9 +173,33 @@ MJPEGEncoder::MJPEGEncoder(HTTPD *httpd, const string &va_display) 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); + } + + global_metrics.add("mjpeg_frames", {{ "status", "dropped" }, { "reason", "zero_size" }}, &metric_mjpeg_frames_zero_size_dropped); + global_metrics.add("mjpeg_frames", {{ "status", "dropped" }, { "reason", "interlaced" }}, &metric_mjpeg_frames_interlaced_dropped); + global_metrics.add("mjpeg_frames", {{ "status", "dropped" }, { "reason", "unsupported_pixel_format" }}, &metric_mjpeg_frames_unsupported_pixel_format_dropped); + global_metrics.add("mjpeg_frames", {{ "status", "dropped" }, { "reason", "oversized" }}, &metric_mjpeg_frames_oversized_dropped); + global_metrics.add("mjpeg_frames", {{ "status", "dropped" }, { "reason", "overrun" }}, &metric_mjpeg_overrun_dropped); + global_metrics.add("mjpeg_frames", {{ "status", "submitted" }}, &metric_mjpeg_overrun_submitted); + running = true; } +MJPEGEncoder::~MJPEGEncoder() +{ + av_free(avctx->pb->buffer); + + global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "zero_size" }}); + global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "interlaced" }}); + global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "unsupported_pixel_format" }}); + global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "oversized" }}); + global_metrics.remove("mjpeg_frames", {{ "status", "dropped" }, { "reason", "overrun" }}); + global_metrics.remove("mjpeg_frames", {{ "status", "submitted" }}); +} + void MJPEGEncoder::stop() { if (!running) { @@ -185,7 +208,11 @@ void MJPEGEncoder::stop() running = false; should_quit = true; any_frames_to_be_encoded.notify_all(); + any_frames_encoding.notify_all(); encoder_thread.join(); + if (va_dpy != nullptr) { + va_receiver_thread.join(); + } } unique_ptr MJPEGEncoder::try_open_va(const string &va_display, string *error, VAConfigID *config_id) @@ -236,23 +263,33 @@ void MJPEGEncoder::upload_frame(int64_t pts, unsigned card_index, RefCountedFram { PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)frame->userdata; if (video_format.width == 0 || video_format.height == 0) { + ++metric_mjpeg_frames_zero_size_dropped; return; } if (video_format.interlaced) { fprintf(stderr, "Card %u: Ignoring JPEG encoding for interlaced frame\n", card_index); + ++metric_mjpeg_frames_interlaced_dropped; return; } if (userdata->pixel_format != PixelFormat_8BitYCbCr || !frame->interleaved) { fprintf(stderr, "Card %u: Ignoring JPEG encoding for unsupported pixel format\n", card_index); + ++metric_mjpeg_frames_unsupported_pixel_format_dropped; return; } if (video_format.width > 4096 || video_format.height > 4096) { fprintf(stderr, "Card %u: Ignoring JPEG encoding for oversized frame\n", card_index); + ++metric_mjpeg_frames_oversized_dropped; return; } lock_guard lock(mu); + if (frames_to_be_encoded.size() + frames_encoding.size() > 50) { + fprintf(stderr, "WARNING: MJPEG encoding doesn't keep up, discarding frame.\n"); + ++metric_mjpeg_overrun_dropped; + return; + } + ++metric_mjpeg_overrun_submitted; frames_to_be_encoded.push(QueuedFrame{ pts, card_index, frame, video_format, y_offset, cbcr_offset }); any_frames_to_be_encoded.notify_all(); } @@ -265,29 +302,48 @@ void MJPEGEncoder::encoder_thread_func() posix_memalign((void **)&tmp_cb, 4096, 4096 * 8); posix_memalign((void **)&tmp_cr, 4096, 4096 * 8); - unique_lock 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 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 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 jpeg = encode_jpeg_libjpeg(qf); + write_mjpeg_packet(qf.pts, qf.card_index, jpeg.data(), jpeg.size()); } } + + free(tmp_y); + free(tmp_cbcr); + free(tmp_cb); + free(tmp_cr); +} + +void MJPEGEncoder::write_mjpeg_packet(int64_t pts, unsigned card_index, const uint8_t *jpeg, size_t jpeg_size) +{ + AVPacket pkt; + memset(&pkt, 0, sizeof(pkt)); + pkt.buf = nullptr; + pkt.data = const_cast(jpeg); + pkt.size = jpeg_size; + pkt.stream_index = card_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); + + if (av_write_frame(avctx.get(), &pkt) < 0) { + fprintf(stderr, "av_write_frame() failed\n"); + exit(1); + } } class VABufferDestroyer { @@ -539,16 +595,7 @@ MJPEGEncoder::VAData MJPEGEncoder::get_va_data_for_resolution(unsigned width, un return ret; } -vector MJPEGEncoder::encode_jpeg(const QueuedFrame &qf) -{ - if (va_dpy != nullptr) { - return encode_jpeg_va(qf); - } else { - return encode_jpeg_libjpeg(qf); - } -} - -vector 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; @@ -633,20 +680,40 @@ vector MJPEGEncoder::encode_jpeg_va(const QueuedFrame &qf) 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 lock(mu); + frames_encoding.push(move(qf)); + any_frames_encoding.notify_all(); +} - const char *coded_buf = reinterpret_cast(segment->buf); - vector 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 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"); + + VACodedBufferSegment *segment; + va_status = vaMapBuffer(va_dpy->va_dpy, qf.resources.data_buffer, (void **)&segment); + CHECK_VASTATUS(va_status, "vaMapBuffer"); - return jpeg; + const uint8_t *coded_buf = reinterpret_cast(segment->buf); + write_mjpeg_packet(qf.pts, qf.card_index, coded_buf, segment->size); + + va_status = vaUnmapBuffer(va_dpy->va_dpy, qf.resources.data_buffer); + CHECK_VASTATUS(va_status, "vaUnmapBuffer"); + } } vector MJPEGEncoder::encode_jpeg_libjpeg(const QueuedFrame &qf)