NV12 buffer shape helpers

system/camerad/cameras/camera_common.cc

@@ -26,11 +26,7 @@ void CameraBuf::init(cl_device_id device_id, cl_context context, SpectraCamera *
     LOGD("allocated %d CL buffers", frame_buf_count);
   }
 
-  // the encoder HW tells us the size it wants after setting it up.
-  // TODO: VENUS_BUFFER_SIZE should give the size, but it's too small. dependent on encoder settings?
-  size_t nv12_size = (out_img_width <= 1344 ? 2900 : 2346)*cam->stride;
-
-  vipc_server->create_buffers_with_sizes(stream_type, VIPC_BUFFER_COUNT, out_img_width, out_img_height, nv12_size, cam->stride, cam->uv_offset);
+  vipc_server->create_buffers_with_sizes(stream_type, VIPC_BUFFER_COUNT, out_img_width, out_img_height, cam->yuv_size, cam->stride, cam->uv_offset);
   LOGD("created %d YUV vipc buffers with size %dx%d", VIPC_BUFFER_COUNT, cam->stride, cam->y_height);
 }
 

system/camerad/cameras/nv12_info.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <cassert>
+#include <cstdint>
+#include <tuple>
+
+#include "third_party/linux/include/msm_media_info.h"
+
+// Returns NV12 aligned width, height, and buffer size for the given frame.
+inline std::tuple<uint32_t, uint32_t, uint32_t> get_nv12_info(int width, int height) {
+  const uint32_t nv12_width = VENUS_Y_STRIDE(COLOR_FMT_NV12, width);
+  const uint32_t nv12_height = VENUS_Y_SCANLINES(COLOR_FMT_NV12, height);
+  assert(nv12_width == VENUS_UV_STRIDE(COLOR_FMT_NV12, width));
+  assert(nv12_height / 2 == VENUS_UV_SCANLINES(COLOR_FMT_NV12, height));
+  const uint32_t nv12_buffer_size = (width <= 1344 ? 2900 : 2346)*nv12_width;
+  return {nv12_width, nv12_height, nv12_buffer_size};
+}

system/camerad/cameras/spectra.cc

@@ -283,20 +283,12 @@ void SpectraCamera::camera_open(VisionIpcServer *v, cl_device_id device_id, cl_c
 
   buf.out_img_width = sensor->frame_width / sensor->out_scale;
   buf.out_img_height = (sensor->hdr_offset > 0 ? (sensor->frame_height - sensor->hdr_offset) / 2 : sensor->frame_height) / sensor->out_scale;
+  std::tie(stride, y_height, yuv_size) = get_nv12_info(buf.out_img_width, buf.out_img_height);
+  uv_offset = stride * y_height;
 
-  // size is driven by all the HW that handles frames,
-  // the video encoder has certain alignment requirements in this case
-  stride = VENUS_Y_STRIDE(COLOR_FMT_NV12, buf.out_img_width);
-  y_height = VENUS_Y_SCANLINES(COLOR_FMT_NV12, buf.out_img_height);
-  uv_height = VENUS_UV_SCANLINES(COLOR_FMT_NV12, buf.out_img_height);
-  uv_offset = stride*y_height;
-  yuv_size = uv_offset + stride*uv_height;
-  if (cc.output_type != ISP_RAW_OUTPUT) {
-    uv_offset = ALIGNED_SIZE(uv_offset, 0x1000);
-    yuv_size = uv_offset + ALIGNED_SIZE(stride*uv_height, 0x1000);
-  }
-  assert(stride == VENUS_UV_STRIDE(COLOR_FMT_NV12, buf.out_img_width));
-  assert(y_height/2 == uv_height);
+  // the encoder HW tells us the size it wants after setting it up.
+  // TODO: VENUS_BUFFER_SIZE should give the size, but it's too small. dependent on encoder settings?
+  yuv_size = (buf.out_img_width <= 1344 ? 2900 : 2346)*stride;
 
   open = true;
   configISP();

system/camerad/cameras/spectra.h

@@ -12,6 +12,7 @@
 #include "common/util.h"
 #include "common/swaglog.h"
 #include "system/camerad/cameras/hw.h"
+#include "system/camerad/cameras/nv12_info.h"
 #include "system/camerad/cameras/camera_common.h"
 #include "system/camerad/sensors/sensor.h"
 

tools/replay/camera.cc

@@ -7,17 +7,10 @@
 
 #include "third_party/linux/include/msm_media_info.h"
 #include "tools/replay/util.h"
+#include "system/camerad/cameras/nv12_info.h"
 
-const int BUFFER_COUNT = 40;
 
-std::tuple<size_t, size_t, size_t> get_nv12_info(int width, int height) {
-  int nv12_width = VENUS_Y_STRIDE(COLOR_FMT_NV12, width);
-  int nv12_height = VENUS_Y_SCANLINES(COLOR_FMT_NV12, height);
-  assert(nv12_width == VENUS_UV_STRIDE(COLOR_FMT_NV12, width));
-  assert(nv12_height / 2 == VENUS_UV_SCANLINES(COLOR_FMT_NV12, height));
-  size_t nv12_buffer_size = 2346 * nv12_width;  // comes from v4l2_format.fmt.pix_mp.plane_fmt[0].sizeimage
-  return {nv12_width, nv12_height, nv12_buffer_size};
-}
+const int BUFFER_COUNT = 40;
 
 CameraServer::CameraServer(std::pair<int, int> camera_size[MAX_CAMERAS]) {
   for (int i = 0; i < MAX_CAMERAS; ++i) {

tools/replay/camera.h

@@ -10,8 +10,6 @@
 #include "tools/replay/framereader.h"
 #include "tools/replay/logreader.h"
 
-std::tuple<size_t, size_t, size_t> get_nv12_info(int width, int height);
-
 class CameraServer {
 public:
   CameraServer(std::pair<int, int> camera_size[MAX_CAMERAS] = nullptr);