test: finalize tests

Author: DenizUgur

.github/actions/deps/action.yml

@@ -91,6 +91,16 @@ runs:
       if: inputs.for-test == 'true' && steps.cache-gst.outputs.cache-hit != 'true'
       uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8
 
+    - name: Install cargo-c
+      if: inputs.for-test == 'true' && steps.cache-gst.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        if [[ ${{ runner.os }} == 'macOS' ]]; then
+          brew install cargo-c
+        else
+          cargo install cargo-c
+        fi
+
     - name: Clone gst-plugins-rs
       if: inputs.for-test == 'true' && steps.cache-gst.outputs.cache-hit != 'true'
       shell: bash
@@ -109,7 +119,6 @@ runs:
       shell: bash
       working-directory: ${{ runner.temp }}/gst-plugins-rs
       run: |
-        cargo install cargo-c
         cargo cbuild -p gst-plugin-fmp4
         cargo cinstall -p gst-plugin-fmp4 --destdir bin
 

tests/src/common.hpp

@@ -7,28 +7,8 @@
 class GstAppSink
 {
 private:
-  std::mutex buffer_queue_mutex;
-  std::condition_variable buffer_queue_cv;
-  GQueue* buffer_queue;
   GstElement* appsink;
 
-protected:
-  static GstFlowReturn NewSample(GstElement* sink, GstAppSink* self)
-  {
-    GstSample* sample;
-    g_signal_emit_by_name(sink, "pull-sample", &sample);
-    if (sample == NULL)
-      return GST_FLOW_ERROR;
-
-    // Push the sample into the buffer queue
-    GstBufferList* buffer = gst_sample_get_buffer_list(sample);
-    gst_buffer_list_ref(buffer);
-    g_queue_push_tail(self->buffer_queue, buffer);
-    gst_sample_unref(sample);
-    self->buffer_queue_cv.notify_one();
-    return GST_FLOW_OK;
-  }
-
 public:
   GstAppSink(GstElement* test_element, GstElement* tee, GstElement* pipeline)
   {
@@ -43,8 +23,6 @@ class GstAppSink
     // Set the appsink properties
     g_object_set(
       appsink, "emit-signals", TRUE, "sync", FALSE, "buffer-list", TRUE, NULL);
-    g_signal_connect(appsink, "new-sample", G_CALLBACK(NewSample), this);
-    buffer_queue = g_queue_new();
 
     // Add the appsink to the test element
     gst_bin_add_many(GST_BIN(pipeline), queue, test_element, appsink, NULL);
@@ -60,33 +38,19 @@ class GstAppSink
 
   GstBufferList* PopBuffer()
   {
-    // Wait until we have at least one buffer in the queue
-    std::unique_lock<std::mutex> lock(buffer_queue_mutex);
-    buffer_queue_cv.wait(lock, [&]() {
-      gboolean eos = false;
-      g_object_get(G_OBJECT(this->appsink), "eos", &eos, NULL);
-      if (eos)
-        return true;
-      return !g_queue_is_empty(this->buffer_queue);
-    });
-
-    return (GstBufferList*)g_queue_pop_head(buffer_queue);
-  }
+    GstSample* sample;
+    g_signal_emit_by_name(appsink, "pull-sample", &sample);
+    if (sample == NULL)
+      return NULL;
 
-  ~GstAppSink()
-  {
-    // Flush the buffer queue
-    while (!g_queue_is_empty(buffer_queue)) {
-      GstBufferList* buffer = (GstBufferList*)g_queue_pop_head(buffer_queue);
-      gst_buffer_list_unref(buffer);
-    }
+    GstBufferList* buffer = gst_sample_get_buffer_list(sample);
+    gst_buffer_list_ref(buffer);
+    gst_sample_unref(sample);
 
-    // Free resources
-    gst_object_unref(appsink);
-    g_queue_free(buffer_queue);
+    return buffer;
   }
 
-  int GetBufferCount() { return g_queue_get_length(buffer_queue); }
+  ~GstAppSink() { gst_object_unref(appsink); }
 };
 
 class GstTestFixture : public ::testing::Test

tests/src/mp4mx_cross.cc

@@ -34,7 +34,7 @@ extract_box_fourccs(GstBuffer* buffer,
 }
 
 void
-CheckSegmentInit(GstBuffer* buffer)
+IsSegmentInit(GstBuffer* buffer)
 {
   // It must only have the following flags
   EXPECT_TRUE(GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_HEADER));
@@ -159,7 +159,7 @@ TEST_F(GstTestFixture, StructureTest)
 
         // Check buffer #0
         GET_NEXT_BUFFER();
-        CheckSegmentInit(buf);
+        IsSegmentInit(buf);
 
         if (is_cmaf)
           first_cmaf_buffer = false;
@@ -227,13 +227,18 @@ TEST_F(GstTestFixture, TimingTest)
       GstBuffer* cmaf_buf = gst_buffer_list_get(cmaf_buffer, idx);
       GstBuffer* gpacmp4mx_buf = gst_buffer_list_get(gpacmp4mx_buffer, idx);
 
-      // Check the CTS and DTS
+      // Check only the PTS
       EXPECT_EQ(GST_BUFFER_PTS(cmaf_buf), GST_BUFFER_PTS(gpacmp4mx_buf));
-      EXPECT_EQ(GST_BUFFER_DTS(cmaf_buf), GST_BUFFER_DTS(gpacmp4mx_buf));
 
-      // Check the duration
-      EXPECT_EQ(GST_BUFFER_DURATION(cmaf_buf),
-                GST_BUFFER_DURATION(gpacmp4mx_buf));
+      // The duration differs because, compared to cmafmux, we are
+      // outputting complete segments rather than dividing the mdat across
+      // individual buffers by samples.
+      if (!GST_BUFFER_FLAG_IS_SET(cmaf_buf, GST_BUFFER_FLAG_DELTA_UNIT)) {
+        EXPECT_EQ(GST_BUFFER_DURATION(cmaf_buf),
+                  GST_BUFFER_DURATION(gpacmp4mx_buf));
+      }
+
+      // For the same reason, the DTS is also not the same.
     }
 
 #undef GET_NEXT_BUFFER