[vlc-commits] hw:d3d: use the texture height as the plane height, not the visible height

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Wed Dec 13 16:33:36 2017 +0100| [5aa3dc38e42e184359c4a4b9eaf3f06b0ed47e93] | committer: Jean-Baptiste Kempf

hw:d3d: use the texture height as the plane height, not the visible height

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 9d9dd6924ccde2bc9df183b5bad070c1e21b4947)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5aa3dc38e42e184359c4a4b9eaf3f06b0ed47e93
---

 modules/hw/d3d11/d3d11_surface.c | 3 +--
 modules/hw/d3d9/dxa9.c           | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index e9d601fe8b..cf066ad6fc 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -492,8 +492,7 @@ static void D3D11_NV12(filter_t *p_filter, picture_t *src, picture_t *dst)
             lock.RowPitch,
             lock.RowPitch,
         };
-        Copy420_SP_to_SP(dst, plane, pitch,
-                          src->format.i_visible_height + src->format.i_y_offset, &sys->cache);
+        Copy420_SP_to_SP(dst, plane, pitch, desc.Height, &sys->cache);
     } else {
         msg_Err(p_filter, "Unsupported D3D11VA conversion from 0x%08X to NV12", desc.Format);
     }
diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index 887b3bf8ee..3f564e871a 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -154,8 +154,7 @@ static void DXA9_NV12(filter_t *p_filter, picture_t *src, picture_t *dst)
             lock.Pitch,
             lock.Pitch,
         };
-        Copy420_SP_to_SP(dst, plane, pitch,
-                         src->format.i_visible_height + src->format.i_y_offset, p_copy_cache);
+        Copy420_SP_to_SP(dst, plane, pitch, desc.Height, p_copy_cache);
     } else {
         msg_Err(p_filter, "Unsupported DXA9 conversion from 0x%08X to NV12", desc.Format);
     }