X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fpbo_frame_allocator.cpp;h=4640d355e25e96a60db88fddc3963419577cd636;hb=f8da8feaff269b75480625e1384951c20c3a529d;hp=54182a83a899fa3ca9994974a76316c90e812d4d;hpb=575f6eb1b052bb1291987753b1a8cccc7f1e3ab3;p=nageru

diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index 54182a8..4640d35 100644
--- 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;
@@ -370,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<mutex> lock(freelist_mutex);
 	freelist.push(frame);
 	//--sumsum;