Skip to content

W
wine-winehq
Commit ff0cd457 authored by Ziqing Hui's avatar Ziqing Hui Committed by Alexandre Julliard
Browse files
Options

winegstreamer: Set AvgTimePerFrame in GetOutputType() for WMV decoder.

Krkr2 game engine need AvgTimePerFrame to calculate video frame time.
parent 732ed628
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
dlls/mf/tests/transform.c
View file @ ff0cd457
...@@ -1349,7 +1349,6 @@ static void check_video_info_header_(int line, VIDEOINFOHEADER *info, const VIDE ...@@ -1349,7 +1349,6 @@ static void check_video_info_header_(int line, VIDEOINFOHEADER *info, const VIDE
expected->rcTarget.left, expected->rcTarget.top, expected->rcTarget.right, expected->rcTarget.bottom); expected->rcTarget.left, expected->rcTarget.top, expected->rcTarget.right, expected->rcTarget.bottom);
check_member_(__FILE__, line, *info, *expected, "%lu", dwBitRate); check_member_(__FILE__, line, *info, *expected, "%lu", dwBitRate);
check_member_(__FILE__, line, *info, *expected, "%lu", dwBitErrorRate); check_member_(__FILE__, line, *info, *expected, "%lu", dwBitErrorRate);
todo_wine_if(expected->AvgTimePerFrame)
check_member_(__FILE__, line, *info, *expected, "%I64d", AvgTimePerFrame); check_member_(__FILE__, line, *info, *expected, "%I64d", AvgTimePerFrame);
check_member_(__FILE__, line, *info, *expected, "%lu", bmiHeader.biSize); check_member_(__FILE__, line, *info, *expected, "%lu", bmiHeader.biSize);
check_member_(__FILE__, line, *info, *expected, "%ld", bmiHeader.biWidth); check_member_(__FILE__, line, *info, *expected, "%ld", bmiHeader.biWidth);
......
dlls/winegstreamer/wmv_decoder.c
View file @ ff0cd457
...@@ -470,6 +470,8 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde ...@@ -470,6 +470,8 @@ static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD inde
info->rcSource.bottom = height; info->rcSource.bottom = height;
info->rcTarget.right = width; info->rcTarget.right = width;
info->rcTarget.bottom = height; info->rcTarget.bottom = height;
info->AvgTimePerFrame = MulDiv(10000000, decoder->input_format.u.video_wmv.fps_d,
decoder->input_format.u.video_wmv.fps_n);
info->bmiHeader.biSize = sizeof(info->bmiHeader); info->bmiHeader.biSize = sizeof(info->bmiHeader);
info->bmiHeader.biWidth = width; info->bmiHeader.biWidth = width;
info->bmiHeader.biHeight = height; info->bmiHeader.biHeight = height;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment