[FFmpeg-cvslog] libavdevice/gdigrab: fix HIDPI support for window capture
Dilshod Mukhtarov
git at videolan.org
Wed Jan 30 22:55:36 EET 2019
ffmpeg | branch: master | Dilshod Mukhtarov <dilshodm at gmail.com> | Sun Jan 27 23:09:53 2019 +0400| [d7c9ddd0c4b02c1e8872a299a6613f9b55b858a4] | committer: Carl Eugen Hoyos
libavdevice/gdigrab: fix HIDPI support for window capture
In Windows if using scaling other than 100% then the grabbed window was not captured fully (cropped)
Signed-off-by: Dilshod Mukhtarov <dilshodm at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7c9ddd0c4b02c1e8872a299a6613f9b55b858a4
---
libavdevice/gdigrab.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/libavdevice/gdigrab.c b/libavdevice/gdigrab.c
index ab08c11788..0e6ae2bd5d 100644
--- a/libavdevice/gdigrab.c
+++ b/libavdevice/gdigrab.c
@@ -277,14 +277,20 @@ gdigrab_read_header(AVFormatContext *s1)
}
bpp = GetDeviceCaps(source_hdc, BITSPIXEL);
+ horzres = GetDeviceCaps(source_hdc, HORZRES);
+ vertres = GetDeviceCaps(source_hdc, VERTRES);
+ desktophorzres = GetDeviceCaps(source_hdc, DESKTOPHORZRES);
+ desktopvertres = GetDeviceCaps(source_hdc, DESKTOPVERTRES);
+
if (hwnd) {
GetClientRect(hwnd, &virtual_rect);
+ /* window -- get the right height and width for scaling DPI */
+ virtual_rect.left = virtual_rect.left * desktophorzres / horzres;
+ virtual_rect.right = virtual_rect.right * desktophorzres / horzres;
+ virtual_rect.top = virtual_rect.top * desktopvertres / vertres;
+ virtual_rect.bottom = virtual_rect.bottom * desktopvertres / vertres;
} else {
/* desktop -- get the right height and width for scaling DPI */
- horzres = GetDeviceCaps(source_hdc, HORZRES);
- vertres = GetDeviceCaps(source_hdc, VERTRES);
- desktophorzres = GetDeviceCaps(source_hdc, DESKTOPHORZRES);
- desktopvertres = GetDeviceCaps(source_hdc, DESKTOPVERTRES);
virtual_rect.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
virtual_rect.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
virtual_rect.right = (virtual_rect.left + GetSystemMetrics(SM_CXVIRTUALSCREEN)) * desktophorzres / horzres;
More information about the ffmpeg-cvslog
mailing list