Unplug ALSA cards as soon as we get the inotify message.

[nageru] / pbo_frame_allocator.cpp

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 3d4f8cf09321230a39c471164e9740fa99a92e84..34b2c7ba04de98378e92c6b0ad2fe78043d52902 100644 (file)
--- 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();
@@ -103,7 +104,7 @@ PBOFrameAllocator::~PBOFrameAllocator()
 }
 //static int sumsum = 0;
 
-FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
+bmusb::FrameAllocator::Frame PBOFrameAllocator::alloc_frame()
 {
         Frame vf;
 
@@ -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<mutex> lock(freelist_mutex);
        freelist.push(frame);
        //--sumsum;