X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fpbo_frame_allocator.cpp;h=133b65fe3310c2b0c69b27330098286e9f6cb994;hb=f7752bad9a473d26ff1fa7c83ac82dca098b63bb;hp=ea17f1259fde4076320c9ebdb37da6c714a6c5f3;hpb=392f9d1ccb835c05a3874c4bea163788b2c37024;p=nageru

diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index ea17f12..133b65f 100644
--- a/nageru/pbo_frame_allocator.cpp
+++ b/nageru/pbo_frame_allocator.cpp
@@ -8,7 +8,9 @@
 #include <cstddef>
 
 #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) {
@@ -54,9 +56,11 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 	frame.data2 = frame.data + frame_size / 2;
 	check_error();
 	frame.size = frame_size;
-	frame.userdata = &userdata[frame_idx];
-	userdata[frame_idx].pbo = pbo;
-	userdata[frame_idx].pixel_format = pixel_format;
+	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
@@ -71,48 +75,48 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 	// resolution is progressive.
 	switch (pixel_format) {
 	case bmusb::PixelFormat_8BitYCbCr:
-		glGenTextures(2, userdata[frame_idx].tex_y);
+		glGenTextures(2, ud->tex_y);
 		check_error();
-		glGenTextures(2, userdata[frame_idx].tex_cbcr);
+		glGenTextures(2, ud->tex_cbcr);
 		check_error();
 		break;
 	case bmusb::PixelFormat_10BitYCbCr:
-		glGenTextures(2, userdata[frame_idx].tex_v210);
+		glGenTextures(2, ud->tex_v210);
 		check_error();
-		glGenTextures(2, userdata[frame_idx].tex_444);
+		glGenTextures(2, ud->tex_444);
 		check_error();
 		break;
 	case bmusb::PixelFormat_8BitBGRA:
-		glGenTextures(2, userdata[frame_idx].tex_rgba);
+		glGenTextures(2, ud->tex_rgba);
 		check_error();
 		break;
 	case bmusb::PixelFormat_8BitYCbCrPlanar:
-		glGenTextures(2, userdata[frame_idx].tex_y);
+		glGenTextures(2, ud->tex_y);
 		check_error();
-		glGenTextures(2, userdata[frame_idx].tex_cb);
+		glGenTextures(2, ud->tex_cb);
 		check_error();
-		glGenTextures(2, userdata[frame_idx].tex_cr);
+		glGenTextures(2, ud->tex_cr);
 		check_error();
 		break;
 	default:
 		assert(false);
 	}
 
