Various fixes for non-VA-API MJPEG encoding.

[nageru] / nageru / pbo_frame_allocator.cpp

diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index d0859b357d98a313fb40587b2663dad517c7e2e5..c4c08a826624316fcca470a9eb4ff225b8aed619 100644 (file)
--- a/nageru/pbo_frame_allocator.cpp
+++ b/nageru/pbo_frame_allocator.cpp
@@ -166,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;
@@ -276,8 +272,9 @@ 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) {
+       if (mjpeg_encoder != nullptr &&
+           mjpeg_encoder->get_mjpeg_stream_for_card(card_index) != -1 &&
+           vf.userdata != nullptr) {
                Userdata *ud = (Userdata *)vf.userdata;
                vf.data_copy = ud->data_copy_malloc;
                ud->data_copy_current_src = Userdata::FROM_MALLOC;
@@ -309,32 +306,29 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::create_frame(size_t width, size_
 
        Userdata *userdata = (Userdata *)vf.userdata;
 
-       if (mjpeg_encoder != nullptr && mjpeg_encoder->using_vaapi() &&
+       if (mjpeg_encoder != nullptr &&
            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);
-
-               VAImage image;
-               VAStatus va_status = vaDeriveImage(va_dpy, resources.surface, &image);
-               CHECK_VASTATUS(va_status, "vaDeriveImage");
-
-               if (image.pitches[0] == stride) {
-                       userdata->va_resources = move(resources);
-                       userdata->va_resources_release = move(release);
-                       userdata->va_image = move(image);
-
-                       va_status = vaMapBuffer(va_dpy, image.buf, (void **)&vf.data_copy);
-                       CHECK_VASTATUS(va_status, "vaMapBuffer");
-                       vf.data_copy += image.offsets[0];
-                       userdata->data_copy_current_src = Userdata::FROM_VA_API;
+               if (mjpeg_encoder->using_vaapi()) {
+                       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 {
-                       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, image.pitches[0]);
                        vf.data_copy = userdata->data_copy_malloc;
                        userdata->data_copy_current_src = Userdata::FROM_MALLOC;
-
-                       va_status = vaDestroyImage(va_dpy, image.image_id);
-                       CHECK_VASTATUS(va_status, "vaDestroyImage");
                }
        } else {
                vf.data_copy = nullptr;
@@ -378,6 +372,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<mutex> lock(freelist_mutex);
        freelist.push(frame);
        //--sumsum;