#include <QWheelEvent>
#include <QMouseEvent>
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+
using namespace std;
using namespace std::chrono;
}
}
- glTextureSubImage2D(tex[0], 0, 0, 0, frame->width, frame->height, GL_RED, GL_UNSIGNED_BYTE, frame->data.get());
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, frame->pbo);
+
+ if (frame->need_flush_len > 0) {
+ glFlushMappedNamedBufferRange(frame->pbo, 0, frame->need_flush_len);
+ frame->need_flush_len = 0;
+ }
+
+ glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+ glTextureSubImage2D(tex[0], 0, 0, 0, frame->width, frame->height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(0));
glGenerateTextureMipmap(tex[0]);
- glTextureSubImage2D(tex[1], 0, 0, 0, frame->chroma_width, frame->chroma_height, GL_RED, GL_UNSIGNED_BYTE, frame->data.get() + frame->width * frame->height);
+ glTextureSubImage2D(tex[1], 0, 0, 0, frame->chroma_width, frame->chroma_height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(frame->width * frame->height));
glGenerateTextureMipmap(tex[1]);
- glTextureSubImage2D(tex[2], 0, 0, 0, frame->chroma_width, frame->chroma_height, GL_RED, GL_UNSIGNED_BYTE, frame->data.get() + frame->width * frame->height + frame->chroma_width * frame->chroma_height);
+ glTextureSubImage2D(tex[2], 0, 0, 0, frame->chroma_width, frame->chroma_height, GL_RED, GL_UNSIGNED_BYTE, BUFFER_OFFSET(frame->width * frame->height + frame->chroma_width * frame->chroma_height));
glGenerateTextureMipmap(tex[2]);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+
glBindTextureUnit(0, tex[0]);
glBindTextureUnit(1, tex[1]);
glBindTextureUnit(2, tex[2]);
frame->chroma_height = chroma_height;
size_t len = frame->width * frame->height + 2 * frame->chroma_width * frame->chroma_height;
- frame->data.reset(new uint8_t[len]);
+
+ // Augh :-)
+ mutex mu;
+ condition_variable done_cv;
+ bool done = false;
+
+ post_to_main_thread([this, &frame, len, &done, &mu, &done_cv]{
+ makeCurrent();
+ glCreateBuffers(1, &frame->pbo);
+ glNamedBufferStorage(frame->pbo, len, nullptr, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT);
+ frame->data = (uint8_t *)glMapNamedBufferRange(frame->pbo, 0, len, GL_MAP_WRITE_BIT | GL_MAP_FLUSH_EXPLICIT_BIT | GL_MAP_PERSISTENT_BIT);
+ doneCurrent();
+
+ lock_guard lock(mu);
+ done = true;
+ done_cv.notify_all();
+ });
+ {
+ unique_lock lock(mu);
+ done_cv.wait(lock, [&done]{ return done; });
+ }
return shared_ptr<Frame>{frame, free_frame};
}
VideoWidget *self = frame->owner;
lock_guard lock(self->freelist_mu);
if (self->frame_freelist.size() >= 16) {
+ GLuint pbo = frame->pbo;
+ post_to_main_thread([self, pbo]{
+ self->makeCurrent();
+ glUnmapNamedBuffer(pbo);
+ glDeleteBuffers(1, &pbo);
+ self->doneCurrent();
+ });
delete self->frame_freelist.front();
self->frame_freelist.pop_front();
}
cbcr_offset[0] = compute_chroma_offset(0.0f, 1 << desc->log2_chroma_w, video_frame->chroma_width);
cbcr_offset[1] = compute_chroma_offset(0.5f, 1 << desc->log2_chroma_h, video_frame->chroma_height);
- pic_data[0] = video_frame->data.get();
+ pic_data[0] = video_frame->data;
linesizes[0] = frame->width;
pic_data[1] = pic_data[0] + frame->width * frame->height;
sws_scale(sws_ctx.get(), frame->data, frame->linesize, 0, frame->height, pic_data, linesizes);
+ video_frame->need_flush_len = video_frame->width * video_frame->height + 2 * video_frame->chroma_width * video_frame->chroma_height;
+
return video_frame;
}