Unify the texture upload paths a bit.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 7a084d94088b8655dd4a95e87d589c4a5e456eb0..9df2201299b6fb72d142c0741536b83b1dc1c880 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -1,5 +1,3 @@
-#define EXTRAHEIGHT 30
-
 #undef Success
 
 #include "mixer.h"
@@ -107,7 +105,7 @@ Mixer::Mixer(const QSurfaceFormat &format, unsigned num_cards)
                CaptureCard *card = &cards[card_index];
                card->usb = new BMUSBCapture(card_index);
                card->usb->set_frame_callback(bind(&Mixer::bm_frame, this, card_index, _1, _2, _3, _4, _5, _6, _7));
-               card->frame_allocator.reset(new PBOFrameAllocator(WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44 + 1, WIDTH, HEIGHT));
+               card->frame_allocator.reset(new PBOFrameAllocator(8 << 20, WIDTH, HEIGHT));  // 8 MB.
                card->usb->set_video_frame_allocator(card->frame_allocator.get());
                card->surface = create_surface(format);
                card->usb->set_dequeue_thread_callbacks(
@@ -220,10 +218,11 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
 {
        CaptureCard *card = &cards[card_index];
 
-       int width, height, frame_rate_nom, frame_rate_den;
+       unsigned width, height, frame_rate_nom, frame_rate_den, extra_lines_top, extra_lines_bottom;
        bool interlaced;
 
-       decode_video_format(video_format, &width, &height, &frame_rate_nom, &frame_rate_den, &interlaced);  // Ignore return value for now.
+       decode_video_format(video_format, &width, &height, &extra_lines_top, &extra_lines_bottom,
+                           &frame_rate_nom, &frame_rate_den, &interlaced);  // Ignore return value for now.
        int64_t frame_length = TIMEBASE * frame_rate_den / frame_rate_nom;
 
        size_t num_samples = (audio_frame.len >= audio_offset) ? (audio_frame.len - audio_offset) / 8 / 3 : 0;
@@ -300,7 +299,8 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                if (card->should_quit) return;
        }
 
-       if (video_frame.len - video_offset != WIDTH * (HEIGHT+EXTRAHEIGHT) * 2) {
+       if (video_frame.len - video_offset == 0 ||
+           video_frame.len - video_offset != size_t(width * (height + extra_lines_top + extra_lines_bottom) * 2)) {
                if (video_frame.len != 0) {
                        printf("Card %d: Dropping video frame with wrong length (%ld)\n",
                                card_index, video_frame.len - video_offset);
@@ -323,7 +323,29 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
                return;
        }
 
-       const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)video_frame.userdata;
+       PBOFrameAllocator::Userdata *userdata = (PBOFrameAllocator::Userdata *)video_frame.userdata;
+
+       // Upload the textures.
+       size_t cbcr_width = width / 2;
+       size_t cbcr_offset = video_offset / 2;
+       size_t y_offset = video_frame.size / 2 + video_offset / 2;
+
+       if (width != userdata->last_width || height != userdata->last_height) {
+               // We changed resolution since last use of this texture, so we need to create
+               // a new object. Note that this each card has its own PBOFrameAllocator,
+               // we don't need to worry about these flip-flopping between resolutions.
+               glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
+               check_error();
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_RG8, cbcr_width, height, 0, GL_RG, GL_UNSIGNED_BYTE, nullptr);
+               check_error();
+               glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
+               check_error();
+               glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, width, height, 0, GL_RED, GL_UNSIGNED_BYTE, nullptr);
+               check_error();
+               userdata->last_width = width;
+               userdata->last_height = height;
+       }
+
        GLuint pbo = userdata->pbo;
        check_error();
        glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo);
@@ -333,14 +355,13 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode,
        //glMemoryBarrier(GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT);
        //check_error();
 
-       // Upload the textures.
-       glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
+       glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
        check_error();
-       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH, HEIGHT, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET((WIDTH * (HEIGHT+EXTRAHEIGHT) * 2 + 44) / 2 + WIDTH * 25 + video_offset/2));
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, cbcr_width, height, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(cbcr_offset + cbcr_width * extra_lines_top * sizeof(uint16_t)));
        check_error();
-       glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr);
+       glBindTexture(GL_TEXTURE_2D, userdata->tex_y);
        check_error();
-       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + video_offset/2));
+       glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(y_offset + width * extra_lines_top));
        check_error();
        glBindTexture(GL_TEXTURE_2D, 0);
        check_error();
@@ -467,7 +488,7 @@ void Mixer::thread_func()
                                check_error();
                        }
                        const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)card->new_frame->userdata;
-                       theme->set_input_textures(card_index, userdata->tex_y, userdata->tex_cbcr);
+                       theme->set_input_textures(card_index, userdata->tex_y, userdata->tex_cbcr, userdata->last_width, userdata->last_height);
                }
 
                // Get the main chain from the theme, and set its state immediately.