Merge pull request #16 from fluendo/audiotestrsc-update-html-page

samples: audiotestsrc: Update HTML page to accept pipeline as input
fluendo · Jun 17, 2024 · 6f04f61 · 6f04f61
2 parents 3c94ce8 + 9a5cdd1
commit 6f04f61
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/gst.wasm/subprojects/samples/audiotestsrc/index.html b/gst.wasm/subprojects/samples/audiotestsrc/index.html
@@ -4,6 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   </head>
   <body>
+    <input type="text" id="pipeline" name="Pipeline" value="audiotestsrc ! audio/x-raw,format=F32LE,layout=non-interleaved,rate=44100,channels=2" style="width: 80%;">
     <input type="button" id="play" value="Play" />
 
     {{{ SCRIPT }}}

diff --git a/gst.wasm/subprojects/samples/audiotestsrc/src/audioplayer.cpp b/gst.wasm/subprojects/samples/audiotestsrc/src/audioplayer.cpp
@@ -25,18 +25,18 @@ class AudioPlayer
 public:
   GAsyncQueue *queue;
 
-  AudioPlayer (val parent) : m_parent (parent)
+  AudioPlayer (val parent, std::string pipeline_desc) : m_parent (parent)
   {
     GST_DEBUG_CATEGORY_INIT (
         GST_CAT_DEFAULT, "audioplayer", 0, "audiotestsrc player");
 
+    char *full_pipeline_desc = g_strdup_printf ("%s! appsink name=sink emit-signals=true",
+        pipeline_desc.c_str());
+
     queue = g_async_queue_new_full ((GDestroyNotify) gst_sample_unref);
-    pipe = gst_parse_launch (
-        "audiotestsrc ! "
-        "audio/"
-        "x-raw,format=F32LE,layout=non-interleaved,rate=44100,channels=2 ! "
-        "appsink name=sink emit-signals=true",
-        NULL);
+    pipe = gst_parse_launch (full_pipeline_desc, NULL);
+    g_free (full_pipeline_desc);
+
     g_assert (pipe != NULL);
     sink = gst_bin_get_by_name (GST_BIN (pipe), "sink");
     g_assert (sink != NULL);
@@ -141,6 +141,6 @@ output_sample (AudioPlayer *decoder)
 EMSCRIPTEN_BINDINGS (my_class_example2)
 {
   class_<AudioPlayer> ("AudioPlayer")
-      .constructor<val> ()
+      .constructor<val, std::string> ()
       .function ("play", &AudioPlayer::Play);
 }
diff --git a/gst.wasm/subprojects/samples/audiotestsrc/src/js/index.js b/gst.wasm/subprojects/samples/audiotestsrc/src/js/index.js
@@ -10,7 +10,8 @@ AudioData = class extends AudioData {
 AudioPlayer = class {
   constructor(options) {
     // FIXME: EMBIND forbids extending Module.AudioPlayer.
-    this._audioDecoder = new Module.AudioPlayer(this);
+    const pipeline_desc = document.getElementById("pipeline").value;
+    this._audioDecoder = new Module.AudioPlayer(this, pipeline_desc);
     this.options = options;
   }