[PATCH v2 2/6] qasf/dmowrapper: Introduce get_output_samples.

[Ziqing Hui]

From: Ziqing Hui

---
 dlls/qasf/dmowrapper.c | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c
index 95e12e860ae..b98b18a7cac 100644
--- a/dlls/qasf/dmowrapper.c
+++ b/dlls/qasf/dmowrapper.c
@@ -202,12 +202,10 @@ static void dmo_wrapper_sink_disconnect(struct strmbase_sink *iface)
     IMediaObject_Release(dmo);
 }

-static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo)
+static HRESULT get_output_samples(struct dmo_wrapper *filter)
 {
-    DMO_OUTPUT_DATA_BUFFER *buffers = filter->buffers;
-    DWORD status, i;
-    BOOL more_data;
     HRESULT hr;
+    DWORD i;

for (i = 0; i < filter->source_count; ++i)
     {
@@ -216,16 +214,29 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo)
             if (FAILED(hr = IMemAllocator_GetBuffer(filter->sources[i].pin.pAllocator,
                     &filter->sources[i].buffer.sample, NULL, NULL, 0)))
             {
-                ERR("Failed to get sample, hr %#lx.\n", hr);
-                goto out;
+                ERR("Failed to get sample for source %lu, hr %#lx.\n", i, hr);
+                return hr;
             }
-            buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface;
+            filter->buffers[i].pBuffer = &filter->sources[i].buffer.IMediaBuffer_iface;
             IMediaSample_SetActualDataLength(filter->sources[i].buffer.sample, 0);
         }
         else
-            buffers[i].pBuffer = NULL;
+            filter->buffers[i].pBuffer = NULL;
     }

+    return S_OK;
+}
+
+static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo)
+{
+    DMO_OUTPUT_DATA_BUFFER *buffers = filter->buffers;
+    DWORD status, i;
+    BOOL more_data;
+    HRESULT hr;
+
+    if (FAILED(hr = get_output_samples(filter)))
+        goto out;
+
     do
     {
         more_data = FALSE;