Signing multiple GOPs can now handle incorrect P-frames (#458)

Corresponding tests have been activated.

Author: bjornvolcker

lib/src/sv_auth.c

@@ -353,6 +353,7 @@ extend_partial_gop(signed_video_t *self, const bu_list_item_t *sei)
 
     // Mark the item and move to next.
     item->associated_sei = sei;
+    self->tmp_num_in_partial_gop++;
     item = item->next;
   }
 }
@@ -412,7 +413,7 @@ verify_hashes_with_hash_list(signed_video_t *self,
       break;
     }
     // If this item is not Pending or not part of the GOP hash, move to the next one.
-    if (item->tmp_validation_status != 'P' || !item->associated_sei) {
+    if (item->tmp_validation_status != 'P' || (item->associated_sei != sei)) {
       DEBUG_LOG("Skipping non-pending Bitstream Unit");
       item = item->next;
       continue;
@@ -507,6 +508,16 @@ verify_hashes_with_hash_list(signed_video_t *self,
     bu_list_add_missing(bu_list, num_unused_expected_hashes, true, last_used_item, sei);
   }
 
+  // Remove SEI associations which were never used. This happens if there are missing BUs
+  // within a partial GOP.
+  while (item) {
+    if (item->associated_sei == sei) {
+      item->associated_sei = NULL;
+      self->tmp_num_in_partial_gop--;
+    }
+    item = item->next;
+  }
+
   if (num_expected) *num_expected = num_expected_hashes;
   if (num_received) *num_received = num_verified_hashes;
 

tests/check/check_signed_video_auth.c

@@ -2913,8 +2913,6 @@ END_TEST
 
 START_TEST(modify_one_p_frame_multiple_gops)
 {
-  // Enable when validation can be made without dead lock.
-  return;
   // Device side
   struct sv_setting setting = settings[_i];
   const unsigned signing_frequency = 3;
@@ -2951,8 +2949,6 @@ END_TEST
 
 START_TEST(remove_one_p_frame_multiple_gops)
 {
-  // Enable when validation can be made without dead lock.
-  return;
   // Device side
   struct sv_setting setting = settings[_i];
   const unsigned signing_frequency = 3;
@@ -3002,8 +2998,6 @@ END_TEST
 
 START_TEST(add_one_p_frame_multiple_gops)
 {
-  // Enable when validation can be made without dead lock.
-  return;
   // Device side
   struct sv_setting setting = settings[_i];
   const unsigned signing_frequency = 3;