GithubStar/QtAV
1
0
Fork 0
mirror of https://github.com/wang-bin/QtAV.git synced 2026-10-18 13:11:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

gl: no texture upload if hw map error. minor simplification

Browse Source
This commit is contained in:
wang-bin
2016-08-18 16:27:13 +08:00
parent f8c73f0198
commit cfa0997899
4 changed files with 69 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/QtAV/VideoShader.h
+2 -6
View File
@@ -185,7 +185,6 @@ public:
void setCurrentFrame(const VideoFrame& frame);
VideoFormat currentFormat() const;
VideoShader* createShader() const;
void initializeShader(VideoShader* shader) const;
virtual qint32 type() const;
static QString typeName(qint32 value);
@@ -193,7 +192,7 @@ public:
void unbind();
int compare(const VideoMaterial* other) const;
bool hasAlpha() const;
int textureTarget() const;
/*!
* \brief isDirty
* \return true if material type changed, or other properties changed, e.g. 8bit=>10bit (the same material type) and eq
@@ -252,7 +251,7 @@ public:
*/
QRectF normalizedROI(const QRectF& roi) const;
/*!
* \brief mapToFrame
* \brief mapToTexture
* map a point p or a rect r to video texture in a given plane and scaled to valid width.
* p or r is in video frame's rect coordinates, no matter which plane is
* \param normalize -1: auto(do not normalize for rectangle texture). 0: no. 1: yes
@@ -270,9 +269,6 @@ public:
qreal saturation() const;
void setSaturation(qreal value);
protected:
// TODO: roi
// whether to update texture is set internal
void bindPlane(int p, bool updateTexture = true);
VideoMaterial(VideoMaterialPrivate &d);
DPTR_DECLARE(VideoMaterial)
};
src/QtAV/private/VideoShader_p.h
+1 -11
View File
@@ -119,12 +119,10 @@ public:
v_texel_size.reserve(4);
textures.reserve(4);
texture_size.reserve(4);
texture_upload_size.reserve(4);
effective_tex_width.reserve(4);
internal_format.reserve(4);
data_format.reserve(4);
data_type.reserve(4);
texture_coords.reserve(4);
static bool enable_pbo = qgetenv("QTAV_PBO").toInt() > 0;
if (try_pbo)
try_pbo = enable_pbo;
@@ -135,6 +133,7 @@ public:
bool initPBO(int plane, int size);
bool initTexture(GLuint tex, GLint internal_format, GLenum format, GLenum dataType, int width, int height);
bool updateTextureParameters(const VideoFormat& fmt);
void uploadPlane(int p, bool updateTexture = true);
bool ensureResources();
bool ensureTextures();
void setupQuality();
@@ -158,14 +157,6 @@ public:
QVector<GLuint> textures; //texture ids. size is plane count
QHash<GLuint, bool> owns_texture;
QVector<QSize> texture_size;
/*
* actually if render a full frame, only plane 0 is enough. other planes are the same as texture size.
* because linesize[0]>=linesize[1]
* uploade size is required when
* 1. y/u is not an integer because of alignment. then padding size of y < padding size of u, and effective size y/u != texture size y/u
* 2. odd size. enlarge y
*/
QVector<QSize> texture_upload_size;
QVector<int> effective_tex_width; //without additional width for alignment
qreal effective_tex_width_ratio;
@@ -174,7 +165,6 @@ public:
QVector<GLenum> data_format;
QVector<GLenum> data_type;
QVector<GLfloat> texture_coords;
bool dirty;
ColorTransform colorTransform;
bool try_pbo;
src/opengl/OpenGLVideo.cpp
+6 -3
View File
@@ -77,6 +77,7 @@ public:
ShaderManager *manager;
VideoMaterial *material;
qint64 material_type;
bool has_a;
bool update_geo;
int tex_target;
qreal valiad_tex_width;
@@ -221,6 +222,7 @@ QOpenGLContext* OpenGLVideo::openGLContext()
void OpenGLVideo::setCurrentFrame(const VideoFrame &frame)
{
d_func().material->setCurrentFrame(frame);
d_func().has_a = frame.format().hasAlpha();
}
void OpenGLVideo::setProjectionMatrixToRect(const QRectF &v)
@@ -284,19 +286,20 @@ void OpenGLVideo::render(const QRectF &target, const QRectF& roi, const QMatrix4
qDebug() << "material changed: " << VideoMaterial::typeName(d.material_type) << " => " << VideoMaterial::typeName(mt);
d.material_type = mt;
}
if (!d.material->bind()) // bind first because texture parameters(target) mapped from native buffer is unknown before it
return;
VideoShader *shader = d.user_shader;
if (!shader)
shader = d.manager->prepareMaterial(d.material, mt); //TODO: print shader type name if changed. prepareMaterial(,sample_code, pp_code)
shader->update(d.material);
d.material->setDirty(false); //
shader->program()->setUniformValue(shader->matrixLocation(), transform*d.matrix);
// uniform end. attribute begin
d.updateGeometry(shader, target, roi);
// normalize?
const bool blending = d.material->hasAlpha();
const bool blending = d.has_a;
if (blending) {
DYGL(glEnable(GL_BLEND));
DYGL(glBlendFunc(GL_SRC_ALPHA , GL_ONE_MINUS_SRC_ALPHA));
gl().BlendFuncSeparate(GL_SRC_ALPHA , GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA , GL_ONE_MINUS_SRC_ALPHA); //
}
d.gr.render();
if (blending)
src/opengl/VideoShader.cpp
+60 -71
View File
@@ -165,9 +165,8 @@ const char* VideoShader::fragmentShader() const
frag.prepend("#undef texture\n"
"#define texture texture2DRect\n"
);
}
if (textureTarget() == GL_TEXTURE_RECTANGLE)
frag.prepend("#define MULTI_COORD\n");
}
frag.prepend(OpenGLHelper::compatibleShaderHeader(QOpenGLShader::Fragment));
QByteArray header("*/");
@@ -347,19 +346,20 @@ QOpenGLShaderProgram* VideoShader::program()
bool VideoShader::update(VideoMaterial *material)
{
if (!material)
return false;
Q_ASSERT(material && "null material");
DPTR_D(VideoShader);
const qint32 mt = material->type();
if (mt != d.material_type || d.rebuild_program) {
// TODO: use shader program cache (per shader), check shader type
qDebug("Rebuild shader program requested: %d. Material type %d=>%d", d.rebuild_program, d.material_type, mt);
program()->removeAllShaders(); //not linked
material->initializeShader(this);
// initialize shader, the same as VideoMaterial::createShader
setVideoFormat(material->currentFormat());
setTextureTarget(material->textureTarget());
setMaterialType(material->type());
initialize();
}
if (!material->bind())
return false;
//material->unbind();
const VideoFormat fmt(material->currentFormat()); //FIXME: maybe changed in setCurrentFrame(
//format is out of date because we may use the same shader for different formats
@@ -554,19 +554,14 @@ VideoFormat VideoMaterial::currentFormat() const
VideoShader* VideoMaterial::createShader() const
{
VideoShader *shader = new VideoShader();
initializeShader(shader);
// initialize shader
shader->setVideoFormat(currentFormat());
shader->setTextureTarget(textureTarget());
shader->setMaterialType(type());
//resize texture locations to avoid access format later
return shader;
}
void VideoMaterial::initializeShader(VideoShader *shader) const
{
DPTR_D(const VideoMaterial);
shader->setVideoFormat(d.video_format);
shader->setTextureTarget(d.target);
shader->setMaterialType(type());
}
QString VideoMaterial::typeName(qint32 value)
{
return QString("gl material 16to8bit: %1, planar: %2, has alpha: %3, 2d texture: %4, 2nd plane rg: %5")
@@ -585,9 +580,7 @@ qint32 VideoMaterial::type() const
const bool tex_2d = d.target == GL_TEXTURE_2D;
// 2d,alpha,planar,8bit
const int rg_biplane = fmt.planeCount()==2 && !OpenGLHelper::useDeprecatedFormats() && OpenGLHelper::hasRG();
// nv21 bpc=1?
const int bpc = fmt.bitsPerComponent();
const int channel16_to8 = bpc > 8 && (OpenGLHelper::depth16BitTexture() < 16 || !OpenGLHelper::has16BitTexture() || fmt.isBigEndian());
const int channel16_to8 = d.bpc > 8 && (OpenGLHelper::depth16BitTexture() < 16 || !OpenGLHelper::has16BitTexture() || fmt.isBigEndian());
return (rg_biplane<<4)|(tex_2d<<3)|(fmt.hasAlpha()<<2)|(fmt.isPlanar()<<1)|(channel16_to8);
}
@@ -604,7 +597,7 @@ bool VideoMaterial::bind()
d.ensureTextures();
for (int i = 0; i < nb_planes; ++i) {
const int p = (i + 1) % nb_planes; //0 must active at last?
bindPlane(p, d.update_texure); // why? i: quick items display wrong textures
d.uploadPlane(p, d.update_texure);
}
#if 0 //move to unbind should be fine
if (d.update_texure) {
@@ -616,38 +609,36 @@ bool VideoMaterial::bind()
}
// TODO: move bindPlane to d.uploadPlane
void VideoMaterial::bindPlane(int p, bool updateTexture)
void VideoMaterialPrivate::uploadPlane(int p, bool updateTexture)
{
DPTR_D(VideoMaterial);
GLuint &tex = d.textures[p];
GLuint &tex = textures[p];
gl().ActiveTexture(GL_TEXTURE0 + p); //0 must active?
if (!updateTexture) {
DYGL(glBindTexture(d.target, tex));
DYGL(glBindTexture(target, tex));
return;
}
// try_pbo ? pbo_id : 0. 0= > interop.createHandle
GLuint tex0 = tex;
if (d.frame.map(GLTextureSurface, &tex, p)) {
if (tex0 != tex) {
if (d.owns_texture[tex0])
DYGL(glDeleteTextures(1, &tex0));
d.owns_texture.remove(tex0);
d.owns_texture[tex] = false;
if (!frame.constBits(0)) {
// try_pbo ? pbo_id : 0. 0= > interop.createHandle
GLuint tex0 = tex;
if (frame.map(GLTextureSurface, &tex, p)) {
if (tex0 != tex) {
if (owns_texture[tex0])
DYGL(glDeleteTextures(1, &tex0));
owns_texture.remove(tex0);
owns_texture[tex] = false;
}
DYGL(glBindTexture(target, tex)); // glActiveTexture was called, but maybe bind to 0 in map
return;
}
DYGL(glBindTexture(d.target, tex)); // glActiveTexture was called, but maybe bind to 0 in map
return;
}
if (!d.frame.constBits(0)) {
qWarning("map hw surface error");
return;
}
// TODO if a hw frame map() failed, do not upload. upload only for host memory surfaces
// FIXME: why happens on win?
if (d.frame.bytesPerLine(p) <= 0)
if (frame.bytesPerLine(p) <= 0)
return;
if (d.try_pbo) {
if (try_pbo) {
//qDebug("bind PBO %d", p);
QOpenGLBuffer &pb = d.pbo[p];
QOpenGLBuffer &pb = pbo[p];
pb.bind();
// glMapBuffer() causes sync issue.
// Call glBufferData() with NULL pointer before glMapBuffer(), the previous data in PBO will be discarded and
@@ -656,45 +647,29 @@ void VideoMaterial::bindPlane(int p, bool updateTexture)
pb.allocate(pb.size());
GLubyte* ptr = (GLubyte*)pb.map(QOpenGLBuffer::WriteOnly);
if (ptr) {
memcpy(ptr, d.frame.constBits(p), pb.size());
memcpy(ptr, frame.constBits(p), pb.size());
pb.unmap();
}
}
//qDebug("bpl[%d]=%d width=%d", p, frame.bytesPerLine(p), frame.planeWidth(p));
DYGL(glBindTexture(d.target, tex));
//d.setupQuality();
//DYGL(glTexParameteri(d.target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
//DYGL(glTexParameteri(d.target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
DYGL(glBindTexture(target, tex));
//setupQuality();
//DYGL(glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
//DYGL(glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
// This is necessary for non-power-of-two textures
//glPixelStorei(GL_UNPACK_ALIGNMENT, get_alignment(stride)); 8, 4, 2, 1
// glPixelStorei(GL_UNPACK_ROW_LENGTH, stride/glbpp); // for stride%glbpp > 0?
DYGL(glTexSubImage2D(d.target, 0, 0, 0, d.texture_upload_size[p].width(), d.texture_upload_size[p].height(), d.data_format[p], d.data_type[p], d.try_pbo ? 0 : d.frame.constBits(p)));
if (false) { //texture_upload_size[].width()*gl_bpp != bytesPerLine[]
for (int y = 0; y < d.plane0Size.height(); ++y)
DYGL(glTexSubImage2D(d.target, 0, 0, y, d.texture_upload_size[p].width(), 1, d.data_format[p], d.data_type[p], d.try_pbo ? 0 : d.frame.constBits(p)+y*d.plane0Size.width()));
DYGL(glTexSubImage2D(target, 0, 0, 0, texture_size[p].width(), texture_size[p].height(), data_format[p], data_type[p], try_pbo ? 0 : frame.constBits(p)));
if (false) { //texture_size[].width()*gl_bpp != bytesPerLine[]
for (int y = 0; y < plane0Size.height(); ++y)
DYGL(glTexSubImage2D(target, 0, 0, y, texture_size[p].width(), 1, data_format[p], data_type[p], try_pbo ? 0 : frame.constBits(p)+y*plane0Size.width()));
}
//DYGL(glBindTexture(d.target, 0)); // no bind 0 because glActiveTexture was called
if (d.try_pbo) {
d.pbo[p].release();
//DYGL(glBindTexture(target, 0)); // no bind 0 because glActiveTexture was called
if (try_pbo) {
pbo[p].release();
}
}
int VideoMaterial::compare(const VideoMaterial *other) const
{
DPTR_D(const VideoMaterial);
for (int i = 0; i < d.textures.size(); ++i) {
const int diff = d.textures[i] - other->d_func().textures[i]; //TODO
if (diff)
return diff;
}
return d.bpc - other->bitsPerComponent();
}
bool VideoMaterial::hasAlpha() const
{
return d_func().video_format.hasAlpha();
}
void VideoMaterial::unbind()
{
DPTR_D(VideoMaterial);
@@ -708,6 +683,23 @@ void VideoMaterial::unbind()
d.update_texure = false;
d.frame = VideoFrame(); //FIXME: why need this? we must unmap correctly before frame is reset.
}
setDirty(false);
}
int VideoMaterial::compare(const VideoMaterial *other) const
{
DPTR_D(const VideoMaterial);
for (int i = 0; i < d.textures.size(); ++i) {
const int diff = d.textures[i] - other->d_func().textures[i]; //TODO
if (diff)
return diff;
}
return d.bpc - other->bitsPerComponent();
}
int VideoMaterial::textureTarget() const
{
return d_func().target;
}
bool VideoMaterial::isDirty() const
@@ -997,7 +989,6 @@ bool VideoMaterialPrivate::updateTextureParameters(const VideoFormat& fmt)
const int bpp_gl = OpenGLHelper::bytesOfGLFormat(data_format[i], data_type[i]);
const int pad = std::ceil((qreal)(texture_size[i].width() - effective_tex_width[i])/(qreal)bpp_gl);
texture_size[i].setWidth(std::ceil((qreal)texture_size[i].width()/(qreal)bpp_gl));
texture_upload_size[i].setWidth(std::ceil((qreal)texture_upload_size[i].width()/(qreal)bpp_gl));
effective_tex_width[i] /= bpp_gl; //fmt.bytesPerPixel(i);
v_texture_size[i] = QVector2D(texture_size[i].width(), texture_size[i].height());
//effective_tex_width_ratio =
@@ -1064,14 +1055,12 @@ bool VideoMaterialPrivate::ensureResources()
v_texel_size.resize(nb_planes);
v_texture_size.resize(nb_planes);
texture_size.resize(nb_planes);
texture_upload_size.resize(nb_planes);
effective_tex_width.resize(nb_planes);
effective_tex_width_ratio = 1.0;
for (int i = 0; i < nb_planes; ++i) {
qDebug("plane linesize %d: padded = %d, effective = %d. theoretical plane size: %dx%d", i, frame.bytesPerLine(i), frame.effectiveBytesPerLine(i), frame.planeWidth(i), frame.planeHeight(i));
// we have to consider size of opengl format. set bytesPerLine here and change to width later
texture_size[i] = QSize(frame.bytesPerLine(i), frame.planeHeight(i));
texture_upload_size[i] = texture_size[i];
effective_tex_width[i] = frame.effectiveBytesPerLine(i); //store bytes here, modify as width later
// usually they are the same. If not, the difference is small. min value can avoid rendering the invalid data.
effective_tex_width_ratio = qMin(effective_tex_width_ratio, (qreal)frame.effectiveBytesPerLine(i)/(qreal)frame.bytesPerLine(i));