Zebediah Figura : quartz/tests: Add a test mp3 file.
Alexandre Julliard
julliard at winehq.org
Thu Feb 28 16:09:42 CST 2019
Module: wine
Branch: master
Commit: 194f765ba58ee094dab3bc86654aa2b91fe75c5c
URL: https://source.winehq.org/git/wine.git/?a=commit;h=194f765ba58ee094dab3bc86654aa2b91fe75c5c
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Thu Feb 28 00:13:01 2019 -0600
quartz/tests: Add a test mp3 file.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/filtergraph.c | 64 ++++++++++++++++++++++++----------------
dlls/quartz/tests/rsrc.rc | 6 ++++
dlls/quartz/tests/test.mp3 | Bin 0 -> 2349 bytes
3 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 897ba3a..88d964c 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -41,6 +41,7 @@ typedef struct TestFilterImpl
static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0};
static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0};
+static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0};
static WCHAR *load_resource(const WCHAR *name)
{
@@ -530,57 +531,63 @@ todo_wine
IMediaFilter_Release(filter);
}
-static void rungraph(IFilterGraph2 *graph)
+static void rungraph(IFilterGraph2 *graph, BOOL video)
{
- test_basic_video(graph);
+ if (video)
+ test_basic_video(graph);
test_media_seeking(graph);
test_state_change(graph);
test_media_event(graph);
}
-static HRESULT test_graph_builder_connect_file(WCHAR *filename)
+static HRESULT test_graph_builder_connect_file(WCHAR *filename, BOOL audio, BOOL video)
{
static const WCHAR outputW[] = {'O','u','t','p','u','t',0};
- static const WCHAR inW[] = {'I','n',0};
- IBaseFilter *source_filter, *video_filter;
+ IBaseFilter *source_filter, *renderer;
IPin *pin_in, *pin_out;
IFilterGraph2 *graph;
- IVideoWindow *window;
+ IEnumPins *enumpins;
HRESULT hr;
+ if (video)
+ hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IBaseFilter, (void **)&renderer);
+ else
+ hr = CoCreateInstance(&CLSID_AudioRender, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IBaseFilter, (void **)&renderer);
+ if (hr == VFW_E_NO_AUDIO_HARDWARE)
+ return VFW_E_CANNOT_CONNECT;
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+
graph = create_graph();
- hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IVideoWindow, (void **)&window);
- ok(hr == S_OK, "Failed to create VideoRenderer: %#x\n", hr);
+ IBaseFilter_EnumPins(renderer, &enumpins);
+ IEnumPins_Next(enumpins, 1, &pin_in, NULL);
+ IEnumPins_Release(enumpins);
hr = IFilterGraph2_AddSourceFilter(graph, filename, NULL, &source_filter);
ok(hr == S_OK, "AddSourceFilter failed: %#x\n", hr);
- hr = IVideoWindow_QueryInterface(window, &IID_IBaseFilter, (void **)&video_filter);
- ok(hr == S_OK, "QueryInterface(IBaseFilter) failed: %#x\n", hr);
- hr = IFilterGraph2_AddFilter(graph, video_filter, NULL);
+ hr = IFilterGraph2_AddFilter(graph, renderer, NULL);
ok(hr == S_OK, "AddFilter failed: %#x\n", hr);
hr = IBaseFilter_FindPin(source_filter, outputW, &pin_out);
ok(hr == S_OK, "FindPin failed: %#x\n", hr);
- hr = IBaseFilter_FindPin(video_filter, inW, &pin_in);
- ok(hr == S_OK, "FindPin failed: %#x\n", hr);
hr = IFilterGraph2_Connect(graph, pin_out, pin_in);
if (SUCCEEDED(hr))
- rungraph(graph);
+ rungraph(graph, video);
IPin_Release(pin_in);
IPin_Release(pin_out);
IBaseFilter_Release(source_filter);
- IBaseFilter_Release(video_filter);
- IVideoWindow_Release(window);
+ IBaseFilter_Release(renderer);
IFilterGraph2_Release(graph);
return hr;
}
-static void test_render_run(const WCHAR *file)
+static void test_render_run(const WCHAR *file, BOOL audio, BOOL video)
{
IFilterGraph2 *graph;
HANDLE h;
@@ -608,19 +615,25 @@ static void test_render_run(const WCHAR *file)
refs = IFilterGraph2_Release(graph);
ok(!refs, "Graph has %u references\n", refs);
- hr = test_graph_builder_connect_file(filename);
+ hr = test_graph_builder_connect_file(filename, audio, video);
ok(hr == VFW_E_CANNOT_CONNECT, "got %#x\n", hr);
}
else
{
- ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr);
- rungraph(graph);
+ if (audio)
+ ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "Got hr %#x.\n", hr);
+ else
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
+ rungraph(graph, video);
refs = IFilterGraph2_Release(graph);
ok(!refs, "Graph has %u references\n", refs);
- hr = test_graph_builder_connect_file(filename);
- ok(hr == S_OK || hr == VFW_S_PARTIAL_RENDER, "got %#x\n", hr);
+ hr = test_graph_builder_connect_file(filename, audio, video);
+ if (audio && video)
+ todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr);
+ else
+ ok(hr == S_OK, "Got hr %#x.\n", hr);
}
/* check reference leaks */
@@ -737,7 +750,7 @@ todo_wine
ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr);
if (SUCCEEDED(hr))
- rungraph(graph);
+ rungraph(graph, TRUE);
return 0;
}
@@ -3199,8 +3212,9 @@ START_TEST(filtergraph)
CoInitializeEx(NULL, COINIT_MULTITHREADED);
test_interfaces();
- test_render_run(avifile);
- test_render_run(mpegfile);
+ test_render_run(avifile, FALSE, TRUE);
+ test_render_run(mpegfile, TRUE, TRUE);
+ test_render_run(mp3file, TRUE, FALSE);
test_enum_filters();
test_graph_builder_render();
test_graph_builder_connect();
diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc
index 9bea5be..282cb1f 100644
--- a/dlls/quartz/tests/rsrc.rc
+++ b/dlls/quartz/tests/rsrc.rc
@@ -20,8 +20,14 @@
#include "windef.h"
+/* ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi */
/* @makedep: test.avi */
test.avi RCDATA "test.avi"
+/* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */
/* @makedep: test.mpg */
test.mpg RCDATA "test.mpg"
+
+/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */
+/* @makedep: test.mp3 */
+test.mp3 RCDATA "test.mp3"
diff --git a/dlls/quartz/tests/test.mp3 b/dlls/quartz/tests/test.mp3
new file mode 100644
index 0000000..78d8dd2
Binary files /dev/null and b/dlls/quartz/tests/test.mp3 differ
More information about the wine-cvs
mailing list