X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=pbo_frame_allocator.cpp;h=74f54fd11082b4b9695338381ed01761ecc6d13a;hb=b85c1986b7ea63534899e2eb589f9e0888d5ccda;hp=3d4f8cf09321230a39c471164e9740fa99a92e84;hpb=3e8c584c42ae8a53e2cf335ff6c986f1b87f3f5e;p=nageru diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp index 3d4f8cf..74f54fd 100644 --- a/pbo_frame_allocator.cpp +++ b/pbo_frame_allocator.cpp @@ -45,6 +45,7 @@ PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint hei 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(); @@ -126,6 +127,35 @@ void PBOFrameAllocator::release_frame(Frame frame) printf("%d bytes overflow after last (PBO) frame\n", int(frame.overflow)); } +#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 lock(freelist_mutex); freelist.push(frame); //--sumsum;