X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fpbo_frame_allocator.cpp;h=4640d355e25e96a60db88fddc3963419577cd636;hb=ace7c97abd704ad38a3287c22ae42f05c1f9a5b4;hp=1904cf17e26ea8ca3b7ea76ea56442a5acbb85bb;hpb=4b58e3f824545472eb1ccf1e18d042b3b1b9be04;p=nageru diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp index 1904cf1..4640d35 100644 --- a/nageru/pbo_frame_allocator.cpp +++ b/nageru/pbo_frame_allocator.cpp @@ -8,7 +8,9 @@ #include #include "flags.h" +#include "mjpeg_encoder.h" #include "v210_converter.h" +#include "va_display_with_cleanup.h" using namespace std; @@ -26,8 +28,8 @@ void set_clamp_to_edge() } // namespace -PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits) - : pixel_format(pixel_format), buffer(buffer) +PBOFrameAllocator::PBOFrameAllocator(bmusb::PixelFormat pixel_format, size_t frame_size, GLuint width, GLuint height, unsigned card_index, MJPEGEncoder *mjpeg_encoder, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits) + : card_index(card_index), mjpeg_encoder(mjpeg_encoder), pixel_format(pixel_format), buffer(buffer) { userdata.reset(new Userdata[num_queued_frames]); for (size_t i = 0; i < num_queued_frames; ++i) { @@ -52,13 +54,13 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w Frame frame; frame.data = (uint8_t *)glMapBufferRange(buffer, 0, frame_size, permissions | map_bits | GL_MAP_PERSISTENT_BIT); frame.data2 = frame.data + frame_size / 2; - frame.data_copy = new uint8_t[frame_size]; check_error(); frame.size = frame_size; Userdata *ud = &userdata[frame_idx]; frame.userdata = ud; ud->pbo = pbo; ud->pixel_format = pixel_format; + ud->data_copy_malloc = new uint8_t[frame_size]; frame.owner = this; // For 8-bit non-planar Y'CbCr, we ask the driver to split Y' and Cb/Cr @@ -164,11 +166,7 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w check_error(); set_clamp_to_edge(); if (field == 0) { - if (global_flags.can_disable_srgb_decoder) { // See the comments in tweaked_inputs.h. - glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr); - } else { - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr); - } + glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB8_ALPHA8, width, height, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, nullptr); check_error(); } break; @@ -216,9 +214,10 @@ PBOFrameAllocator::~PBOFrameAllocator() void PBOFrameAllocator::destroy_frame(Frame *frame) { - delete[] frame->data_copy; + Userdata *ud = (Userdata *)frame->userdata; + delete[] ud->data_copy_malloc; - GLuint pbo = ((Userdata *)frame->userdata)->pbo; + GLuint pbo = ud->pbo; glBindBuffer(buffer, pbo); check_error(); glUnmapBuffer(buffer); @@ -229,27 +228,27 @@ void PBOFrameAllocator::destroy_frame(Frame *frame) check_error(); switch (pixel_format) { case bmusb::PixelFormat_10BitYCbCr: - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_v210); + glDeleteTextures(2, ud->tex_v210); check_error(); - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_444); + glDeleteTextures(2, ud->tex_444); check_error(); break; case bmusb::PixelFormat_8BitYCbCr: - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_y); + glDeleteTextures(2, ud->tex_y); check_error(); - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_cbcr); + glDeleteTextures(2, ud->tex_cbcr); check_error(); break; case bmusb::PixelFormat_8BitBGRA: - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_rgba); + glDeleteTextures(2, ud->tex_rgba); check_error(); break; case bmusb::PixelFormat_8BitYCbCrPlanar: - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_y); + glDeleteTextures(2, ud->tex_y); check_error(); - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_cb); + glDeleteTextures(2, ud->tex_cb); check_error(); - glDeleteTextures(2, ((Userdata *)frame->userdata)->tex_cr); + glDeleteTextures(2, ud->tex_cr); check_error(); break; default: @@ -272,6 +271,63 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::alloc_frame() } vf.len = 0; vf.overflow = 0; + + if (mjpeg_encoder != nullptr && mjpeg_encoder->using_vaapi() && + mjpeg_encoder->get_mjpeg_stream_for_card(card_index) != -1) { + Userdata *ud = (Userdata *)vf.userdata; + vf.data_copy = ud->data_copy_malloc; + ud->data_copy_current_src = Userdata::FROM_MALLOC; + } else { + vf.data_copy = nullptr; + } + + return vf; +} + +bmusb::FrameAllocator::Frame PBOFrameAllocator::create_frame(size_t width, size_t height, size_t stride) +{ + Frame vf; + + { + lock_guard lock(freelist_mutex); + if (freelist.empty()) { + printf("Frame overrun (no more spare PBO frames), dropping frame!\n"); + vf.len = 0; + vf.overflow = 0; + return vf; + } else { + vf = freelist.front(); + freelist.pop(); + } + } + vf.len = 0; + vf.overflow = 0; + + Userdata *userdata = (Userdata *)vf.userdata; + + if (mjpeg_encoder != nullptr && mjpeg_encoder->using_vaapi() && + mjpeg_encoder->get_mjpeg_stream_for_card(card_index) != -1) { + VADisplay va_dpy = mjpeg_encoder->va_dpy->va_dpy; + MJPEGEncoder::VAResources resources = mjpeg_encoder->get_va_resources(width, height); + MJPEGEncoder::ReleaseVAResources release(mjpeg_encoder, resources); + + if (resources.image.pitches[0] == stride) { + userdata->va_resources = move(resources); + userdata->va_resources_release = move(release); + + VAStatus va_status = vaMapBuffer(va_dpy, resources.image.buf, (void **)&vf.data_copy); + CHECK_VASTATUS(va_status, "vaMapBuffer"); + vf.data_copy += resources.image.offsets[0]; + userdata->data_copy_current_src = Userdata::FROM_VA_API; + } else { + printf("WARNING: Could not copy directly into VA-API MJPEG buffer for %zu x %zu, since producer and consumer disagreed on stride (%zu != %d).\n", width, height, stride, resources.image.pitches[0]); + vf.data_copy = userdata->data_copy_malloc; + userdata->data_copy_current_src = Userdata::FROM_MALLOC; + } + } else { + vf.data_copy = nullptr; + } + return vf; } @@ -310,6 +366,21 @@ void PBOFrameAllocator::release_frame(Frame frame) } #endif + { + // In case we never got to upload the frame to MJPEGEncoder. + Userdata *userdata = (Userdata *)frame.userdata; + MJPEGEncoder::VAResources resources __attribute__((unused)) = move(userdata->va_resources); + MJPEGEncoder::ReleaseVAResources release = move(userdata->va_resources_release); + + if (frame.data_copy != nullptr && userdata->data_copy_current_src == Userdata::FROM_VA_API) { + VADisplay va_dpy = mjpeg_encoder->va_dpy->va_dpy; + VAStatus va_status = vaUnmapBuffer(va_dpy, resources.image.buf); + CHECK_VASTATUS(va_status, "vaUnmapBuffer"); + + frame.data_copy = nullptr; + } + } + lock_guard lock(freelist_mutex); freelist.push(frame); //--sumsum;