ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

evr/presenter: Remove logic related to picture aspect ratio adjustment. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-11-08 14:57:02 +03:00 committed by Alexandre Julliard
parent 4b6df3a66c
commit 7462d77f0b
1 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/evr/presenter.c
View File

@ -483,8 +483,6 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
{ {
IDirect3DSurface9 *surface, *backbuffer; IDirect3DSurface9 *surface, *backbuffer;
IDirect3DDevice9 *device; IDirect3DDevice9 *device;
D3DSURFACE_DESC desc;
RECT dst, src;
HRESULT hr; HRESULT hr;
if (!presenter->swapchain) if (!presenter->swapchain)
@ -506,38 +504,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM
IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device);
IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT);
IDirect3DSurface9_GetDesc(surface, &desc); IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0);
SetRect(&src, 0, 0, desc.Width, desc.Height);
IDirect3DSurface9_GetDesc(backbuffer, &desc);
SetRect(&dst, 0, 0, desc.Width, desc.Height);
if (presenter->ar_mode & MFVideoARMode_PreservePicture)
{
unsigned int src_width = src.right - src.left, src_height = src.bottom - src.top;
unsigned int dst_width = dst.right - dst.left, dst_height = dst.bottom - dst.top;
if (src_width * dst_height > dst_width * src_height)
{
/* src is "wider" than dst. */
unsigned int dst_center = (dst.top + dst.bottom) / 2;
unsigned int scaled_height = src_height * dst_width / src_width;
dst.top = dst_center - scaled_height / 2;
dst.bottom = dst.top + scaled_height;
}
else if (src_width * dst_height < dst_width * src_height)
{
/* src is "taller" than dst. */
unsigned int dst_center = (dst.left + dst.right) / 2;
unsigned int scaled_width = src_width * dst_height / src_height;
dst.left = dst_center - scaled_width / 2;
dst.right = dst.left + scaled_width;
}
}
IDirect3DSwapChain9_Present(presenter->swapchain, &src, &dst, NULL, NULL, 0);
presenter->frame_stats.presented++; presenter->frame_stats.presented++;
IDirect3DDevice9_Release(device); IDirect3DDevice9_Release(device);