X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmjpeg_encoder.cpp;h=9ae018f81059584621bb383b3f4d6b30c01df0f4;hb=a839022c035b3d9387feabc02843c166ac78b469;hp=07deae02289a3c321a6a4c58c036a8c96109ccb8;hpb=271ddbb0c7e84560e73e89b1a125576477f95380;p=nageru diff --git a/nageru/mjpeg_encoder.cpp b/nageru/mjpeg_encoder.cpp index 07deae0..9ae018f 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" @@ -29,12 +30,6 @@ using namespace std; extern void memcpy_with_pitch(uint8_t *dst, const uint8_t *src, size_t src_width, size_t dst_pitch, size_t height); -#define CHECK_VASTATUS(va_status, func) \ - if (va_status != VA_STATUS_SUCCESS) { \ - fprintf(stderr, "%s:%d (%s) failed with %d\n", __func__, __LINE__, func, va_status); \ - exit(1); \ - } - // From libjpeg (although it's of course identical between implementations). static const int jpeg_natural_order[DCTSIZE2] = { 0, 1, 8, 16, 9, 2, 3, 10, @@ -119,8 +114,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 +125,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,12 +167,31 @@ 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() @@ -190,7 +202,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) @@ -241,27 +257,68 @@ 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(); } +void MJPEGEncoder::finish_frame(RefCountedFrame frame) +{ + PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)frame->userdata; + + if (userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_VA_API) { + VAResources resources __attribute__((unused)) = move(userdata->va_resources); + ReleaseVAResources release = move(userdata->va_resources_release); + VAImage image = move(userdata->va_image); + + VAStatus va_status = vaUnmapBuffer(va_dpy->va_dpy, image.buf); + CHECK_VASTATUS(va_status, "vaUnmapBuffer"); + va_status = vaDestroyImage(va_dpy->va_dpy, image.image_id); + CHECK_VASTATUS(va_status, "vaDestroyImage"); + } +} + +int MJPEGEncoder::get_mjpeg_stream_for_card(unsigned card_index) +{ + // Only bother doing MJPEG encoding if there are any connected clients + // that want the stream. + if (httpd->get_num_connected_multicam_clients() == 0) { + return -1; + } + + auto it = global_flags.card_to_mjpeg_stream_export.find(card_index); + if (it == global_flags.card_to_mjpeg_stream_export.end()) { + return -1; + } + return it->second; +} + void MJPEGEncoder::encoder_thread_func() { pthread_setname_np(pthread_self(), "MJPEG_Encode"); @@ -270,27 +327,23 @@ 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) break; - 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()); } } @@ -300,6 +353,24 @@ void MJPEGEncoder::encoder_thread_func() 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 { public: VABufferDestroyer(VADisplay dpy, VABufferID buf) @@ -549,22 +620,22 @@ 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) { + PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)qf.frame->userdata; unsigned width = qf.video_format.width; unsigned height = qf.video_format.height; - VAResources resources = get_va_resources(width, height); - ReleaseVAResources release(this, resources); + VAResources resources; + ReleaseVAResources release; + if (userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_VA_API) { + resources = move(userdata->va_resources); + release = move(userdata->va_resources_release); + } else { + assert(userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_MALLOC); + resources = get_va_resources(width, height); + release = ReleaseVAResources(this, resources); + } VAData va_data = get_va_data_for_resolution(width, height); va_data.pic_param.coded_buf = resources.data_buffer; @@ -590,20 +661,27 @@ vector MJPEGEncoder::encode_jpeg_va(const QueuedFrame &qf) VABufferDestroyer destroy_slice_param(va_dpy->va_dpy, slice_param_buffer); VAImage image; - va_status = vaDeriveImage(va_dpy->va_dpy, resources.surface, &image); - CHECK_VASTATUS(va_status, "vaDeriveImage"); + if (userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_VA_API) { + // The pixel data is already uploaded by the caller. + image = move(userdata->va_image); + } else { + assert(userdata->data_copy_current_src == PBOFrameAllocator::Userdata::FROM_MALLOC); - // Upload the pixel data. - uint8_t *surface_p = nullptr; - vaMapBuffer(va_dpy->va_dpy, image.buf, (void **)&surface_p); + // Upload the pixel data. + va_status = vaDeriveImage(va_dpy->va_dpy, resources.surface, &image); + CHECK_VASTATUS(va_status, "vaDeriveImage"); - size_t field_start_line = qf.video_format.extra_lines_top; // No interlacing support. - size_t field_start = qf.cbcr_offset * 2 + qf.video_format.width * field_start_line * 2; + uint8_t *surface_p = nullptr; + vaMapBuffer(va_dpy->va_dpy, image.buf, (void **)&surface_p); - { - const uint8_t *src = qf.frame->data_copy + field_start; - uint8_t *dst = (unsigned char *)surface_p + image.offsets[0]; - memcpy_with_pitch(dst, src, qf.video_format.width * 2, image.pitches[0], qf.video_format.height); + size_t field_start_line = qf.video_format.extra_lines_top; // No interlacing support. + size_t field_start = qf.cbcr_offset * 2 + qf.video_format.width * field_start_line * 2; + + { + const uint8_t *src = qf.frame->data_copy + field_start; + uint8_t *dst = (unsigned char *)surface_p + image.offsets[0]; + memcpy_with_pitch(dst, src, qf.video_format.width * 2, image.pitches[0], qf.video_format.height); + } } va_status = vaUnmapBuffer(va_dpy->va_dpy, image.buf); @@ -643,20 +721,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); + + lock_guard lock(mu); + frames_encoding.push(move(qf)); + any_frames_encoding.notify_all(); +} + +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(); + } - VACodedBufferSegment *segment; - va_status = vaMapBuffer(va_dpy->va_dpy, resources.data_buffer, (void **)&segment); - CHECK_VASTATUS(va_status, "vaMapBuffer"); + VAStatus va_status = vaSyncSurface(va_dpy->va_dpy, qf.resources.surface); + CHECK_VASTATUS(va_status, "vaSyncSurface"); - const char *coded_buf = reinterpret_cast(segment->buf); - vector jpeg(coded_buf, coded_buf + segment->size); + VACodedBufferSegment *segment; + va_status = vaMapBuffer(va_dpy->va_dpy, qf.resources.data_buffer, (void **)&segment); + CHECK_VASTATUS(va_status, "vaMapBuffer"); - va_status = vaUnmapBuffer(va_dpy->va_dpy, resources.data_buffer); - CHECK_VASTATUS(va_status, "vaUnmapBuffer"); + const uint8_t *coded_buf = reinterpret_cast(segment->buf); + write_mjpeg_packet(qf.pts, qf.card_index, coded_buf, segment->size); - return jpeg; + va_status = vaUnmapBuffer(va_dpy->va_dpy, qf.resources.data_buffer); + CHECK_VASTATUS(va_status, "vaUnmapBuffer"); + } } vector MJPEGEncoder::encode_jpeg_libjpeg(const QueuedFrame &qf)