Adds new AV1 tests in a separate file (#505)

bjornvolcker · web-flow · commit e1dc707d4cba · 2025-08-12T09:00:04.000+02:00
One test has been added and that is "normal" signing with FH.
A new input parameter to test stream creation has been added.
This parameter tells the system to use OBU_FRAME or FH+TG.

Co-authored-by: bjornvolcker &lt;bjornvolcker@users.noreply.github.com&gt;
diff --git a/lib/src/sv_codec_av1.c b/lib/src/sv_codec_av1.c
@@ -77,12 +77,11 @@ parse_av1_obu_header(bu_info_t *obu)
       obu_header_is_valid &= (obu_size == 0);
       break;
     case 3:  // 3 OBU_FRAME_HEADER
-      obu->bu_type = BU_TYPE_OTHER;
-      obu_header_is_valid = false;  // Not yet supported
+      obu->bu_type = ((*obu_ptr & 0x60) >> 5) == 0 ? BU_TYPE_I : BU_TYPE_P;
+      obu->is_primary_slice = true;
       break;
     case 4:  // 4 OBU_TILE_GROUP
-      obu->bu_type = BU_TYPE_OTHER;
-      obu_header_is_valid = false;  // Not yet supported
+      obu->bu_type = BU_TYPE_TG;
       break;
     case 5:  // 5 OBU_METADATA
       obu->bu_type = BU_TYPE_SEI;
diff --git a/lib/src/sv_common.c b/lib/src/sv_common.c
@@ -509,7 +509,9 @@ parse_bu_info(const uint8_t *bu_data,
   bu.is_valid = bu_header_is_valid;
 
   // Only picture BUs are hashed.
-  if (bu.bu_type == BU_TYPE_I || bu.bu_type == BU_TYPE_P) bu.is_hashable = true;
+  if (bu.bu_type == BU_TYPE_I || bu.bu_type == BU_TYPE_P || bu.bu_type == BU_TYPE_TG) {
+    bu.is_hashable = true;
+  }
 
   bu.is_first_bu_in_gop = (bu.bu_type == BU_TYPE_I) && bu.is_primary_slice;
 
diff --git a/tests/check/check_codec_av1.c b/tests/check/check_codec_av1.c
@@ -0,0 +1,100 @@
+/**
+ * MIT License
+ *
+ * Copyright (c) 2021 Axis Communications AB
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next paragraph) shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include <check.h>
+#include <stdbool.h>
+#ifdef PRINT_DECODED_SEI
+#include <stdio.h>
+#endif
+#include <stdlib.h>  // EXIT_SUCCESS, EXIT_FAILURE
+
+#include "includes/signed_video_auth.h"
+#include "includes/signed_video_common.h"
+#include "includes/signed_video_sign.h"
+#include "test_helpers.h"
+#include "test_stream.h"
+
+#define NUM_SETTINGS_AV1 2
+struct sv_setting settings_av1[NUM_SETTINGS_AV1] = {
+    {SV_CODEC_AV1, SV_AUTHENTICITY_LEVEL_GOP, true, false, false, 0, NULL, 0, 1, false, 0, 0, true},
+    {SV_CODEC_AV1, SV_AUTHENTICITY_LEVEL_FRAME, true, false, false, 0, NULL, 0, 1, false, 0, 0,
+        true}};
+/* General comments to the validation tests.
+ * All tests loop through the settings in settings_av1[NUM_SETTINGS_AV1]; See
+ * signed_video_helpers.h. The index in the loop is _i and something the check test
+ * framework provides. */
+
+static void
+setup()
+{
+}
+
+static void
+teardown()
+{
+}
+
+START_TEST(signed_stream_with_fh)
+{
+  // This test runs in a loop with loop index _i, corresponding to struct sv_setting _i in
+  // |settings_av1|; See signed_video_helpers.h.
+
+  struct sv_setting setting = settings_av1[_i];
+  setting.with_fh = true;
+  test_stream_t *list = create_signed_stream("ItPtPtItPtPtItPtPtItPtPtItPtPt", setting);
+  test_stream_check_types(list, "ItPtPtItSPtPtItSPtPtItSPtPtItSPtPt");
+  test_stream_free(list);
+}
+END_TEST
+
+static Suite *
+signed_video_suite(void)
+{
+  // Setup test suit and test case
+  Suite *suite = suite_create("Signed video signing tests");
+  TCase *tc = tcase_create("Signed video standard unit test");
+  tcase_add_checked_fixture(tc, setup, teardown);
+
+  // The test loop works like this
+  //   for (int _i = s; _i < e; _i++) {}
+
+  int s = 0;
+  int e = NUM_SETTINGS_AV1;
+
+  // Add tests
+  tcase_add_loop_test(tc, signed_stream_with_fh, s, e);
+
+  // Add test case to suit
+  suite_add_tcase(suite, tc);
+  return suite;
+}
+
+int
+main(void)
+{
+  // Create suite runner and run
+  int failed_tests = 0;
+  SRunner *sr = srunner_create(NULL);
+  srunner_add_suite(sr, signed_video_suite());
+  srunner_run_all(sr, CK_ENV);
+  failed_tests = srunner_ntests_failed(sr);
+  srunner_free(sr);
+  return (failed_tests == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
diff --git a/tests/check/check_signed_video_auth.c b/tests/check/check_signed_video_auth.c
@@ -1555,7 +1555,7 @@ START_TEST(fallback_to_gop_level)
 
   // Create a list of Bitstream Units given the input string.
   test_stream_t *list =
-      create_signed_stream_with_sv(sv, "IPPIPPPPPPPPPPPPPPPPPPPPPPPPIPPIP", false, 0);
+      create_signed_stream_with_sv(sv, "IPPIPPPPPPPPPPPPPPPPPPPPPPPPIPPIP", false, 0, false);
   test_stream_check_types(list, "IPPISPPPPPPPPPPPPPPPPPPPPPPPPISPPISP");
 
   signed_video_accumulated_validation_t final_validation = {
@@ -1809,7 +1809,7 @@ START_TEST(onvif_intact_stream)
   setting.vendor_axis_mode = 2;
 
   // Create a signed video stream with SV.
-  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIPPIPPIPPIPPIPPIP", false, 0);
+  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIPPIPPIPPIPPIPPIP", false, 0, false);
 
   // Define expected validation results.
   signed_video_accumulated_validation_t final_validation = {
@@ -2269,7 +2269,7 @@ START_TEST(golden_sei_principle)
   signed_video_t *sv = get_initialized_signed_video(setting, false);
   ck_assert(sv);
 
-  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIPPIPPIP", false, 0);
+  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIPPIPPIP", false, 0, false);
   test_stream_check_types(list, "GIPPISPPISPPISP");
 
   // GIPPISPPISPPISP
diff --git a/tests/check/check_signed_video_sign.c b/tests/check/check_signed_video_sign.c
@@ -450,7 +450,7 @@ START_TEST(vendor_axis_communications_operation)
 
   // Add 2 P-frames between 2 I-frames to mimic a GOP structure in the stream to trigger a
   // SEI.
-  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIP", false, 0);
+  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIP", false, 0, false);
   test_stream_check_types(list, "IPPISP");
   verify_seis(list, setting);
   test_stream_free(list);
@@ -485,7 +485,7 @@ START_TEST(factory_provisioned_key)
   setting.vendor_axis_mode = 2;
 
   // Generate a GOP to trigger a SEI.
-  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIP", false, 0);
+  test_stream_t *list = create_signed_stream_with_sv(sv, "IPPIP", false, 0, false);
   // If the test has been built with ONVIF Media Signing, factory provisioned keys will
   // use Media Signing for H.264 and H.265.
 #ifndef NO_ONVIF_MEDIA_SIGNING
@@ -625,7 +625,7 @@ START_TEST(fallback_to_gop_level)
 
   // Create a test stream given the input string.
   test_stream_t *list =
-      create_signed_stream_with_sv(sv, "IPPIPPPPPPPPPPPPPPPPPPPPPPPPIP", false, 0);
+      create_signed_stream_with_sv(sv, "IPPIPPPPPPPPPPPPPPPPPPPPPPPPIP", false, 0, false);
   test_stream_check_types(list, "IPPISPPPPPPPPPPPPPPPPPPPPPPPPISP");
   test_stream_item_t *sei_2 = test_stream_item_remove(list, 31);
   test_stream_item_check_type(sei_2, 'S');
diff --git a/tests/check/meson.build b/tests/check/meson.build
@@ -14,6 +14,15 @@ tests = [
         'test_helpers.h'
       ]
     ],
+    ['unittest_av1',
+      [
+        'check_codec_av1.c',
+        'test_stream.c',
+        'test_stream.h',
+        'test_helpers.c',
+        'test_helpers.h'
+      ]
+    ],
 ]
 
 if (get_option('signingplugin') != 'threaded_unless_check_dep')
diff --git a/tests/check/test_helpers.c b/tests/check/test_helpers.c
@@ -85,17 +85,26 @@ const int64_t g_testTimestamp = 42;
 //   unsigned delay;
 // };
 struct sv_setting settings[NUM_SETTINGS] = {
-    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_GOP, true, true, false, 0, NULL, 0, 1, false, 0, 0},
-    {SV_CODEC_H265, SV_AUTHENTICITY_LEVEL_GOP, true, true, false, 0, NULL, 0, 1, false, 0, 0},
-    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_FRAME, true, true, false, 0, NULL, 0, 1, false, 0, 0},
-    {SV_CODEC_H265, SV_AUTHENTICITY_LEVEL_FRAME, true, true, false, 0, NULL, 0, 1, false, 0, 0},
+    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_GOP, true, true, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
+    {SV_CODEC_H265, SV_AUTHENTICITY_LEVEL_GOP, true, true, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
+    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_FRAME, true, true, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
+    {SV_CODEC_H265, SV_AUTHENTICITY_LEVEL_FRAME, true, true, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
     // Special cases
-    {SV_CODEC_H265, SV_AUTHENTICITY_LEVEL_GOP, false, true, false, 0, NULL, 0, 1, false, 0, 0},
-    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_FRAME, false, true, false, 0, NULL, 0, 1, false, 0, 0},
-    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_FRAME, true, true, false, 0, "sha512", 0, 1, false, 0, 0},
+    {SV_CODEC_H265, SV_AUTHENTICITY_LEVEL_GOP, false, true, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
+    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_FRAME, false, true, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
+    {SV_CODEC_H264, SV_AUTHENTICITY_LEVEL_FRAME, true, true, false, 0, "sha512", 0, 1, false, 0, 0,
+        false},
     // AV1 tests
-    {SV_CODEC_AV1, SV_AUTHENTICITY_LEVEL_GOP, true, false, false, 0, NULL, 0, 1, false, 0, 0},
-    {SV_CODEC_AV1, SV_AUTHENTICITY_LEVEL_FRAME, true, false, false, 0, NULL, 0, 1, false, 0, 0},
+    {SV_CODEC_AV1, SV_AUTHENTICITY_LEVEL_GOP, true, false, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
+    {SV_CODEC_AV1, SV_AUTHENTICITY_LEVEL_FRAME, true, false, false, 0, NULL, 0, 1, false, 0, 0,
+        false},
 };
 
 static char private_key_rsa[RSA_PRIVATE_KEY_ALLOC_BYTES];
@@ -360,7 +369,11 @@ pull_seis(signed_video_t *sv, test_stream_item_t **item, bool apply_ep, unsigned
  * generates Bitstream Unit data for these. Then adds these Bitstream Units to the input session.
  * The generated SEIs are added to the stream. */
 test_stream_t *
-create_signed_stream_with_sv(signed_video_t *sv, const char *str, bool split_bu, int delay)
+create_signed_stream_with_sv(signed_video_t *sv,
+    const char *str,
+    bool split_bu,
+    int delay,
+    bool with_fh)
 {
   SignedVideoReturnCode rc = SV_UNKNOWN_FAILURE;
   ck_assert(sv);
@@ -369,7 +382,7 @@ create_signed_stream_with_sv(signed_video_t *sv, const char *str, bool split_bu,
   const bool apply_ep = false;  // Apply emulation prevention on generated SEI afterwards.
   const bool get_seis_at_end = false;  // Fetch all SEIs at once at the end of the stream.
   // Create a test stream given the input string.
-  test_stream_t *list = test_stream_create(str, sv->codec, false);
+  test_stream_t *list = test_stream_create(str, sv->codec, with_fh);
   test_stream_item_t *item = list->first_item;
   int64_t timestamp = g_testTimestamp;
   num_gops_until_signing = sv->signing_frequency - 1;
@@ -454,7 +467,8 @@ create_signed_stream_splitted_bu_int(const char *str,
   ck_assert(sv);
 
   // Create a test stream of Bitstream Units given the input string.
-  test_stream_t *list = create_signed_stream_with_sv(sv, str, split_bu, settings.delay);
+  test_stream_t *list =
+      create_signed_stream_with_sv(sv, str, split_bu, settings.delay, settings.with_fh);
   signed_video_free(sv);
 
   return list;
diff --git a/tests/check/test_helpers.h b/tests/check/test_helpers.h
@@ -53,6 +53,7 @@ struct sv_setting {
   bool increased_sei_size;
   int vendor_axis_mode;  // 0: not Axis, 1: attestation, 2: factory provisioned
   unsigned delay;  // Delay of SEIs
+  bool with_fh;  // Use FH+TG principle if AV1
 };
 
 #define NUM_SETTINGS 9
@@ -144,7 +145,11 @@ create_signed_stream_int(const char *str, struct sv_setting settings, bool new_p
  * generates Bitstream Unit data for these. Then adds these Bitstream Units to the input
  * session. The generated SEIs are added to the stream. */
 test_stream_t *
-create_signed_stream_with_sv(signed_video_t *sv, const char *str, bool split_bu, int delay);
+create_signed_stream_with_sv(signed_video_t *sv,
+    const char *str,
+    bool split_bu,
+    int delay,
+    bool with_fh);
 
 /* Removes the Bitstream Unit item with position |item_number| from the test stream |list|. The
  * item is, after a check against the expected |type|, then freed. */
