fix: deprecate ZM_COLOUR for AVPixelFormat (resubmit with planar/SHM fixes)

src/zm_camera.cpp

@@ -41,6 +41,7 @@ Camera::Camera(
   height(p_height),
   colours(p_colours),
   subpixelorder(p_subpixelorder),
+  pixelFormat(zm_pixformat_from_colours(p_colours, p_subpixelorder)),
   brightness(p_brightness),
   hue(p_hue),
   colour(p_colour),
@@ -63,9 +64,37 @@ Camera::Camera(
   mLastAudioDTS(AV_NOPTS_VALUE),
   bytes(0),
   mIsPrimed(false) {
-  linesize = width * colours;
+  // Camera::linesize/imagesize describe the *device-side* buffer that
+  // capture paths copy from (V4L2 mmap buffers, raw RTP frames, etc).
+  // Those buffers are tightly packed at the driver/source stride, not
+  // 32-byte aligned, so use align=1 here. ZM's internal Image buffers
+  // and SHM slots independently apply their own 32-byte alignment for
+  // SIMD performance — that decoupling is the source of the size-mismatch
+  // Fatal in LocalCamera::PrimeCapture when widths aren't 32-aligned.
+  //
+  // Guard against an unknown (colours, subpixelorder) pair that produced
+  // pixelFormat == AV_PIX_FMT_NONE, or any case where av_image_get_*
+  // returns a negative size — assigning those to unsigned would wrap to a
+  // huge value and break SHM sizing and downstream allocations.
   pixels = width * height;
-  imagesize = static_cast<unsigned long long>(height) * linesize;
+  if (pixelFormat == AV_PIX_FMT_NONE) {
+    Error("Camera: unknown pixel format from colours=%u subpixelorder=%u; falling back to width*colours stride",
+          p_colours, p_subpixelorder);
+    linesize = width * colours;
+    imagesize = static_cast<unsigned long long>(height) * linesize;
+  } else {
+    int raw_linesize = av_image_get_linesize(pixelFormat, width, 0);
+    int raw_imagesize = av_image_get_buffer_size(pixelFormat, width, height, 1);
+    if (raw_linesize < 0 || raw_imagesize < 0) {
+      Error("Camera: av_image_get_* returned %d/%d for pixelFormat=%s; falling back",
+            raw_linesize, raw_imagesize, zm_get_pix_fmt_name(pixelFormat));
+      linesize = width * colours;
+      imagesize = static_cast<unsigned long long>(height) * linesize;
+    } else {
+      linesize = static_cast<unsigned int>(raw_linesize);
+      imagesize = static_cast<unsigned long long>(raw_imagesize);
+    }
+  }
 
   Debug(2, "New camera id: %d width: %d line size: %d height: %d colours: %d subpixelorder: %d capture: %d, size: %llu",
         monitor->Id(), width, linesize, height, colours, subpixelorder, capture, imagesize);
@@ -101,7 +130,7 @@ AVStream *Camera::getVideoStream() {
       mVideoStream->time_base = (AVRational) {1, 1000000}; // microseconds as base frame rate
       mVideoStream->codecpar->width = width;
       mVideoStream->codecpar->height = height;
-      mVideoStream->codecpar->format = GetFFMPEGPixelFormat(colours, subpixelorder);
+      mVideoStream->codecpar->format = pixelFormat;
       mVideoStream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
       mVideoStream->codecpar->codec_id = AV_CODEC_ID_NONE;
       Debug(1, "Allocating avstream %p %p %d", mVideoStream, mVideoStream->codecpar, mVideoStream->codecpar->codec_id);

src/zm_camera.h

@@ -21,6 +21,7 @@
 #define ZM_CAMERA_H
 
 #include "zm_image.h"
+#include "zm_pixformat.h"
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
@@ -42,8 +43,9 @@ class Camera {
   uint16_t  width;
   uint16_t  height;
   unsigned int  linesize;
-  unsigned int  colours;
-  unsigned int  subpixelorder;
+  unsigned int  colours;       // DEPRECATED: use pixelFormat
+  unsigned int  subpixelorder; // DEPRECATED: use pixelFormat
+  AVPixelFormat pixelFormat;
   unsigned int  pixels;
   unsigned long long imagesize;
   int           brightness;
@@ -98,8 +100,9 @@ class Camera {
   unsigned int Width() const { return width; }
   unsigned int LineSize() const { return linesize; }
   unsigned int Height() const { return height; }
-  unsigned int Colours() const { return colours; }
-  unsigned int SubpixelOrder() const { return subpixelorder; }
+  unsigned int Colours() const { return colours; }       // DEPRECATED
+  unsigned int SubpixelOrder() const { return subpixelorder; } // DEPRECATED
+  AVPixelFormat PixelFormat() const { return pixelFormat; }
   unsigned int Pixels() const { return pixels; }
   unsigned long long ImageSize() const { return imagesize; }
   unsigned int Bytes() const { return bytes; };

src/zm_ffmpeg.cpp

@@ -20,6 +20,7 @@
 #include "zm_ffmpeg.h"
 
 #include "zm_logger.h"
+#include "zm_pixformat.h"
 #include "zm_rgb.h"
 #include "zm_utils.h"
 
@@ -327,46 +328,9 @@ void FFMPEGDeInit() {
   bInit = false;
 }
 
+// DEPRECATED: use zm_pixformat_from_colours() from zm_pixformat.h instead.
 enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subpixelorder) {
-  enum _AVPIXELFORMAT pf;
-
-  Debug(8,"Colours: %d SubpixelOrder: %d",p_colours,p_subpixelorder);
-
-  switch (p_colours) {
-  case ZM_COLOUR_RGB24:
-    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-      /* BGR subpixel order */
-      pf = AV_PIX_FMT_BGR24;
-    } else {
-      /* Assume RGB subpixel order */
-      pf = AV_PIX_FMT_RGB24;
-    }
-    break;
-  case ZM_COLOUR_RGB32:
-    if (p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-      /* ARGB subpixel order */
-      pf = AV_PIX_FMT_ARGB;
-    } else if (p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-      /* ABGR subpixel order */
-      pf = AV_PIX_FMT_ABGR;
-    } else if (p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-      /* BGRA subpixel order */
-      pf = AV_PIX_FMT_BGRA;
-    } else {
-      /* Assume RGBA subpixel order */
-      pf = AV_PIX_FMT_RGBA;
-    }
-    break;
-  case ZM_COLOUR_GRAY8:
-    pf = AV_PIX_FMT_GRAY8;
-    break;
-  default:
-    Panic("Unexpected colours: %d", p_colours);
-    pf = AV_PIX_FMT_GRAY8; /* Just to shush gcc variable may be unused warning */
-    break;
-  }
-
-  return pf;
+  return zm_pixformat_from_colours(p_colours, p_subpixelorder);
 }
 
 #if LIBAVUTIL_VERSION_CHECK(56, 0, 0, 17, 100)

src/zm_ffmpeg_camera.cpp

@@ -94,17 +94,18 @@ FfmpegCamera::FfmpegCamera(
 
   /* Has to be located inside the constructor so other components such as zma
    * will receive correct colours and subpixel order */
-  if ( colours == ZM_COLOUR_RGB32 ) {
+  if ( zm_is_rgb32(pixelFormat) ) {
     subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-    imagePixFormat = AV_PIX_FMT_RGBA;
-  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    pixelFormat = AV_PIX_FMT_RGBA;
+  } else if ( zm_is_rgb24(pixelFormat) ) {
     subpixelorder = ZM_SUBPIX_ORDER_RGB;
-    imagePixFormat = AV_PIX_FMT_RGB24;
-  } else if ( colours == ZM_COLOUR_GRAY8 ) {
+    pixelFormat = AV_PIX_FMT_RGB24;
+  } else if ( pixelFormat == AV_PIX_FMT_GRAY8 ) {
     subpixelorder = ZM_SUBPIX_ORDER_NONE;
-    imagePixFormat = AV_PIX_FMT_GRAY8;
+    pixelFormat = AV_PIX_FMT_GRAY8;
   } else {
-    Panic("Unexpected colours: %d", colours);
+    Panic("Unexpected pixel format %d (%s); legacy colours=%d subpixelorder=%d",
+          pixelFormat, zm_get_pix_fmt_name(pixelFormat), colours, subpixelorder);
   }
 
   packet = av_packet_ptr{av_packet_alloc()};
@@ -525,7 +526,7 @@ int FfmpegCamera::OpenFfmpeg() {
               mVideoCodec->name,
               av_hwdevice_get_type_name(type),
               av_hwdevice_get_type_name(config->device_type),
-              av_get_pix_fmt_name(config->pix_fmt)
+              zm_get_pix_fmt_name(config->pix_fmt)
               );
         }
       }  // end foreach hwconfig
@@ -534,7 +535,7 @@ int FfmpegCamera::OpenFfmpeg() {
 #endif
       if (hw_pix_fmt != AV_PIX_FMT_NONE) {
         Debug(1, "Selected hw_pix_fmt %d %s",
-            hw_pix_fmt, av_get_pix_fmt_name(hw_pix_fmt));
+            hw_pix_fmt, zm_get_pix_fmt_name(hw_pix_fmt));
 
         mVideoCodecContext->hwaccel_flags |= AV_HWACCEL_FLAG_IGNORE_LEVEL;
         //if (!lavc_param->check_hw_profile)

src/zm_ffmpeg_camera.h

@@ -54,8 +54,6 @@ class FfmpegCamera : public Camera {
 
   int frameCount;
 
-  _AVPIXELFORMAT      imagePixFormat;
-
   bool                use_hwaccel; //will default to on if hwaccel specified, will get turned off if there is a failure
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
   AVBufferRef *hw_device_ctx = nullptr;