Release Nageru 1.0.0, with some documentation updates.

[nageru] / pbo_frame_allocator.cpp

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 1018403c88da24c0128db4ac919d5e5c5b71f3d0..370fa3d1ea7e145ce1f0e5dee54a2e7610a0f040 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,5 +1,6 @@
 #include "pbo_frame_allocator.h"
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
@@ -8,9 +9,10 @@
 
 using namespace std;
 
-PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
-        : frame_size(frame_size), buffer(buffer)
+PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)
+        : buffer(buffer)
 {
+       userdata.reset(new Userdata[num_queued_frames]);
        for (size_t i = 0; i < num_queued_frames; ++i) {
                GLuint pbo;
                glGenBuffers(1, &pbo);
@@ -25,13 +27,57 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, size_t num_queued_frames
                frame.data2 = frame.data + frame_size / 2;
                check_error();
                frame.size = frame_size;
-               frame.userdata = (void *)(intptr_t)pbo;
+               frame.userdata = &userdata[i];
+               userdata[i].pbo = pbo;
                frame.owner = this;
                frame.interleaved = true;
+
+               // 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();
+               userdata[i].last_width[0] = width;
+               userdata[i].last_height[0] = height;
+               userdata[i].last_width[1] = 0;
+               userdata[i].last_height[1] = 0;
+               userdata[i].last_interlaced = 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);
+                               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();
+                       }
+               }
+
                freelist.push(frame);
        }
        glBindBuffer(buffer, 0);
        check_error();
+       glBindTexture(GL_TEXTURE_2D, 0);
+       check_error();
 }
 
 PBOFrameAllocator::~PBOFrameAllocator()
@@ -39,7 +85,7 @@ PBOFrameAllocator::~PBOFrameAllocator()
        while (!freelist.empty()) {
                Frame frame = freelist.front();
                freelist.pop();
-               GLuint pbo = (intptr_t)frame.userdata;
+               GLuint pbo = ((Userdata *)frame.userdata)->pbo;
                glBindBuffer(buffer, pbo);
                check_error();
                glUnmapBuffer(buffer);
@@ -47,6 +93,11 @@ PBOFrameAllocator::~PBOFrameAllocator()
                glBindBuffer(buffer, 0);
                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();
        }
 }
 //static int sumsum = 0;
@@ -55,7 +106,7 @@ FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
 {
         Frame vf;
 
-       std::unique_lock<std::mutex> lock(freelist_mutex);  // Meh.
+       unique_lock<mutex> lock(freelist_mutex);  // Meh.
        if (freelist.empty()) {
                printf("Frame overrun (no more spare PBO frames), dropping frame!\n");
        } else {
@@ -64,12 +115,17 @@ FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
                freelist.pop();  // Meh.
        }
        vf.len = 0;
+       vf.overflow = 0;
        return vf;
 }
 
 void PBOFrameAllocator::release_frame(Frame frame)
 {
-       std::unique_lock<std::mutex> lock(freelist_mutex);
+       if (frame.overflow > 0) {
+               printf("%d bytes overflow after last (PBO) frame\n", int(frame.overflow));
+       }
+
+       unique_lock<mutex> lock(freelist_mutex);
        freelist.push(frame);
        //--sumsum;
 }