X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fpbo_frame_allocator.cpp;h=709a2bf359e505ab7e089f567fce33b502427834;hb=f81ae3be1aae619fe4ad022f55d95a4a83ace076;hp=d7cd818d15d614ba96d1d049e9bb36afbdc01e36;hpb=1a7e004368f4f5221e91bf53e17a8c0f7e1ceeb8;p=nageru

diff --git a/nageru/pbo_frame_allocator.cpp b/nageru/pbo_frame_allocator.cpp
index d7cd818..709a2bf 100644
--- a/nageru/pbo_frame_allocator.cpp
+++ b/nageru/pbo_frame_allocator.cpp
@@ -1,14 +1,19 @@
 #include "pbo_frame_allocator.h"
 
 #include <bmusb/bmusb.h>
+#include <assert.h>
+#include <epoxy/gl.h>
 #include <movit/util.h>
+#include <mutex>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
+#include <utility>
+#include <va/va.h>
 
-#include "flags.h"
 #include "mjpeg_encoder.h"
+#include "shared/va_resource_pool.h"
 #include "v210_converter.h"
 #include "shared/va_display.h"
 
@@ -236,7 +241,7 @@ void PBOFrameAllocator::destroy_frame(Frame *frame)
 	check_error();
 	glDeleteBuffers(1, &pbo);
 	check_error();
-	switch (pixel_format) {
+	switch (ud->pixel_format) {
 	case bmusb::PixelFormat_10BitYCbCr:
 		glDeleteTextures(2, ud->tex_v210);
 		check_error();
@@ -328,8 +333,8 @@ bmusb::FrameAllocator::Frame PBOFrameAllocator::create_frame(size_t width, size_
 	    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, VA_FOURCC_UYVY);  // Only used by DeckLinkCapture, so always 4:2:2.
-			MJPEGEncoder::ReleaseVAResources release(mjpeg_encoder, resources);
+			VAResourcePool::VAResources resources = mjpeg_encoder->get_va_pool()->get_va_resources(width, height, VA_FOURCC_UYVY);  // Only used by DeckLinkCapture, so always 4:2:2.
+			ReleaseVAResources release(mjpeg_encoder->get_va_pool(), resources);
 
 			if (resources.image.pitches[0] == stride) {
 				userdata->va_resources = move(resources);
@@ -393,8 +398,8 @@ void PBOFrameAllocator::release_frame(Frame frame)
 	{
 		// 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);
+		VAResourcePool::VAResources resources __attribute__((unused)) = move(userdata->va_resources);
+		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;