-	userdata[frame_idx].last_width[0] = width;
-	userdata[frame_idx].last_height[0] = height;
-	userdata[frame_idx].last_cbcr_width[0] = width / 2;
-	userdata[frame_idx].last_cbcr_height[0] = height;
-	userdata[frame_idx].last_v210_width[0] = 0;
-
-	userdata[frame_idx].last_width[1] = 0;
-	userdata[frame_idx].last_height[1] = 0;
-	userdata[frame_idx].last_cbcr_width[1] = 0;
-	userdata[frame_idx].last_cbcr_height[1] = 0;
-	userdata[frame_idx].last_v210_width[1] = 0;
-
-	userdata[frame_idx].last_interlaced = false;
-	userdata[frame_idx].last_has_signal = false;
-	userdata[frame_idx].last_is_connected = false;
+	ud->last_width[0] = width;
+	ud->last_height[0] = height;
+	ud->last_cbcr_width[0] = width / 2;
+	ud->last_cbcr_height[0] = height;
+	ud->last_v210_width[0] = 0;
+
+	ud->last_width[1] = 0;
+	ud->last_height[1] = 0;
+	ud->last_cbcr_width[1] = 0;
+	ud->last_cbcr_height[1] = 0;
+	ud->last_v210_width[1] = 0;
+
+	ud->last_interlaced = false;
+	ud->last_has_signal = false;
+	ud->last_is_connected = false;
 	for (unsigned field = 0; field < 2; ++field) {
 		switch (pixel_format) {
 		case bmusb::PixelFormat_10BitYCbCr: {
@@ -121,17 +125,17 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 			// Seemingly we need to set the minification filter even though
 			// shader image loads don't use them, or NVIDIA will just give us
 			// zero back.
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_v210[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_v210[field]);
 			check_error();
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 			check_error();
 			if (field == 0) {
-				userdata[frame_idx].last_v210_width[0] = v210_width;
+				ud->last_v210_width[0] = v210_width;
 				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, v210_width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, nullptr);
 				check_error();
 			}
 
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_444[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_444[field]);
 			check_error();
 			set_clamp_to_edge();
 			if (field == 0) {
@@ -141,7 +145,7 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 			break;
 		}
 		case bmusb::PixelFormat_8BitYCbCr:
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_y[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_y[field]);
 			check_error();
 			set_clamp_to_edge();
 			if (field == 0) {
@@ -149,7 +153,7 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 				check_error();
 			}
 
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_cbcr[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_cbcr[field]);
 			check_error();
 			set_clamp_to_edge();
 			if (field == 0) {
@@ -158,20 +162,16 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 			}
 			break;
 		case bmusb::PixelFormat_8BitBGRA:
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_rgba[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_rgba[field]);
 			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;
 		case bmusb::PixelFormat_8BitYCbCrPlanar:
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_y[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_y[field]);
 			check_error();
 			set_clamp_to_edge();
 			if (field == 0) {
@@ -179,7 +179,7 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 				check_error();
 			}
 
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_cb[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_cb[field]);
 			check_error();
 			set_clamp_to_edge();
 			if (field == 0) {
@@ -187,7 +187,7 @@ void PBOFrameAllocator::init_frame(size_t frame_idx, size_t frame_size, GLuint w
 				check_error();
 			}
 
-			glBindTexture(GL_TEXTURE_2D, userdata[frame_idx].tex_cr[field]);
+			glBindTexture(GL_TEXTURE_2D, ud->tex_cr[field]);
 			check_error();
 			set_clamp_to_edge();
 			if (field == 0) {
@@ -214,7 +214,10 @@ PBOFrameAllocator::~PBOFrameAllocator()
 
 void PBOFrameAllocator::destroy_frame(Frame *frame)
 {
-	GLuint pbo = ((Userdata *)frame->userdata)->pbo;
+	Userdata *ud = (Userdata *)frame->userdata;
+	delete[] ud->data_copy_malloc;
+
+	GLuint pbo = ud->pbo;
 	glBindBuffer(buffer, pbo);
 	check_error();
 	glUnmapBuffer(buffer);
@@ -225,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:
@@ -258,7 +261,7 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
 {
         Frame vf;
 
-	unique_lock<mutex> lock(freelist_mutex);  // Meh.
+	lock_guard<mutex> lock(freelist_mutex);  // Meh.
 	if (freelist.empty()) {
 		printf("Frame overrun (no more spare PBO frames), dropping frame!\n");
 	} else {
@@ -268,6 +271,69 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
 	}
 	vf.len = 0;
 	vf.overflow = 0;
+
+	if (mjpeg_encoder != nullptr &&
+	    mjpeg_encoder->should_encode_mjpeg_for_card(card_index) &&
+	    vf.userdata != nullptr) {
+		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<mutex> 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->should_encode_mjpeg_for_card(card_index)) {
+		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 {
+			vf.data_copy = userdata->data_copy_malloc;
+			userdata->data_copy_current_src = Userdata::FROM_MALLOC;
+		}
+	} else {
+		vf.data_copy = nullptr;
+	}
+
 	return vf;
 }
 
@@ -306,7 +372,22 @@ void PBOFrameAllocator::release_frame(Frame frame)
 	}
 #endif
 
-	unique_lock<mutex> lock(freelist_mutex);
+	{
+		// 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;
 }