[vlc-commits] vout:win32: remove unused rect_src_clipped
Steve Lhomme
git at videolan.org
Mon Apr 1 12:03:41 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Mar 22 13:58:47 2019 +0100| [75cf332f63e7bec910af6dacc6292b1652696a68] | committer: Steve Lhomme
vout:win32: remove unused rect_src_clipped
It was always the source dimensions.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=75cf332f63e7bec910af6dacc6292b1652696a68
---
modules/video_output/win32/common.c | 15 ++-------------
modules/video_output/win32/common.h | 1 -
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index 6d981dd114..1c9583b88f 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -137,9 +137,6 @@ int CommonInit(vout_display_t *vd, vout_display_sys_win32_t *sys, bool b_windowl
void UpdateRects(vout_display_t *vd, vout_display_sys_win32_t *sys, bool is_forced)
{
const video_format_t *source = &vd->source;
-#define rect_src sys->rect_src
-#define rect_src_clipped sys->rect_src_clipped
-#define rect_dest sys->rect_dest
RECT rect;
POINT point = { 0 };
@@ -218,6 +215,8 @@ void UpdateRects(vout_display_t *vd, vout_display_sys_win32_t *sys, bool is_forc
}
#endif
+#define rect_src sys->rect_src
+#define rect_dest sys->rect_dest
/* Destination image position and dimensions */
#if (defined(MODULE_NAME_IS_direct3d9) || defined(MODULE_NAME_IS_direct3d11)) && !VLC_WINSTORE_APP
rect_dest.left = 0;
@@ -233,9 +232,6 @@ void UpdateRects(vout_display_t *vd, vout_display_sys_win32_t *sys, bool is_forc
/* the 2 following lines are to fix a bug when clicking on the desktop */
if (place.width == 0 || place.height == 0) {
-#if !VLC_WINSTORE_APP
- SetRectEmpty(&rect_src_clipped);
-#endif
goto exit;
}
@@ -245,12 +241,6 @@ void UpdateRects(vout_display_t *vd, vout_display_sys_win32_t *sys, bool is_forc
rect_src.right = sys->pf_GetPictureWidth(vd);
rect_src.bottom = sys->pf_GetPictureHeight(vd);
- /* Clip the source image */
- rect_src_clipped.left = source->i_x_offset;
- rect_src_clipped.right = source->i_x_offset + source->i_visible_width;
- rect_src_clipped.top = source->i_y_offset;
- rect_src_clipped.bottom = source->i_y_offset + source->i_visible_height;
-
#ifndef NDEBUG
msg_Dbg(vd, "DirectXUpdateRects source"
" offset: %i,%i visible: %ix%i",
@@ -275,7 +265,6 @@ exit:
sys->changes |= DX_POSITION_CHANGE;
#undef rect_src
-#undef rect_src_clipped
#undef rect_dest
}
diff --git a/modules/video_output/win32/common.h b/modules/video_output/win32/common.h
index 284158d338..ff779b5ff8 100644
--- a/modules/video_output/win32/common.h
+++ b/modules/video_output/win32/common.h
@@ -68,7 +68,6 @@ typedef struct vout_display_sys_win32_t
/* Coordinates of src and dest images (used when blitting to display) */
RECT rect_src;
- RECT rect_src_clipped;
RECT rect_dest;
vout_display_cfg_t vdcfg;
More information about the vlc-commits
mailing list