| Message ID | 20210810092409.1776260-1-vedantparanjape160201@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Vedant, On Tue, Aug 10, 2021 at 02:54:09PM +0530, Vedant Paranjape wrote: > This patch adds a test to test if single stream using > libcamera's gstreamer element works. > > Signed-off-by: Vedant Paranjape <vedantparanjape160201@gmail.com> > --- > .../gstreamer_single_stream_test.cpp | 119 ++++++++++++++++++ > test/gstreamer/meson.build | 15 +++ > test/meson.build | 1 + > 3 files changed, 135 insertions(+) > create mode 100644 test/gstreamer/gstreamer_single_stream_test.cpp > create mode 100644 test/gstreamer/meson.build > > diff --git a/test/gstreamer/gstreamer_single_stream_test.cpp b/test/gstreamer/gstreamer_single_stream_test.cpp > new file mode 100644 > index 00000000..11f55e1c > --- /dev/null > +++ b/test/gstreamer/gstreamer_single_stream_test.cpp > @@ -0,0 +1,119 @@ > +#include <iostream> > +#include <gst/gst.h> > + > +#include "test.h" > + > +using namespace std; > + > +class GstreamerSingleStreamTest: public Test s/: / : / > +{ > +private: private goes after protected > + GstElement *pipeline_, *libcamera_src_, *convert0_, *sink0_; > + GstBus *bus_; > + GstMessage *msg_; > + GstStateChangeReturn ret_; > + > +protected: > + void GstreamerPrintError(GstMessage *msg) > + { > + GError *err; > + gchar *debug_info; > + > + gst_message_parse_error(msg, &err, &debug_info); > + g_printerr("Error received from element %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); too long line > + g_printerr("Debugging information: %s\n", debug_info ? debug_info : "none"); too long line > + g_clear_error(&err); > + g_free(debug_info); > + } > + > + int init() override > + { > + /* Initialize GStreamer */ > + GError *err_init = nullptr; > + if (!gst_init_check(nullptr, nullptr, &err_init)) { > + g_printerr ("Could not initialize GStreamer: %s\n", > + err_init ? err_init->message : "unknown error"); the broken line should line up nicely: + g_printerr("Could not initialize GStreamer: %s\n", + err_init ? err_init->message : "unknown error"); Also you have a space between g_printerr and ( > + if (err_init) > + g_error_free(err_init); > + > + return TestFail; > + } > + > + /* Create the elements */ > + libcamera_src_ = gst_element_factory_make("libcamerasrc", "libcamera"); > + convert0_ = gst_element_factory_make("videoconvert", "convert0"); > + sink0_ = gst_element_factory_make("autovideosink", "sink0"); > + > + /* Create the empty pipeline_ */ > + pipeline_ = gst_pipeline_new("test-pipeline"); > + > + if (!pipeline_ || !convert0_ || !sink0_ || !libcamera_src_) { > + g_printerr("Not all elements could be created.\n"); > + return TestFail; > + } > + > + return TestPass; > + } > + > + void cleanup() override > + { > + gst_message_unref(msg_); > + gst_object_unref(bus_); > + gst_element_set_state(pipeline_, GST_STATE_NULL); > + gst_object_unref(pipeline_); > + } > + > + int run() override > + { > + /* Build the pipeline */ > + gst_bin_add_many(GST_BIN(pipeline_), libcamera_src_, convert0_, sink0_, NULL); > + if (gst_element_link_many(libcamera_src_, convert0_, sink0_, NULL) != TRUE) { > + g_printerr("Elements could not be linked.\n"); > + gst_object_unref(pipeline_); > + return TestFail; > + } > + > + /* Start playing */ > + ret_ = gst_element_set_state(pipeline_, GST_STATE_PLAYING); > + if (ret_ == GST_STATE_CHANGE_FAILURE) { > + g_printerr("Unable to set the pipeline to the playing state.\n"); > + gst_object_unref(pipeline_); > + return TestFail; > + } > + > + /* Wait until error or EOS or timeout after 2 seconds*/ > + GstClockTime timeout = 2000000000; > + bus_ = gst_element_get_bus(pipeline_); > + msg_ = gst_bus_timed_pop_filtered(bus_, timeout, > + GstMessageType((uint)GST_MESSAGE_ERROR | (uint)GST_MESSAGE_EOS)); This line is too long even when wrapped, so it's probably fine to just indent it one more level with tab. > + > + /* Parse error message */ > + if (msg_ != NULL) { This results in too much indentation. Better to return TestPass on if msg_ == NULL and then move everything else out of this block. > + int TestResult; Just return directly, no need for this temporary variable. > + > + switch (GST_MESSAGE_TYPE(msg_)) { > + case GST_MESSAGE_ERROR: > + GstreamerPrintError(msg_); > + TestResult = TestFail; > + break; > + case GST_MESSAGE_EOS: > + g_print("End-Of-Stream reached.\n"); > + TestResult = TestFail; > + break; > + default: > + /* We should not reach here because we only asked for ERRORs and EOS */ I think the g_printerr message conveys this; no need for this comment. Almost there. Paul > + g_printerr("Unexpected message received.\n"); > + TestResult = TestFail; > + break; > + } > + > + if (TestResult == TestFail) { > + return TestFail; > + } > + } > + > + return TestPass; > + } > +}; > + > +TEST_REGISTER(GstreamerSingleStreamTest) > diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build > new file mode 100644 > index 00000000..36643d4a > --- /dev/null > +++ b/test/gstreamer/meson.build > @@ -0,0 +1,15 @@ > +# SPDX-License-Identifier: CC0-1.0 > + > +gstreamer_tests = [ > + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], > +] > +gstreamer_dep = dependency('gstreamer-1.0', required: true) > + > +foreach t : gstreamer_tests > + exe = executable(t[0], t[1], > + dependencies : [libcamera_private, gstreamer_dep], > + link_with : test_libraries, > + include_directories : test_includes_internal) > + > + test(t[0], exe, suite : 'gstreamer', is_parallel : false) > +endforeach > diff --git a/test/meson.build b/test/meson.build > index 3bceb5df..d0466f17 100644 > --- a/test/meson.build > +++ b/test/meson.build > @@ -11,6 +11,7 @@ subdir('libtest') > > subdir('camera') > subdir('controls') > +subdir('gstreamer') > subdir('ipa') > subdir('ipc') > subdir('log') > -- > 2.25.1 >
Hi Vedant, Thank you for this, I'm very glad to see gstreamer tests being introduced! On 10/08/2021 10:38, paul.elder@ideasonboard.com wrote: <snip> >> --- /dev/null >> +++ b/test/gstreamer/meson.build >> @@ -0,0 +1,15 @@ >> +# SPDX-License-Identifier: CC0-1.0 >> + >> +gstreamer_tests = [ >> + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], >> +] >> +gstreamer_dep = dependency('gstreamer-1.0', required: true) instead of required: true, we should depend upon whether we are built with gstreamer_support. I think this would do it, but please check/test. gstreamer_dep = dependency('gstreamer-1.0', required: get_option('gstreamer')) And then we would want to skip all tests from being built if there is no gstreamer: if not gstreamer_dep.found()gstallocator_dep.found() subdir_done() endif I would put the dependency checking, and this subdir_done() addition at the beginning, before even listing the tests. -- Kieran >> + >> +foreach t : gstreamer_tests >> + exe = executable(t[0], t[1], >> + dependencies : [libcamera_private, gstreamer_dep], >> + link_with : test_libraries, >> + include_directories : test_includes_internal) >> + >> + test(t[0], exe, suite : 'gstreamer', is_parallel : false) >> +endforeach >> diff --git a/test/meson.build b/test/meson.build >> index 3bceb5df..d0466f17 100644 >> --- a/test/meson.build >> +++ b/test/meson.build >> @@ -11,6 +11,7 @@ subdir('libtest') >> >> subdir('camera') >> subdir('controls') >> +subdir('gstreamer') >> subdir('ipa') >> subdir('ipc') >> subdir('log') >> -- >> 2.25.1 >>
On Tue, Aug 10, 2021 at 11:05:45AM +0100, Kieran Bingham wrote: > Hi Vedant, > > Thank you for this, I'm very glad to see gstreamer tests being introduced! > > > On 10/08/2021 10:38, paul.elder@ideasonboard.com wrote: > > <snip> > > >> --- /dev/null > >> +++ b/test/gstreamer/meson.build > >> @@ -0,0 +1,15 @@ > >> +# SPDX-License-Identifier: CC0-1.0 > >> + > >> +gstreamer_tests = [ > >> + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], > >> +] > >> +gstreamer_dep = dependency('gstreamer-1.0', required: true) > > instead of required: true, we should depend upon whether we are built > with gstreamer_support. > > I think this would do it, but please check/test. > > gstreamer_dep = > dependency('gstreamer-1.0', required: get_option('gstreamer')) > > And then we would want to skip all tests from being built if there is no > gstreamer: > > > if not gstreamer_dep.found()gstallocator_dep.found() > subdir_done() > endif There a multiple dependencies for the gstreamer plugin. You can simply use if not gst_enabled subdir_done() endif > > I would put the dependency checking, and this subdir_done() addition at > the beginning, before even listing the tests. > > >> + > >> +foreach t : gstreamer_tests > >> + exe = executable(t[0], t[1], > >> + dependencies : [libcamera_private, gstreamer_dep], > >> + link_with : test_libraries, > >> + include_directories : test_includes_internal) > >> + > >> + test(t[0], exe, suite : 'gstreamer', is_parallel : false) > >> +endforeach > >> diff --git a/test/meson.build b/test/meson.build > >> index 3bceb5df..d0466f17 100644 > >> --- a/test/meson.build > >> +++ b/test/meson.build > >> @@ -11,6 +11,7 @@ subdir('libtest') > >> > >> subdir('camera') > >> subdir('controls') > >> +subdir('gstreamer') > >> subdir('ipa') > >> subdir('ipc') > >> subdir('log')
Hi Kieran, Thanks for the review. On Tue, Aug 10, 2021 at 3:35 PM Kieran Bingham < kieran.bingham@ideasonboard.com> wrote: > Hi Vedant, > > Thank you for this, I'm very glad to see gstreamer tests being introduced! > > > On 10/08/2021 10:38, paul.elder@ideasonboard.com wrote: > > <snip> > > >> --- /dev/null > >> +++ b/test/gstreamer/meson.build > >> @@ -0,0 +1,15 @@ > >> +# SPDX-License-Identifier: CC0-1.0 > >> + > >> +gstreamer_tests = [ > >> + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], > >> +] > >> +gstreamer_dep = dependency('gstreamer-1.0', required: true) > > instead of required: true, we should depend upon whether we are built > with gstreamer_support. > > I think this would do it, but please check/test. > > gstreamer_dep = > dependency('gstreamer-1.0', required: get_option('gstreamer')) > > And then we would want to skip all tests from being built if there is no > gstreamer: > > > if not gstreamer_dep.found()gstallocator_dep.found() > subdir_done() > endif > This is needs to be added by my patch ? or it will added sometime in future ? I would put the dependency checking, and this subdir_done() addition at > the beginning, before even listing the tests. > > -- > Kieran > > > >> + > >> +foreach t : gstreamer_tests > >> + exe = executable(t[0], t[1], > >> + dependencies : [libcamera_private, gstreamer_dep], > >> + link_with : test_libraries, > >> + include_directories : test_includes_internal) > >> + > >> + test(t[0], exe, suite : 'gstreamer', is_parallel : false) > >> +endforeach > >> diff --git a/test/meson.build b/test/meson.build > >> index 3bceb5df..d0466f17 100644 > >> --- a/test/meson.build > >> +++ b/test/meson.build > >> @@ -11,6 +11,7 @@ subdir('libtest') > >> > >> subdir('camera') > >> subdir('controls') > >> +subdir('gstreamer') > >> subdir('ipa') > >> subdir('ipc') > >> subdir('log') > >> -- > >> 2.25.1 > >> >
Hi Vedant, On 10/08/2021 11:56, Vedant Paranjape wrote: > Hi Kieran, > Thanks for the review. > > On Tue, Aug 10, 2021 at 3:35 PM Kieran Bingham > <kieran.bingham@ideasonboard.com > <mailto:kieran.bingham@ideasonboard.com>> wrote: > > Hi Vedant, > > Thank you for this, I'm very glad to see gstreamer tests being > introduced! > > > On 10/08/2021 10:38, paul.elder@ideasonboard.com > <mailto:paul.elder@ideasonboard.com> wrote: > > <snip> > > >> --- /dev/null > >> +++ b/test/gstreamer/meson.build > >> @@ -0,0 +1,15 @@ > >> +# SPDX-License-Identifier: CC0-1.0 > >> + > >> +gstreamer_tests = [ > >> + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], > >> +] > >> +gstreamer_dep = dependency('gstreamer-1.0', required: true) > > instead of required: true, we should depend upon whether we are built > with gstreamer_support. > > I think this would do it, but please check/test. > > gstreamer_dep = > dependency('gstreamer-1.0', required: get_option('gstreamer')) > > And then we would want to skip all tests from being built if there is no > gstreamer: > > > if not gstreamer_dep.found()gstallocator_dep.found() > subdir_done() > endif > > > This is needs to be added by my patch ? or it will added sometime in > future ? Your patch should add it. But Laurent's suggestion is subtly different and better. So you should start the meson.build by checking: if not gst_enabled subdir_done() endif Then your gstreamer_dep = dependency('gstreamer-1.0', required: true) line can stay as it is, because if gst_enabled is true, you /do/ require the gstreamer_dep anyway . So it's just Lauren'ts three lines to add to the beginning of the meson.build. -- Kieran > > I would put the dependency checking, and this subdir_done() addition at > the beginning, before even listing the tests. > > -- > Kieran > > > >> + > >> +foreach t : gstreamer_tests > >> + exe = executable(t[0], t[1], > >> + dependencies : [libcamera_private, > gstreamer_dep], > >> + link_with : test_libraries, > >> + include_directories : test_includes_internal) > >> + > >> + test(t[0], exe, suite : 'gstreamer', is_parallel : false) > >> +endforeach > >> diff --git a/test/meson.build b/test/meson.build > >> index 3bceb5df..d0466f17 100644 > >> --- a/test/meson.build > >> +++ b/test/meson.build > >> @@ -11,6 +11,7 @@ subdir('libtest') > >> > >> subdir('camera') > >> subdir('controls') > >> +subdir('gstreamer') > >> subdir('ipa') > >> subdir('ipc') > >> subdir('log') > >> -- > >> 2.25.1 > >> >
Okay, sounds good. On Tue, Aug 10, 2021 at 4:38 PM Kieran Bingham < kieran.bingham@ideasonboard.com> wrote: > Hi Vedant, > > On 10/08/2021 11:56, Vedant Paranjape wrote: > > Hi Kieran, > > Thanks for the review. > > > > On Tue, Aug 10, 2021 at 3:35 PM Kieran Bingham > > <kieran.bingham@ideasonboard.com > > <mailto:kieran.bingham@ideasonboard.com>> wrote: > > > > Hi Vedant, > > > > Thank you for this, I'm very glad to see gstreamer tests being > > introduced! > > > > > > On 10/08/2021 10:38, paul.elder@ideasonboard.com > > <mailto:paul.elder@ideasonboard.com> wrote: > > > > <snip> > > > > >> --- /dev/null > > >> +++ b/test/gstreamer/meson.build > > >> @@ -0,0 +1,15 @@ > > >> +# SPDX-License-Identifier: CC0-1.0 > > >> + > > >> +gstreamer_tests = [ > > >> + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], > > >> +] > > >> +gstreamer_dep = dependency('gstreamer-1.0', required: true) > > > > instead of required: true, we should depend upon whether we are built > > with gstreamer_support. > > > > I think this would do it, but please check/test. > > > > gstreamer_dep = > > dependency('gstreamer-1.0', required: get_option('gstreamer')) > > > > And then we would want to skip all tests from being built if there > is no > > gstreamer: > > > > > > if not gstreamer_dep.found()gstallocator_dep.found() > > subdir_done() > > endif > > > > > > This is needs to be added by my patch ? or it will added sometime in > > future ? > > Your patch should add it. > > But Laurent's suggestion is subtly different and better. > > So you should start the meson.build by checking: > > if not gst_enabled > subdir_done() > endif > > > Then your > > gstreamer_dep = dependency('gstreamer-1.0', required: true) > > line can stay as it is, because if gst_enabled is true, you /do/ require > the gstreamer_dep anyway . > > So it's just Lauren'ts three lines to add to the beginning of the > meson.build. > > > -- > Kieran > > > > > I would put the dependency checking, and this subdir_done() addition > at > > the beginning, before even listing the tests. > > > > -- > > Kieran > > > > > > >> + > > >> +foreach t : gstreamer_tests > > >> + exe = executable(t[0], t[1], > > >> + dependencies : [libcamera_private, > > gstreamer_dep], > > >> + link_with : test_libraries, > > >> + include_directories : > test_includes_internal) > > >> + > > >> + test(t[0], exe, suite : 'gstreamer', is_parallel : false) > > >> +endforeach > > >> diff --git a/test/meson.build b/test/meson.build > > >> index 3bceb5df..d0466f17 100644 > > >> --- a/test/meson.build > > >> +++ b/test/meson.build > > >> @@ -11,6 +11,7 @@ subdir('libtest') > > >> > > >> subdir('camera') > > >> subdir('controls') > > >> +subdir('gstreamer') > > >> subdir('ipa') > > >> subdir('ipc') > > >> subdir('log') > > >> -- > > >> 2.25.1 > > >> > > >
diff --git a/test/gstreamer/gstreamer_single_stream_test.cpp b/test/gstreamer/gstreamer_single_stream_test.cpp new file mode 100644 index 00000000..11f55e1c --- /dev/null +++ b/test/gstreamer/gstreamer_single_stream_test.cpp @@ -0,0 +1,119 @@ +#include <iostream> +#include <gst/gst.h> + +#include "test.h" + +using namespace std; + +class GstreamerSingleStreamTest: public Test +{ +private: + GstElement *pipeline_, *libcamera_src_, *convert0_, *sink0_; + GstBus *bus_; + GstMessage *msg_; + GstStateChangeReturn ret_; + +protected: + void GstreamerPrintError(GstMessage *msg) + { + GError *err; + gchar *debug_info; + + gst_message_parse_error(msg, &err, &debug_info); + g_printerr("Error received from element %s: %s\n", GST_OBJECT_NAME(msg->src), err->message); + g_printerr("Debugging information: %s\n", debug_info ? debug_info : "none"); + g_clear_error(&err); + g_free(debug_info); + } + + int init() override + { + /* Initialize GStreamer */ + GError *err_init = nullptr; + if (!gst_init_check(nullptr, nullptr, &err_init)) { + g_printerr ("Could not initialize GStreamer: %s\n", + err_init ? err_init->message : "unknown error"); + if (err_init) + g_error_free(err_init); + + return TestFail; + } + + /* Create the elements */ + libcamera_src_ = gst_element_factory_make("libcamerasrc", "libcamera"); + convert0_ = gst_element_factory_make("videoconvert", "convert0"); + sink0_ = gst_element_factory_make("autovideosink", "sink0"); + + /* Create the empty pipeline_ */ + pipeline_ = gst_pipeline_new("test-pipeline"); + + if (!pipeline_ || !convert0_ || !sink0_ || !libcamera_src_) { + g_printerr("Not all elements could be created.\n"); + return TestFail; + } + + return TestPass; + } + + void cleanup() override + { + gst_message_unref(msg_); + gst_object_unref(bus_); + gst_element_set_state(pipeline_, GST_STATE_NULL); + gst_object_unref(pipeline_); + } + + int run() override + { + /* Build the pipeline */ + gst_bin_add_many(GST_BIN(pipeline_), libcamera_src_, convert0_, sink0_, NULL); + if (gst_element_link_many(libcamera_src_, convert0_, sink0_, NULL) != TRUE) { + g_printerr("Elements could not be linked.\n"); + gst_object_unref(pipeline_); + return TestFail; + } + + /* Start playing */ + ret_ = gst_element_set_state(pipeline_, GST_STATE_PLAYING); + if (ret_ == GST_STATE_CHANGE_FAILURE) { + g_printerr("Unable to set the pipeline to the playing state.\n"); + gst_object_unref(pipeline_); + return TestFail; + } + + /* Wait until error or EOS or timeout after 2 seconds*/ + GstClockTime timeout = 2000000000; + bus_ = gst_element_get_bus(pipeline_); + msg_ = gst_bus_timed_pop_filtered(bus_, timeout, + GstMessageType((uint)GST_MESSAGE_ERROR | (uint)GST_MESSAGE_EOS)); + + /* Parse error message */ + if (msg_ != NULL) { + int TestResult; + + switch (GST_MESSAGE_TYPE(msg_)) { + case GST_MESSAGE_ERROR: + GstreamerPrintError(msg_); + TestResult = TestFail; + break; + case GST_MESSAGE_EOS: + g_print("End-Of-Stream reached.\n"); + TestResult = TestFail; + break; + default: + /* We should not reach here because we only asked for ERRORs and EOS */ + g_printerr("Unexpected message received.\n"); + TestResult = TestFail; + break; + } + + if (TestResult == TestFail) { + return TestFail; + } + } + + return TestPass; + } +}; + +TEST_REGISTER(GstreamerSingleStreamTest) diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build new file mode 100644 index 00000000..36643d4a --- /dev/null +++ b/test/gstreamer/meson.build @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: CC0-1.0 + +gstreamer_tests = [ + ['single_stream_test', 'gstreamer_single_stream_test.cpp'], +] +gstreamer_dep = dependency('gstreamer-1.0', required: true) + +foreach t : gstreamer_tests + exe = executable(t[0], t[1], + dependencies : [libcamera_private, gstreamer_dep], + link_with : test_libraries, + include_directories : test_includes_internal) + + test(t[0], exe, suite : 'gstreamer', is_parallel : false) +endforeach diff --git a/test/meson.build b/test/meson.build index 3bceb5df..d0466f17 100644 --- a/test/meson.build +++ b/test/meson.build @@ -11,6 +11,7 @@ subdir('libtest') subdir('camera') subdir('controls') +subdir('gstreamer') subdir('ipa') subdir('ipc') subdir('log')
This patch adds a test to test if single stream using libcamera's gstreamer element works. Signed-off-by: Vedant Paranjape <vedantparanjape160201@gmail.com> --- .../gstreamer_single_stream_test.cpp | 119 ++++++++++++++++++ test/gstreamer/meson.build | 15 +++ test/meson.build | 1 + 3 files changed, 135 insertions(+) create mode 100644 test/gstreamer/gstreamer_single_stream_test.cpp create mode 100644 test/gstreamer/meson.build