Support 10-bit capture, both on bmusb and on DeckLink drivers.

[nageru] / pbo_frame_allocator.cpp

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index d18358a3121b7cf131de211df446a62b098db1e6..5aa47057ce4d40a94d900ccdb206b78d79078804 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <cstddef>
 
+#include "flags.h"
+
 using namespace std;
 
 PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
@@ -30,15 +32,27 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei
                frame.userdata = &userdata[i];
                userdata[i].pbo = pbo;
                frame.owner = this;
-               frame.interleaved = true;
+
+               // For 8-bit Y'CbCr, we ask the driver to split Y' and Cb/Cr
+               // into separate textures. For 10-bit, the input format (v210)
+               // is complicated enough that we need to interpolate up to 4:4:4,
+               // which we do in a compute shader ourselves.
+               frame.interleaved = !global_flags.ten_bit_input;
 
                // Create textures. We don't allocate any data for the second field at this point
                // (just create the texture state with the samplers), since our default assumed
                // resolution is progressive.
-               glGenTextures(2, userdata[i].tex_y);
-               check_error();
-               glGenTextures(2, userdata[i].tex_cbcr);
-               check_error();
+               if (global_flags.ten_bit_input) {
+                       glGenTextures(2, userdata[i].tex_v210);
+                       check_error();
+                       glGenTextures(2, userdata[i].tex_444);
+                       check_error();
+               } else {
+                       glGenTextures(2, userdata[i].tex_y);
+                       check_error();
+                       glGenTextures(2, userdata[i].tex_cbcr);
+                       check_error();
+               }
                userdata[i].last_width[0] = width;
                userdata[i].last_height[0] = height;
                userdata[i].last_width[1] = 0;
@@ -47,30 +61,54 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei
                userdata[i].last_has_signal = false;
                userdata[i].last_is_connected = false;
                for (unsigned field = 0; field < 2; ++field) {
-                       glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
-                       check_error();
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-                       check_error();
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                       check_error();
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-                       check_error();
-                       if (field == 0) {
-                               glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+                       if (global_flags.ten_bit_input) {
+                               glBindTexture(GL_TEXTURE_2D, userdata[i].tex_v210[field]);
                                check_error();
-                       }
+                               // Don't care about texture parameters, we're only going to read it
+                               // from the compute shader anyway.
+                               if (field == 0) {
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL);
+                                       check_error();
+                               }
 
-                       glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cbcr[field]);
-                       check_error();
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-                       check_error();
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-                       check_error();
-                       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-                       check_error();
-                       if (field == 0) {
-                               glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL);
+                               glBindTexture(GL_TEXTURE_2D, userdata[i].tex_444[field]);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                                check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                               check_error();
+                               if (field == 0) {
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB10_A2, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, NULL);
+                                       check_error();
+                               }
+                       } else {
+                               glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                               check_error();
+                               if (field == 0) {
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+                                       check_error();
+                               }
+
+                               glBindTexture(GL_TEXTURE_2D, userdata[i].tex_cbcr[field]);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                               check_error();
+                               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+                               check_error();
+                               if (field == 0) {
+                                       glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, width / 2, height, 0, GL_RG, GL_UNSIGNED_BYTE, NULL);
+                                       check_error();
+                               }
                        }
                }
 
@@ -96,10 +134,17 @@ PBOFrameAllocator::~PBOFrameAllocator()
                check_error();
                glDeleteBuffers(1, &pbo);
                check_error();
-               glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_y);
-               check_error();
-               glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cbcr);
-               check_error();
+               if (global_flags.ten_bit_input) {
+                       glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_v210);
+                       check_error();
+                       glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_444);
+                       check_error();
+               } else {
+                       glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_y);
+                       check_error();
+                       glDeleteTextures(2, ((Userdata *)frame.userdata)->tex_cbcr);
+                       check_error();
+               }
        }
 }
 //static int sumsum = 0;