X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=7a084d94088b8655dd4a95e87d589c4a5e456eb0;hb=039f2cda6a822cd4b95039ce389577e34b539e52;hp=be284781c646694bdd998b7c4e7ad16aafcdb413;hpb=e30d28cfb9a4ca32821be1b6bdeb37dfbb38ecba;p=nageru diff --git a/mixer.cpp b/mixer.cpp index be28478..7a084d9 100644 --- a/mixer.cpp +++ b/mixer.cpp @@ -336,11 +336,11 @@ void Mixer::bm_frame(unsigned card_index, uint16_t timecode, // Upload the textures. glBindTexture(GL_TEXTURE_2D, userdata->tex_y); 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 + 22)); + 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)); check_error(); glBindTexture(GL_TEXTURE_2D, userdata->tex_cbcr); check_error(); - glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + 22)); + glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, WIDTH/2, HEIGHT, GL_RG, GL_UNSIGNED_BYTE, BUFFER_OFFSET(WIDTH * 25 + video_offset/2)); check_error(); glBindTexture(GL_TEXTURE_2D, 0); check_error();