quartz/strmbase: Added patch to fix MediaSeekingPassThru_GetPositions when the pins are unconnected.

This commit is contained in:
Erich E. Hoover 2015-03-02 11:09:07 -07:00
parent ce2930fb30
commit 6038eeee95
6 changed files with 38 additions and 5 deletions

View File

@ -3210,14 +3210,16 @@ fi
# | * [#23174] Return correct IMediaSeeking stream positions in quartz
# |
# | Modified files:
# | * dlls/quartz/filtergraph.c
# | * dlls/quartz/filtergraph.c, dlls/strmbase/pospass.c
# |
if test "$enable_quartz_MediaSeeking_Positions" -eq 1; then
patch_apply quartz-MediaSeeking_Positions/0001-quartz-Include-the-stream-position-in-addition-to-th.patch
patch_apply quartz-MediaSeeking_Positions/0002-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch
patch_apply quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch
patch_apply quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch
patch_apply quartz-MediaSeeking_Positions/0001-strmbase-Fix-MediaSeekingPassThru_GetPositions-retur.patch
patch_apply quartz-MediaSeeking_Positions/0002-quartz-Include-the-stream-position-in-addition-to-th.patch
patch_apply quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetCurrentPosition-on-.patch
patch_apply quartz-MediaSeeking_Positions/0004-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch
patch_apply quartz-MediaSeeking_Positions/0005-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch
(
echo '+ { "Erich E. Hoover", "strmbase: Fix MediaSeekingPassThru_GetPositions return when the pins are unconnected.", 1 },';
echo '+ { "Erich E. Hoover", "quartz: Include the stream position in addition to the reference clock offset in the time returned by MediaSeeking_GetPositions.", 1 },';
echo '+ { "Erich E. Hoover", "quartz: Implement MediaSeeking_GetCurrentPosition on top of MediaSeeking_GetPositions.", 1 },';
echo '+ { "Erich E. Hoover", "quartz: Implement MediaSeeking_GetStopPosition on top of MediaSeeking_GetPositions.", 1 },';

View File

@ -0,0 +1,31 @@
From df8c6c12fcb38d5fc4f6a279d775aaec2b9d8a18 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Mon, 2 Mar 2015 11:01:22 -0700
Subject: strmbase: Fix MediaSeekingPassThru_GetPositions return when the pins
are unconnected.
---
dlls/strmbase/pospass.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c
index e547328..424853a 100644
--- a/dlls/strmbase/pospass.c
+++ b/dlls/strmbase/pospass.c
@@ -526,9 +526,11 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPositions(IMediaSeeking * iface, L
if (SUCCEEDED(hr)) {
hr = IMediaSeeking_GetPositions(seek, pCurrent, pStop);
IMediaSeeking_Release(seek);
+ } else if (hr == VFW_E_NOT_CONNECTED) {
+ *pCurrent = 0;
+ *pStop = 0;
+ hr = S_OK;
}
- else
- return E_NOTIMPL;
return hr;
}
--
1.9.1