diff options
author | Hiago De Franco <hiago.franco@toradex.com> | 2024-07-26 17:55:45 -0300 |
---|---|---|
committer | Hiago De Franco <hiago.franco@toradex.com> | 2024-08-27 14:12:19 -0300 |
commit | 7a03a4b51eb54f52897f00a77fdfb96c565ea7a0 (patch) | |
tree | fb35a33265085d06cb45ed6459f2f7babbf18daa /recipes-multimedia/gstreamer/gstreamer1.0 | |
parent | 69f27f95d9eba993e734b89d40aad5221810926b (diff) | |
download | meta-freescale-7a03a4b51eb54f52897f00a77fdfb96c565ea7a0.tar.gz |
gstreamer: Update 6.6.3-1.0.0 to 6.6.23-2.0.0
Upgrade gstreamer and all related recipes to 1.24.0, syncing with
meta-imx layer.
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
(cherry picked from commit d1c6878cf25575f98ab12c5e685a0728afa4424a)
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0')
4 files changed, 47 insertions, 151 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index 568e38cbf..456f07626 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001 | 1 | From 330e15374bb30ac29ee72c4b3de79c17b1157112 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | 3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 |
4 | Subject: [PATCH] tests: add support for install the tests | 4 | Subject: [PATCH] tests: add support for install the tests |
@@ -14,16 +14,16 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
14 | --- | 14 | --- |
15 | meson.build | 4 ++++ | 15 | meson.build | 4 ++++ |
16 | meson_options.txt | 1 + | 16 | meson_options.txt | 1 + |
17 | tests/check/meson.build | 22 +++++++++++++++++++++- | 17 | tests/check/meson.build | 21 ++++++++++++++++++++- |
18 | tests/check/template.test.in | 3 +++ | 18 | tests/check/template.test.in | 3 +++ |
19 | 4 files changed, 29 insertions(+), 1 deletion(-) | 19 | 4 files changed, 28 insertions(+), 1 deletion(-) |
20 | create mode 100644 tests/check/template.test.in | 20 | create mode 100644 tests/check/template.test.in |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index f9f591d..3906fb3 100644 | 23 | index 540d6d290e10..0267f22a79ea 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() | 26 | @@ -624,6 +624,10 @@ if bashcomp_dep.found() |
27 | endif | 27 | endif |
28 | endif | 28 | endif |
29 | 29 | ||
@@ -35,10 +35,10 @@ index f9f591d..3906fb3 100644 | |||
35 | 35 | ||
36 | pkgconfig = import('pkgconfig') | 36 | pkgconfig = import('pkgconfig') |
37 | diff --git a/meson_options.txt b/meson_options.txt | 37 | diff --git a/meson_options.txt b/meson_options.txt |
38 | index 7363bdb..a34ba37 100644 | 38 | index 340fb5801d02..5b87f68e8d7f 100644 |
39 | --- a/meson_options.txt | 39 | --- a/meson_options.txt |
40 | +++ b/meson_options.txt | 40 | +++ b/meson_options.txt |
41 | @@ -15,6 +15,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso | 41 | @@ -16,6 +16,7 @@ option('poisoning', type : 'boolean', value : false, description : 'Enable poiso |
42 | option('memory-alignment', type: 'combo', | 42 | option('memory-alignment', type: 'combo', |
43 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], | 43 | choices : ['1', '2', '4', '8', '16', '32', '64', '128', '256', '512', '1024', '2048', '4096', '8192', 'malloc', 'pagesize'], |
44 | value: 'malloc') | 44 | value: 'malloc') |
@@ -47,14 +47,14 @@ index 7363bdb..a34ba37 100644 | |||
47 | # Feature options | 47 | # Feature options |
48 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') | 48 | option('check', type : 'feature', value : 'auto', description : 'Build unit test libraries') |
49 | diff --git a/tests/check/meson.build b/tests/check/meson.build | 49 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
50 | index 16caac7..f2d400f 100644 | 50 | index e9501feb2af5..fd5a99611e3d 100644 |
51 | --- a/tests/check/meson.build | 51 | --- a/tests/check/meson.build |
52 | +++ b/tests/check/meson.build | 52 | +++ b/tests/check/meson.build |
53 | @@ -124,10 +124,16 @@ test_defines = [ | 53 | @@ -125,10 +125,16 @@ test_defines = [ |
54 | '-UG_DISABLE_ASSERT', | 54 | '-UG_DISABLE_ASSERT', |
55 | '-UG_DISABLE_CAST_CHECKS', | 55 | '-UG_DISABLE_CAST_CHECKS', |
56 | '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', | 56 | '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"', |
57 | - '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"', | 57 | - '-DTESTFILE="' + fsmod.as_posix(meson.current_source_dir()) + '/meson.build"', |
58 | '-DGST_DISABLE_DEPRECATED', | 58 | '-DGST_DISABLE_DEPRECATED', |
59 | ] | 59 | ] |
60 | 60 | ||
@@ -68,7 +68,7 @@ index 16caac7..f2d400f 100644 | |||
68 | # sanity checking | 68 | # sanity checking |
69 | if get_option('check').disabled() | 69 | if get_option('check').disabled() |
70 | if get_option('tests').enabled() | 70 | if get_option('tests').enabled() |
71 | @@ -150,6 +156,8 @@ foreach t : core_tests | 71 | @@ -151,6 +157,8 @@ foreach t : core_tests |
72 | include_directories : [configinc], | 72 | include_directories : [configinc], |
73 | link_with : link_with_libs, | 73 | link_with : link_with_libs, |
74 | dependencies : gst_deps + test_deps, | 74 | dependencies : gst_deps + test_deps, |
@@ -77,10 +77,10 @@ index 16caac7..f2d400f 100644 | |||
77 | ) | 77 | ) |
78 | 78 | ||
79 | env = environment() | 79 | env = environment() |
80 | @@ -161,6 +169,18 @@ foreach t : core_tests | 80 | @@ -161,6 +169,17 @@ foreach t : core_tests |
81 | env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) | ||
81 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') | 82 | env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') |
82 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') | 83 | env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') |
83 | |||
84 | + if installed_tests_enabled | 84 | + if installed_tests_enabled |
85 | + test_conf = configuration_data() | 85 | + test_conf = configuration_data() |
86 | + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) | 86 | + test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) |
@@ -92,16 +92,18 @@ index 16caac7..f2d400f 100644 | |||
92 | + configuration: test_conf | 92 | + configuration: test_conf |
93 | + ) | 93 | + ) |
94 | + endif | 94 | + endif |
95 | + | 95 | |
96 | test(test_name, exe, env: env, timeout : 3 * 60) | 96 | test(test_name, exe, env: env, timeout : 3 * 60) |
97 | endif | 97 | endif |
98 | endforeach | ||
99 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in | 98 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in |
100 | new file mode 100644 | 99 | new file mode 100644 |
101 | index 0000000..f701627 | 100 | index 000000000000..f701627f87a6 |
102 | --- /dev/null | 101 | --- /dev/null |
103 | +++ b/tests/check/template.test.in | 102 | +++ b/tests/check/template.test.in |
104 | @@ -0,0 +1,3 @@ | 103 | @@ -0,0 +1,3 @@ |
105 | +[Test] | 104 | +[Test] |
106 | +Type=session | 105 | +Type=session |
107 | +Exec=@installed_tests_dir@/@program@ | 106 | +Exec=@installed_tests_dir@/@program@ |
107 | -- | ||
108 | 2.39.2 | ||
109 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch index 10a6dcc61..83f3870c4 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001 | 1 | From 1f13b802bdb1c1e414c70f770dc164c80e0dcd57 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 | 3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 |
4 | Subject: [PATCH 3/4] tests: use a dictionaries for environment | 4 | Subject: [PATCH 3/4] tests: use a dictionaries for environment |
@@ -10,14 +10,14 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/- | |||
10 | 10 | ||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
12 | --- | 12 | --- |
13 | subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++------- | 13 | tests/check/meson.build | 22 ++++++++++++++-------- |
14 | 1 file changed, 13 insertions(+), 8 deletions(-) | 14 | 1 file changed, 14 insertions(+), 8 deletions(-) |
15 | 15 | ||
16 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 16 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
17 | index 00a138a568..48ec2532f8 100644 | 17 | index fd5a99611e3d..330abaaeadd5 100644 |
18 | --- a/subprojects/gstreamer/tests/check/meson.build | 18 | --- a/tests/check/meson.build |
19 | +++ b/subprojects/gstreamer/tests/check/meson.build | 19 | +++ b/tests/check/meson.build |
20 | @@ -161,14 +161,19 @@ foreach t : core_tests | 20 | @@ -161,14 +161,20 @@ foreach t : core_tests |
21 | install: installed_tests_enabled, | 21 | install: installed_tests_enabled, |
22 | ) | 22 | ) |
23 | 23 | ||
@@ -42,9 +42,10 @@ index 00a138a568..48ec2532f8 100644 | |||
42 | + 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', | 42 | + 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', |
43 | + 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', | 43 | + 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', |
44 | + } | 44 | + } |
45 | 45 | + | |
46 | if installed_tests_enabled | 46 | if installed_tests_enabled |
47 | test_conf = configuration_data() | 47 | test_conf = configuration_data() |
48 | test_conf.set('installed_tests_dir', join_paths(prefix, installed_tests_execdir)) | ||
48 | -- | 49 | -- |
49 | 2.33.1 | 50 | 2.39.2 |
50 | 51 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch index efa004f8c..0a312389e 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001 | 1 | From 616c489d4ff1e7ed878bc3760180ba994fbd1974 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 2 May 2021 01:58:01 +0100 | 3 | Date: Sun, 2 May 2021 01:58:01 +0100 |
4 | Subject: [PATCH 4/4] tests: add helper script to run the installed_tests | 4 | Subject: [PATCH 4/4] tests: add helper script to run the installed_tests |
@@ -11,16 +11,16 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/- | |||
11 | 11 | ||
12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
13 | --- | 13 | --- |
14 | subprojects/gstreamer/tests/check/meson.build | 17 +++++++++++++++++ | 14 | tests/check/meson.build | 17 +++++++++++++++++ |
15 | .../gstreamer/tests/check/template.sh.in | 9 +++++++++ | 15 | tests/check/template.sh.in | 9 +++++++++ |
16 | .../gstreamer/tests/check/template.test.in | 2 +- | 16 | tests/check/template.test.in | 2 +- |
17 | 3 files changed, 27 insertions(+), 1 deletion(-) | 17 | 3 files changed, 27 insertions(+), 1 deletion(-) |
18 | create mode 100755 subprojects/gstreamer/tests/check/template.sh.in | 18 | create mode 100644 tests/check/template.sh.in |
19 | 19 | ||
20 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 20 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
21 | index 48ec2532f8..7dc4990d4e 100644 | 21 | index 330abaaeadd5..5d383b14dc29 100644 |
22 | --- a/subprojects/gstreamer/tests/check/meson.build | 22 | --- a/tests/check/meson.build |
23 | +++ b/subprojects/gstreamer/tests/check/meson.build | 23 | +++ b/tests/check/meson.build |
24 | @@ -185,6 +185,23 @@ foreach t : core_tests | 24 | @@ -185,6 +185,23 @@ foreach t : core_tests |
25 | install_dir: installed_tests_metadir, | 25 | install_dir: installed_tests_metadir, |
26 | configuration: test_conf | 26 | configuration: test_conf |
@@ -45,11 +45,11 @@ index 48ec2532f8..7dc4990d4e 100644 | |||
45 | endif | 45 | endif |
46 | 46 | ||
47 | test(test_name, exe, env: env, timeout : 3 * 60) | 47 | test(test_name, exe, env: env, timeout : 3 * 60) |
48 | diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in | 48 | diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in |
49 | new file mode 100755 | 49 | new file mode 100644 |
50 | index 0000000000..cf7d31b0ea | 50 | index 000000000000..cf7d31b0ea5f |
51 | --- /dev/null | 51 | --- /dev/null |
52 | +++ b/subprojects/gstreamer/tests/check/template.sh.in | 52 | +++ b/tests/check/template.sh.in |
53 | @@ -0,0 +1,9 @@ | 53 | @@ -0,0 +1,9 @@ |
54 | +#!/bin/sh | 54 | +#!/bin/sh |
55 | + | 55 | + |
@@ -60,15 +60,15 @@ index 0000000000..cf7d31b0ea | |||
60 | +GST_REGISTRY=@GST_REGISTRY@ | 60 | +GST_REGISTRY=@GST_REGISTRY@ |
61 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" | 61 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" |
62 | +exec @TEST@ | 62 | +exec @TEST@ |
63 | diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in | 63 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in |
64 | index f701627f87..b74ef6ad73 100644 | 64 | index f701627f87a6..b74ef6ad732a 100644 |
65 | --- a/subprojects/gstreamer/tests/check/template.test.in | 65 | --- a/tests/check/template.test.in |
66 | +++ b/subprojects/gstreamer/tests/check/template.test.in | 66 | +++ b/tests/check/template.test.in |
67 | @@ -1,3 +1,3 @@ | 67 | @@ -1,3 +1,3 @@ |
68 | [Test] | 68 | [Test] |
69 | Type=session | 69 | Type=session |
70 | -Exec=@installed_tests_dir@/@program@ | 70 | -Exec=@installed_tests_dir@/@program@ |
71 | +Exec=@installed_tests_dir@/@program@.sh | 71 | +Exec=@installed_tests_dir@/@program@.sh |
72 | -- | 72 | -- |
73 | 2.33.1 | 73 | 2.39.2 |
74 | 74 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch deleted file mode 100644 index f51df6d20..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0005-tests-remove-gstbin-test_watch_for_state_change-test.patch +++ /dev/null | |||
@@ -1,107 +0,0 @@ | |||
1 | From b935abba3d8fa3ea1ce384c08e650afd8c20b78a Mon Sep 17 00:00:00 2001 | ||
2 | From: Claudius Heine <ch@denx.de> | ||
3 | Date: Wed, 2 Feb 2022 13:47:02 +0100 | ||
4 | Subject: [PATCH] tests: remove gstbin:test_watch_for_state_change testcase | ||
5 | |||
6 | This testcase seems to be flaky, and upstream marked it as such: | ||
7 | https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 | ||
8 | |||
9 | This patch removes the testcase to avoid it interfering with out ptest. | ||
10 | |||
11 | Signed-off-by: Claudius Heine <ch@denx.de> | ||
12 | |||
13 | Upstream-Status: Inappropriate [needs proper upstream fix] | ||
14 | --- | ||
15 | tests/check/gst/gstbin.c | 69 ------------------- | ||
16 | 1 file changed, 69 deletions(-) | ||
17 | |||
18 | diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c | ||
19 | index e366d5fe20..ac29d81474 100644 | ||
20 | --- a/tests/check/gst/gstbin.c | ||
21 | +++ b/tests/check/gst/gstbin.c | ||
22 | @@ -691,74 +691,6 @@ GST_START_TEST (test_message_state_changed_children) | ||
23 | |||
24 | GST_END_TEST; | ||
25 | |||
26 | -GST_START_TEST (test_watch_for_state_change) | ||
27 | -{ | ||
28 | - GstElement *src, *sink, *bin; | ||
29 | - GstBus *bus; | ||
30 | - GstStateChangeReturn ret; | ||
31 | - | ||
32 | - bin = gst_element_factory_make ("bin", NULL); | ||
33 | - fail_unless (bin != NULL, "Could not create bin"); | ||
34 | - | ||
35 | - bus = g_object_new (gst_bus_get_type (), NULL); | ||
36 | - gst_object_ref_sink (bus); | ||
37 | - gst_element_set_bus (GST_ELEMENT_CAST (bin), bus); | ||
38 | - | ||
39 | - src = gst_element_factory_make ("fakesrc", NULL); | ||
40 | - fail_if (src == NULL, "Could not create fakesrc"); | ||
41 | - sink = gst_element_factory_make ("fakesink", NULL); | ||
42 | - fail_if (sink == NULL, "Could not create fakesink"); | ||
43 | - | ||
44 | - gst_bin_add (GST_BIN (bin), sink); | ||
45 | - gst_bin_add (GST_BIN (bin), src); | ||
46 | - | ||
47 | - fail_unless (gst_element_link (src, sink), "could not link src and sink"); | ||
48 | - | ||
49 | - /* change state, spawning two times three messages */ | ||
50 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); | ||
51 | - fail_unless (ret == GST_STATE_CHANGE_ASYNC); | ||
52 | - ret = | ||
53 | - gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, | ||
54 | - GST_CLOCK_TIME_NONE); | ||
55 | - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); | ||
56 | - | ||
57 | - pop_state_changed (bus, 6); | ||
58 | - pop_async_done (bus); | ||
59 | - pop_latency (bus); | ||
60 | - | ||
61 | - fail_unless (gst_bus_have_pending (bus) == FALSE, | ||
62 | - "Unexpected messages on bus"); | ||
63 | - | ||
64 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); | ||
65 | - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); | ||
66 | - | ||
67 | - pop_state_changed (bus, 3); | ||
68 | - | ||
69 | - /* this one might return either SUCCESS or ASYNC, likely SUCCESS */ | ||
70 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED); | ||
71 | - gst_element_get_state (GST_ELEMENT (bin), NULL, NULL, GST_CLOCK_TIME_NONE); | ||
72 | - | ||
73 | - pop_state_changed (bus, 3); | ||
74 | - if (ret == GST_STATE_CHANGE_ASYNC) { | ||
75 | - pop_async_done (bus); | ||
76 | - pop_latency (bus); | ||
77 | - } | ||
78 | - | ||
79 | - fail_unless (gst_bus_have_pending (bus) == FALSE, | ||
80 | - "Unexpected messages on bus"); | ||
81 | - | ||
82 | - gst_bus_set_flushing (bus, TRUE); | ||
83 | - | ||
84 | - ret = gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); | ||
85 | - fail_unless (ret == GST_STATE_CHANGE_SUCCESS); | ||
86 | - | ||
87 | - /* clean up */ | ||
88 | - gst_object_unref (bus); | ||
89 | - gst_object_unref (bin); | ||
90 | -} | ||
91 | - | ||
92 | -GST_END_TEST; | ||
93 | - | ||
94 | GST_START_TEST (test_state_change_error_message) | ||
95 | { | ||
96 | GstElement *src, *sink, *bin; | ||
97 | @@ -1956,7 +1888,6 @@ gst_bin_suite (void) | ||
98 | tcase_add_test (tc_chain, test_message_state_changed); | ||
99 | tcase_add_test (tc_chain, test_message_state_changed_child); | ||
100 | tcase_add_test (tc_chain, test_message_state_changed_children); | ||
101 | - tcase_add_test (tc_chain, test_watch_for_state_change); | ||
102 | tcase_add_test (tc_chain, test_state_change_error_message); | ||
103 | tcase_add_test (tc_chain, test_add_linked); | ||
104 | tcase_add_test (tc_chain, test_add_self); | ||
105 | -- | ||
106 | 2.33.1 | ||
107 | |||