From: Ziqing Hui zhui@codeweavers.com
--- dlls/mf/tests/mf.c | 2 +- dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 30 ------------------------------ 3 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 7d199224786..09f04e8ee8e 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -137,7 +137,7 @@ static HWND create_window(void) 0, 0, r.right - r.left, r.bottom - r.top, NULL, NULL, NULL, NULL); }
-static IMFSample *create_sample(const BYTE *data, ULONG size) +IMFSample *create_sample(const BYTE *data, ULONG size) { IMFMediaBuffer *media_buffer; IMFSample *sample; diff --git a/dlls/mf/tests/mf_test.h b/dlls/mf/tests/mf_test.h index 5a247e4a0ef..24b0492ea9f 100644 --- a/dlls/mf/tests/mf_test.h +++ b/dlls/mf/tests/mf_test.h @@ -114,3 +114,4 @@ struct sample_desc #define check_mf_sample_collection(a, b, c) check_mf_sample_collection_(__FILE__, __LINE__, a, b, c) extern DWORD check_mf_sample_collection_(const char *file, int line, IMFCollection *samples, const struct sample_desc *expect_samples, const WCHAR *expect_data_filename); +extern IMFSample *create_sample(const BYTE *data, ULONG size); diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f9e6b3b45cd..31586b6ea5f 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1949,36 +1949,6 @@ static void test_sample_copier_output_processing(void) ok(ref == 0, "Release returned %ld\n", ref); }
-static IMFSample *create_sample(const BYTE *data, ULONG size) -{ - IMFMediaBuffer *media_buffer; - IMFSample *sample; - DWORD length; - BYTE *buffer; - HRESULT hr; - ULONG ret; - - hr = MFCreateSample(&sample); - ok(hr == S_OK, "MFCreateSample returned %#lx\n", hr); - hr = MFCreateMemoryBuffer(size, &media_buffer); - ok(hr == S_OK, "MFCreateMemoryBuffer returned %#lx\n", hr); - hr = IMFMediaBuffer_Lock(media_buffer, &buffer, NULL, &length); - ok(hr == S_OK, "Lock returned %#lx\n", hr); - ok(length == 0, "got length %lu\n", length); - if (!data) memset(buffer, 0xcd, size); - else memcpy(buffer, data, size); - hr = IMFMediaBuffer_Unlock(media_buffer); - ok(hr == S_OK, "Unlock returned %#lx\n", hr); - hr = IMFMediaBuffer_SetCurrentLength(media_buffer, data ? size : 0); - ok(hr == S_OK, "SetCurrentLength returned %#lx\n", hr); - hr = IMFSample_AddBuffer(sample, media_buffer); - ok(hr == S_OK, "AddBuffer returned %#lx\n", hr); - ret = IMFMediaBuffer_Release(media_buffer); - ok(ret == 1, "Release returned %lu\n", ret); - - return sample; -} - static void test_aac_encoder(void) { const GUID *const class_id = &CLSID_AACMFTEncoder;