[PATCH v2 3/3] qasf: Add asf_reader_start_stream helper.

[Ziqing Hui]

From: Ziqing Hui

---
 dlls/qasf/asfreader.c | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c
index 6b82553c33f..ec7a0310e0a 100644
--- a/dlls/qasf/asfreader.c
+++ b/dlls/qasf/asfreader.c
@@ -279,6 +279,25 @@ static HRESULT asf_stream_query_interface(struct strmbase_pin *iface, REFIID iid
     return S_OK;
 }

+static HRESULT asf_reader_start_stream(struct asf_reader *filter, LONGLONG start, LONGLONG duration, float rate)
+{
+    HRESULT hr;
+
+    EnterCriticalSection(&filter->status_cs);
+
+    if (SUCCEEDED(hr = IWMReader_Start(filter->reader, start, duration, rate, NULL)))
+    {
+        filter->status = -1;
+        while (filter->status != WMT_STARTED)
+            SleepConditionVariableCS(&filter->status_cv, &filter->status_cs, INFINITE);
+        hr = filter->result;
+    }
+
+    LeaveCriticalSection(&filter->status_cs);
+
+    return hr;
+}
+
 static HRESULT asf_reader_stop_stream(struct asf_reader *filter)
 {
     HRESULT hr;
@@ -332,17 +351,7 @@ static HRESULT WINAPI media_seeking_ChangeCurrent(IMediaSeeking *iface)

/* Start the reader. */
     if (hr == S_OK)
-    {
-        EnterCriticalSection(&filter->status_cs);
-        if (SUCCEEDED(hr = IWMReader_Start(filter->reader, seek->llCurrent, seek->llDuration, seek->dRate, NULL)))
-        {
-            filter->status = -1;
-            while (filter->status != WMT_STARTED)
-                SleepConditionVariableCS(&filter->status_cv, &filter->status_cs, INFINITE);
-            hr = filter->result;
-        }
-        LeaveCriticalSection(&filter->status_cs);
-    }
+        hr = asf_reader_start_stream(filter, seek->llCurrent, seek->llDuration, seek->dRate);

return hr;
 }
@@ -540,17 +549,7 @@ static HRESULT asf_reader_init_stream(struct strmbase_filter *iface)
     if (FAILED(hr))
         return hr;

-    EnterCriticalSection(&filter->status_cs);
-    if (SUCCEEDED(hr = IWMReader_Start(filter->reader, 0, 0, 1, NULL)))
-    {
-        filter->status = -1;
-        while (filter->status != WMT_STARTED)
-            SleepConditionVariableCS(&filter->status_cv, &filter->status_cs, INFINITE);
-        hr = filter->result;
-    }
-    LeaveCriticalSection(&filter->status_cs);
-
-    if (FAILED(hr))
+    if (FAILED(hr = asf_reader_start_stream(filter, 0, 0, 1.0)))
         WARN("Failed to start WMReader %p, hr %#lx\n", filter->reader, hr);

return hr;