Realign to 16 bytes.

acquire-core-libs/src/acquire-device-properties/device/props/components.h

@@ -5,7 +5,7 @@
 #include <stddef.h>
 #include "platform.h"
 
-#define VIDEOFRAME_ALIGN 64
+#define VIDEOFRAME_ALIGN 16
 
 #ifdef __cplusplus
 

acquire-video-runtime/src/runtime/source.c

@@ -64,6 +64,7 @@ video_source_thread(struct video_source_s* self)
         const size_t padding =
           (alignment - (nbytes & (alignment - 1))) & (alignment - 1);
         const size_t nbytes_aligned = nbytes + padding;
+        CHECK(nbytes_aligned % alignment == 0);
 
         struct channel* channel =
           (self->enable_filter) ? self->to_filter : self->to_sink;

acquire-video-runtime/tests/aligned-videoframe-pointers.cpp

@@ -99,8 +99,7 @@ acquire(AcquireRuntime* runtime)
     OK(acquire_get_configuration(runtime, &props));
 
     const auto next = [](VideoFrame* cur) -> VideoFrame* {
-        return (VideoFrame*)(((uint8_t*)cur) +
-                             align_up(cur->bytes_of_frame, 8));
+        return (VideoFrame*)(((uint8_t*)cur) + cur->bytes_of_frame);
     };
 
     const auto consumed_bytes = [](const VideoFrame* const cur,
@@ -149,7 +148,10 @@ acquire(AcquireRuntime* runtime)
                       props.video[0].camera.settings.shape.y);
 
                 // check pointer is aligned
-                CHECK((size_t)cur % 64 == 0);
+                const auto cur_size_t = (size_t)cur;
+                EXPECT(cur_size_t % 16 == 0,
+                       "Pointer not aligned: %lu",
+                       cur_size_t % 16);
                 ++nframes;
             }
 
@@ -177,6 +179,7 @@ acquire(AcquireRuntime* runtime)
 int
 main()
 {
+    const size_t a = alignof(VideoFrame);
     int retval = 1;
     AcquireRuntime* runtime = acquire_init(reporter);