gl: normalize check for invalid roi

Ivshti · May 9, 2015 · a03251e · a03251e
1 parent 84700f2
commit a03251e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/QtAV/VideoShader.h b/src/QtAV/VideoShader.h
@@ -143,8  143,8 @@ class Q_AV_EXPORT VideoMaterial
     QRectF normalizedROI(const QRectF& roi) const;
     /*!
      * \brief mapToFrame
-     * map a point p or a rect r to video texture (of 1st plane) and scaled to valid width.
-     * p or r is in video frame's rect, no matter which plane is
      * 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
      * \return
      * point or rect in current texture valid coordinates. \sa validTextureWidth()

diff --git a/src/VideoShader.cpp b/src/VideoShader.cpp
@@ -733,6  733,8 @@ QRectF VideoMaterial::mapToTexture(int plane, const QRectF &roi, int normalize)
     const qreal s = tex0W/qreal(d.width); // only apply to unnormalized input roi
     const qreal pw = d.video_format.normalizedWidth(plane);
     const qreal ph = d.video_format.normalizedHeight(plane);
     if (normalize < 0)
         normalize = d.target != GL_TEXTURE_RECTANGLE;
     if (!roi.isValid()) {
         if (normalize)
             return QRectF(0, 0, d.effective_tex_width_ratio, 1); //NOTE: not (0, 0, 1, 1)
@@ -742,8  744,6 @@ QRectF VideoMaterial::mapToTexture(int plane, const QRectF &roi, int normalize)
     float w = roi.width(); //TODO: texturewidth
     float y = roi.y();
     float h = roi.height();
-    if (normalize < 0)
-        normalize = d.target != GL_TEXTURE_RECTANGLE;
     if (normalize) {
         if (qAbs(x) > 1) {
             x /= tex0W;