Write 1.4.0 changelog.

[nageru] / pbo_frame_allocator.cpp

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index f64ea5ff519f0d6ce4ea3a0b0eab040a14c309aa..d18358a3121b7cf131de211df446a62b098db1e6 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,12 +1,12 @@
 #include "pbo_frame_allocator.h"
 
+#include <bmusb/bmusb.h>
+#include <movit/util.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
 
-#include "util.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)
@@ -44,6 +44,8 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei
                userdata[i].last_width[1] = 0;
                userdata[i].last_height[1] = 0;
                userdata[i].last_interlaced = false;
+               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();
@@ -102,11 +104,11 @@ PBOFrameAllocator::~PBOFrameAllocator()
 }
 //static int sumsum = 0;
 
-FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
+bmusb::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 {
@@ -125,7 +127,36 @@ void PBOFrameAllocator::release_frame(Frame frame)
                printf("%d bytes overflow after last (PBO) frame\n", int(frame.overflow));
        }
 
-       std::unique_lock<std::mutex> lock(freelist_mutex);
+#if 0
+       // Poison the page. (Note that this might be bogus if you don't have an OpenGL context.)
+       memset(frame.data, 0, frame.size);
+       Userdata *userdata = (Userdata *)frame.userdata;
+       for (unsigned field = 0; field < 2; ++field) {
+               glBindTexture(GL_TEXTURE_2D, userdata->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();
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, userdata->last_width[field], userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+               check_error();
+
+               glBindTexture(GL_TEXTURE_2D, userdata->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();
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, userdata->last_width[field] / 2, userdata->last_height[field], 0, GL_RED, GL_UNSIGNED_BYTE, NULL);
+               check_error();
+       }
+#endif
+
+       unique_lock<mutex> lock(freelist_mutex);
        freelist.push(frame);
        //--sumsum;
 }