#include <stdio.h>
#include <cstddef>
-#include "util.h"
+#include <movit/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)
- : frame_size(frame_size), buffer(buffer)
+ : buffer(buffer)
{
userdata.reset(new Userdata[num_queued_frames]);
for (size_t i = 0; i < num_queued_frames; ++i) {
userdata[i].last_height[0] = height;
userdata[i].last_width[1] = 0;
userdata[i].last_height[1] = 0;
+ userdata[i].last_interlaced = false;
+ userdata[i].last_has_signal = false;
for (unsigned field = 0; field < 2; ++field) {
glBindTexture(GL_TEXTURE_2D, userdata[i].tex_y[field]);
check_error();
{
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 {
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;
}