[{"id":28973,"web_url":"https://patchwork.libcamera.org/comment/28973/","msgid":"<171046481240.1913896.15460182619213242462@ping.linuxembedded.co.uk>","date":"2024-03-15T01:06:52","subject":"Re: [PATCH v2 06/14] libcamera: v4l2_subdevice: Rename\n\tV4L2SubdeviceFormat::mbus_code to code","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2024-03-15 00:16:05)\n> The V4L2SubdeviceFormat::mbus_code member doesn't follow the libcamera\n> coding style as it should use camelCase. Fix it by renaming it to just\n> 'code', to shorten lines in addition to fixing the coding style.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  include/libcamera/internal/v4l2_subdevice.h      |  2 +-\n>  src/libcamera/camera_sensor.cpp                  |  8 ++++----\n>  src/libcamera/pipeline/imx8-isi/imx8-isi.cpp     | 10 +++++-----\n>  src/libcamera/pipeline/ipu3/cio2.cpp             |  8 ++++----\n>  src/libcamera/pipeline/ipu3/imgu.cpp             |  4 ++--\n>  src/libcamera/pipeline/rkisp1/rkisp1.cpp         |  2 +-\n>  src/libcamera/pipeline/rkisp1/rkisp1_path.cpp    |  2 +-\n>  .../pipeline/rpi/common/pipeline_base.cpp        | 16 ++++++++--------\n>  src/libcamera/pipeline/rpi/vc4/vc4.cpp           |  2 +-\n>  src/libcamera/pipeline/simple/simple.cpp         | 10 +++++-----\n>  src/libcamera/pipeline/vimc/vimc.cpp             |  4 ++--\n>  src/libcamera/v4l2_subdevice.cpp                 | 12 ++++++------\n>  test/camera-sensor.cpp                           |  2 +-\n>  test/v4l2_videodevice/v4l2_videodevice_test.cpp  |  2 +-\n>  14 files changed, 42 insertions(+), 42 deletions(-)\n> \n> diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h\n> index a87981341d75..1115cfa55594 100644\n> --- a/include/libcamera/internal/v4l2_subdevice.h\n> +++ b/include/libcamera/internal/v4l2_subdevice.h\n> @@ -61,7 +61,7 @@ struct V4L2SubdeviceCapability final : v4l2_subdev_capability {\n>  };\n>  \n>  struct V4L2SubdeviceFormat {\n> -       uint32_t mbus_code;\n> +       uint32_t code;\n>         Size size;\n>         std::optional<ColorSpace> colorSpace;\n>  \n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 55c9c74b10c2..af5d97f35de1 100644\n> --- a/src/libcamera/camera_sensor.cpp\n> +++ b/src/libcamera/camera_sensor.cpp\n> @@ -770,7 +770,7 @@ V4L2SubdeviceFormat CameraSensor::getFormat(const std::vector<unsigned int> &mbu\n>         }\n>  \n>         V4L2SubdeviceFormat format{\n> -               .mbus_code = bestCode,\n> +               .code = bestCode,\n>                 .size = *bestSize,\n>                 .colorSpace = ColorSpace::Raw,\n>         };\n> @@ -892,12 +892,12 @@ int CameraSensor::applyConfiguration(const SensorConfiguration &config,\n>                             size.height != config.outputSize.height)\n>                                 continue;\n>  \n> -                       subdevFormat.mbus_code = code;\n> +                       subdevFormat.code = code;\n>                         subdevFormat.size = size;\n>                         break;\n>                 }\n>         }\n> -       if (!subdevFormat.mbus_code) {\n> +       if (!subdevFormat.code) {\n>                 LOG(CameraSensor, Error) << \"Invalid output size in sensor configuration\";\n>                 return -EINVAL;\n>         }\n> @@ -1061,7 +1061,7 @@ int CameraSensor::sensorInfo(IPACameraSensorInfo *info) const\n>         if (ret)\n>                 return ret;\n>  \n> -       info->bitsPerPixel = MediaBusFormatInfo::info(format.mbus_code).bitsPerPixel;\n> +       info->bitsPerPixel = MediaBusFormatInfo::info(format.code).bitsPerPixel;\n>         info->outputSize = format.size;\n>  \n>         std::optional<int32_t> cfa = properties_.get(properties::draft::ColorFilterArrangement);\n> diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n> index 9bdfff0b155e..a3782aea2ba9 100644\n> --- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n> +++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp\n> @@ -554,7 +554,7 @@ CameraConfiguration::Status ISICameraConfiguration::validate()\n>         PixelFormat pixelFormat = config_[0].pixelFormat;\n>  \n>         V4L2SubdeviceFormat sensorFormat{};\n> -       sensorFormat.mbus_code = data_->getMediaBusFormat(&pixelFormat);\n> +       sensorFormat.code = data_->getMediaBusFormat(&pixelFormat);\n>         sensorFormat.size = maxSize;\n>  \n>         LOG(ISI, Debug) << \"Computed sensor configuration: \" << sensorFormat;\n> @@ -569,7 +569,7 @@ CameraConfiguration::Status ISICameraConfiguration::validate()\n>          * the smallest larger format without considering the aspect ratio\n>          * as the ISI can freely scale.\n>          */\n> -       auto sizes = sensor->sizes(sensorFormat.mbus_code);\n> +       auto sizes = sensor->sizes(sensorFormat.code);\n>         Size bestSize;\n>  \n>         for (const Size &s : sizes) {\n> @@ -595,7 +595,7 @@ CameraConfiguration::Status ISICameraConfiguration::validate()\n>                 return Invalid;\n>         }\n>  \n> -       sensorFormat_.mbus_code = sensorFormat.mbus_code;\n> +       sensorFormat_.code = sensorFormat.code;\n>         sensorFormat_.size = bestSize;\n>  \n>         LOG(ISI, Debug) << \"Selected sensor format: \" << sensorFormat_;\n> @@ -632,7 +632,7 @@ StreamConfiguration PipelineHandlerISI::generateYUVConfiguration(Camera *camera,\n>  \n>         /* Adjust the requested size to the sensor's capabilities. */\n>         V4L2SubdeviceFormat sensorFmt;\n> -       sensorFmt.mbus_code = mbusCode;\n> +       sensorFmt.code = mbusCode;\n>         sensorFmt.size = size;\n>  \n>         int ret = data->sensor_->tryFormat(&sensorFmt);\n> @@ -891,7 +891,7 @@ int PipelineHandlerISI::configure(Camera *camera, CameraConfiguration *c)\n>                 unsigned int isiCode = ISICameraConfiguration::formatsMap_.at(config.pixelFormat);\n>  \n>                 V4L2SubdeviceFormat isiFormat{};\n> -               isiFormat.mbus_code = isiCode;\n> +               isiFormat.code = isiCode;\n>                 isiFormat.size = config.size;\n>  \n>                 ret = pipe->isi->setFormat(1, &isiFormat);\n> diff --git a/src/libcamera/pipeline/ipu3/cio2.cpp b/src/libcamera/pipeline/ipu3/cio2.cpp\n> index 7400cb0b644c..43c816baf6ef 100644\n> --- a/src/libcamera/pipeline/ipu3/cio2.cpp\n> +++ b/src/libcamera/pipeline/ipu3/cio2.cpp\n> @@ -202,7 +202,7 @@ int CIO2Device::configure(const Size &size, const Transform &transform,\n>         if (ret)\n>                 return ret;\n>  \n> -       const auto &itInfo = mbusCodesToPixelFormat.find(sensorFormat.mbus_code);\n> +       const auto &itInfo = mbusCodesToPixelFormat.find(sensorFormat.code);\n>         if (itInfo == mbusCodesToPixelFormat.end())\n>                 return -EINVAL;\n>  \n> @@ -230,13 +230,13 @@ StreamConfiguration CIO2Device::generateConfiguration(Size size) const\n>         /* Query the sensor static information for closest match. */\n>         std::vector<unsigned int> mbusCodes = utils::map_keys(mbusCodesToPixelFormat);\n>         V4L2SubdeviceFormat sensorFormat = getSensorFormat(mbusCodes, size);\n> -       if (!sensorFormat.mbus_code) {\n> +       if (!sensorFormat.code) {\n>                 LOG(IPU3, Error) << \"Sensor does not support mbus code\";\n>                 return {};\n>         }\n>  \n>         cfg.size = sensorFormat.size;\n> -       cfg.pixelFormat = mbusCodesToPixelFormat.at(sensorFormat.mbus_code);\n> +       cfg.pixelFormat = mbusCodesToPixelFormat.at(sensorFormat.code);\n>         cfg.bufferCount = kBufferCount;\n>  \n>         return cfg;\n> @@ -326,7 +326,7 @@ V4L2SubdeviceFormat CIO2Device::getSensorFormat(const std::vector<unsigned int>\n>         }\n>  \n>         V4L2SubdeviceFormat format{};\n> -       format.mbus_code = bestCode;\n> +       format.code = bestCode;\n>         format.size = bestSize;\n>  \n>         return format;\n> diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp\n> index 531879f18183..2202438a75e0 100644\n> --- a/src/libcamera/pipeline/ipu3/imgu.cpp\n> +++ b/src/libcamera/pipeline/ipu3/imgu.cpp\n> @@ -504,7 +504,7 @@ int ImgUDevice::configure(const PipeConfig &pipeConfig, V4L2DeviceFormat *inputF\n>         LOG(IPU3, Debug) << \"ImgU BDS rectangle = \" << bds;\n>  \n>         V4L2SubdeviceFormat gdcFormat = {};\n> -       gdcFormat.mbus_code = MEDIA_BUS_FMT_FIXED;\n> +       gdcFormat.code = MEDIA_BUS_FMT_FIXED;\n>         gdcFormat.size = pipeConfig.gdc;\n>  \n>         ret = imgu_->setFormat(PAD_INPUT, &gdcFormat);\n> @@ -543,7 +543,7 @@ int ImgUDevice::configureVideoDevice(V4L2VideoDevice *dev, unsigned int pad,\n>                                      V4L2DeviceFormat *outputFormat)\n>  {\n>         V4L2SubdeviceFormat imguFormat = {};\n> -       imguFormat.mbus_code = MEDIA_BUS_FMT_FIXED;\n> +       imguFormat.code = MEDIA_BUS_FMT_FIXED;\n>         imguFormat.size = cfg.size;\n>  \n>         int ret = imgu_->setFormat(pad, &imguFormat);\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 586b46d64630..abb21968413a 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -761,7 +761,7 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n>  \n>         /* YUYV8_2X8 is required on the ISP source path pad for YUV output. */\n>         if (!isRaw_)\n> -               format.mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;\n> +               format.code = MEDIA_BUS_FMT_YUYV8_2X8;\n>  \n>         LOG(RkISP1, Debug)\n>                 << \"Configuring ISP output pad with \" << format\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> index b62b645cae24..9195aad2cff2 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp\n> @@ -365,7 +365,7 @@ int RkISP1Path::configure(const StreamConfiguration &config,\n>          * The configuration has been validated, the pixel format is guaranteed\n>          * to be supported and thus found in formatToMediaBus.\n>          */\n> -       ispFormat.mbus_code = formatToMediaBus.at(config.pixelFormat);\n> +       ispFormat.code = formatToMediaBus.at(config.pixelFormat);\n>  \n>         ret = resizer_->setFormat(1, &ispFormat);\n>         if (ret < 0)\n> diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> index e0bedcd8c664..9449c3dc458c 100644\n> --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n> @@ -37,10 +37,10 @@ namespace {\n>  \n>  constexpr unsigned int defaultRawBitDepth = 12;\n>  \n> -PixelFormat mbusCodeToPixelFormat(unsigned int mbus_code,\n> +PixelFormat mbusCodeToPixelFormat(unsigned int code,\n>                                   BayerFormat::Packing packingReq)\n>  {\n> -       BayerFormat bayer = BayerFormat::fromMbusCode(mbus_code);\n> +       BayerFormat bayer = BayerFormat::fromMbusCode(code);\n>  \n>         ASSERT(bayer.isValid());\n>  \n> @@ -221,7 +221,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n>          * without modifications.\n>          */\n>         if (sensorConfig) {\n> -               BayerFormat bayer = BayerFormat::fromMbusCode(sensorFormat_.mbus_code);\n> +               BayerFormat bayer = BayerFormat::fromMbusCode(sensorFormat_.code);\n>  \n>                 if (bayer.bitDepth != sensorConfig->bitDepth ||\n>                     sensorFormat_.size != sensorConfig->outputSize) {\n> @@ -236,7 +236,7 @@ CameraConfiguration::Status RPiCameraConfiguration::validate()\n>                 StreamConfiguration *rawStream = raw.cfg;\n>  \n>                 /* Adjust the RAW stream to match the computed sensor format. */\n> -               BayerFormat sensorBayer = BayerFormat::fromMbusCode(sensorFormat_.mbus_code);\n> +               BayerFormat sensorBayer = BayerFormat::fromMbusCode(sensorFormat_.code);\n>  \n>                 /*\n>                  * Some sensors change their Bayer order when they are h-flipped\n> @@ -377,8 +377,8 @@ V4L2DeviceFormat PipelineHandlerBase::toV4L2DeviceFormat(const V4L2VideoDevice *\n>                                                          const V4L2SubdeviceFormat &format,\n>                                                          BayerFormat::Packing packingReq)\n>  {\n> -       unsigned int mbus_code = format.mbus_code;\n> -       const PixelFormat pix = mbusCodeToPixelFormat(mbus_code, packingReq);\n> +       unsigned int code = format.code;\n> +       const PixelFormat pix = mbusCodeToPixelFormat(code, packingReq);\n>         V4L2DeviceFormat deviceFormat;\n>  \n>         deviceFormat.fourcc = dev->toV4L2PixelFormat(pix);\n> @@ -409,7 +409,7 @@ PipelineHandlerBase::generateConfiguration(Camera *camera, Span<const StreamRole\n>                 case StreamRole::Raw:\n>                         size = sensorSize;\n>                         sensorFormat = data->findBestFormat(size, defaultRawBitDepth);\n> -                       pixelFormat = mbusCodeToPixelFormat(sensorFormat.mbus_code,\n> +                       pixelFormat = mbusCodeToPixelFormat(sensorFormat.code,\n>                                                             BayerFormat::Packing::CSI2);\n>                         ASSERT(pixelFormat.isValid());\n>                         colorSpace = ColorSpace::Raw;\n> @@ -990,7 +990,7 @@ V4L2SubdeviceFormat CameraData::findBestFormat(const Size &req, unsigned int bit\n>  \n>                         if (score <= bestScore) {\n>                                 bestScore = score;\n> -                               bestFormat.mbus_code = mbusCode;\n> +                               bestFormat.code = mbusCode;\n>                                 bestFormat.size = size;\n>                         }\n>  \n> diff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n> index 6b6ecd3ded7d..ad7dddde59f1 100644\n> --- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n> +++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n> @@ -426,7 +426,7 @@ CameraConfiguration::Status Vc4CameraData::platformValidate(RPi::RPiCameraConfig\n>                 BayerFormat rawBayer = BayerFormat::fromPixelFormat(rawStream->pixelFormat);\n>  \n>                 /* Apply the sensor bitdepth. */\n> -               rawBayer.bitDepth = BayerFormat::fromMbusCode(rpiConfig->sensorFormat_.mbus_code).bitDepth;\n> +               rawBayer.bitDepth = BayerFormat::fromMbusCode(rpiConfig->sensorFormat_.code).bitDepth;\n>  \n>                 /* Default to CSI2 packing if the user request is unsupported. */\n>                 if (rawBayer.packing != BayerFormat::Packing::CSI2 &&\n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index e37b0d1c393f..3d0424969a89 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -563,13 +563,13 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)\n>          * corresponding possible V4L2 pixel formats on the video node.\n>          */\n>         V4L2SubdeviceFormat format{};\n> -       format.mbus_code = code;\n> +       format.code = code;\n>         format.size = size;\n>  \n>         int ret = setupFormats(&format, V4L2Subdevice::TryFormat);\n>         if (ret < 0) {\n>                 /* Pipeline configuration failed, skip this configuration. */\n> -               format.mbus_code = code;\n> +               format.code = code;\n>                 format.size = size;\n>                 LOG(SimplePipeline, Debug)\n>                         << \"Sensor format \" << format\n> @@ -577,7 +577,7 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)\n>                 return;\n>         }\n>  \n> -       V4L2VideoDevice::Formats videoFormats = video_->formats(format.mbus_code);\n> +       V4L2VideoDevice::Formats videoFormats = video_->formats(format.code);\n>  \n>         LOG(SimplePipeline, Debug)\n>                 << \"Adding configuration for \" << format.size\n> @@ -707,7 +707,7 @@ int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,\n>                         if (ret < 0)\n>                                 return ret;\n>  \n> -                       if (format->mbus_code != sourceFormat.mbus_code ||\n> +                       if (format->code != sourceFormat.code ||\n>                             format->size != sourceFormat.size) {\n>                                 LOG(SimplePipeline, Debug)\n>                                         << \"Source '\" << source->entity()->name()\n> @@ -1121,7 +1121,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n>  \n>         const SimpleCameraData::Configuration *pipeConfig = config->pipeConfig();\n>         V4L2SubdeviceFormat format{};\n> -       format.mbus_code = pipeConfig->code;\n> +       format.code = pipeConfig->code;\n>         format.size = pipeConfig->sensorSize;\n>  \n>         ret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat,\n> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\n> index 5536941ac0d5..5e66ee1d26c1 100644\n> --- a/src/libcamera/pipeline/vimc/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc/vimc.cpp\n> @@ -244,7 +244,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n>  \n>         /* The scaler hardcodes a x3 scale-up ratio. */\n>         V4L2SubdeviceFormat subformat = {};\n> -       subformat.mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8;\n> +       subformat.code = MEDIA_BUS_FMT_SGRBG8_1X8;\n>         subformat.size = { cfg.size.width / 3, cfg.size.height / 3 };\n>  \n>         ret = data->sensor_->setFormat(&subformat);\n> @@ -255,7 +255,7 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n>         if (ret)\n>                 return ret;\n>  \n> -       subformat.mbus_code = pixelformats.find(cfg.pixelFormat)->second;\n> +       subformat.code = pixelformats.find(cfg.pixelFormat)->second;\n>         ret = data->debayer_->setFormat(1, &subformat);\n>         if (ret)\n>                 return ret;\n> diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp\n> index 84ec93154951..66da1edbf542 100644\n> --- a/src/libcamera/v4l2_subdevice.cpp\n> +++ b/src/libcamera/v4l2_subdevice.cpp\n> @@ -757,7 +757,7 @@ const MediaBusFormatInfo &MediaBusFormatInfo::info(uint32_t code)\n>   */\n>  \n>  /**\n> - * \\var V4L2SubdeviceFormat::mbus_code\n> + * \\var V4L2SubdeviceFormat::code\n>   * \\brief The image format bus code\n>   */\n>  \n> @@ -804,10 +804,10 @@ std::ostream &operator<<(std::ostream &out, const V4L2SubdeviceFormat &f)\n>  {\n>         out << f.size << \"-\";\n>  \n> -       const auto it = mediaBusFormatInfo.find(f.mbus_code);\n> +       const auto it = mediaBusFormatInfo.find(f.code);\n>  \n>         if (it == mediaBusFormatInfo.end())\n> -               out << utils::hex(f.mbus_code, 4);\n> +               out << utils::hex(f.code, 4);\n>         else\n>                 out << it->second.name;\n>  \n> @@ -1097,7 +1097,7 @@ int V4L2Subdevice::getFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n>  \n>         format->size.width = subdevFmt.format.width;\n>         format->size.height = subdevFmt.format.height;\n> -       format->mbus_code = subdevFmt.format.code;\n> +       format->code = subdevFmt.format.code;\n>         format->colorSpace = toColorSpace(subdevFmt.format);\n>  \n>         return 0;\n> @@ -1123,7 +1123,7 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n>         subdevFmt.pad = pad;\n>         subdevFmt.format.width = format->size.width;\n>         subdevFmt.format.height = format->size.height;\n> -       subdevFmt.format.code = format->mbus_code;\n> +       subdevFmt.format.code = format->code;\n>         subdevFmt.format.field = V4L2_FIELD_NONE;\n>         if (format->colorSpace) {\n>                 fromColorSpace(format->colorSpace, subdevFmt.format);\n> @@ -1143,7 +1143,7 @@ int V4L2Subdevice::setFormat(unsigned int pad, V4L2SubdeviceFormat *format,\n>  \n>         format->size.width = subdevFmt.format.width;\n>         format->size.height = subdevFmt.format.height;\n> -       format->mbus_code = subdevFmt.format.code;\n> +       format->code = subdevFmt.format.code;\n>         format->colorSpace = toColorSpace(subdevFmt.format);\n>  \n>         return 0;\n> diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp\n> index 2a17cc79ea76..9503d7753fb9 100644\n> --- a/test/camera-sensor.cpp\n> +++ b/test/camera-sensor.cpp\n> @@ -100,7 +100,7 @@ protected:\n>                                                                   MEDIA_BUS_FMT_SBGGR10_1X10,\n>                                                                   MEDIA_BUS_FMT_BGR888_1X24 },\n>                                                                 Size(1024, 768));\n> -               if (format.mbus_code != MEDIA_BUS_FMT_SBGGR10_1X10 ||\n> +               if (format.code != MEDIA_BUS_FMT_SBGGR10_1X10 ||\n>                     format.size != Size(4096, 2160)) {\n>                         cerr << \"Failed to get a suitable format, expected 4096x2160-0x\"\n>                              << utils::hex(MEDIA_BUS_FMT_SBGGR10_1X10)\n> diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp\n> index 125aafd65041..1113cf5bf8cf 100644\n> --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp\n> +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp\n> @@ -75,7 +75,7 @@ int V4L2VideoDeviceTest::init()\n>                 format.fourcc = V4L2PixelFormat(V4L2_PIX_FMT_SBGGR8);\n>  \n>                 V4L2SubdeviceFormat subformat = {};\n> -               subformat.mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8;\n> +               subformat.code = MEDIA_BUS_FMT_SBGGR8_1X8;\n>                 subformat.size = format.size;\n>  \n>                 if (sensor_->setFormat(&subformat))\n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E9C9BBD160\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 15 Mar 2024 01:06:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 93DD562C8C;\n\tFri, 15 Mar 2024 02:06:56 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8BF4F62C87\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 15 Mar 2024 02:06:54 +0100 (CET)","from pendragon.ideasonboard.com\n\t(aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net\n\t[82.37.23.78])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EE8FF673;\n\tFri, 15 Mar 2024 02:06:30 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"vAOEbHTG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1710464791;\n\tbh=FchOXKkG3Q1iXX3I7Fl9yG74h9N3YDGmYGlLLzEg7t4=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=vAOEbHTGlmP6ckNa1WeQ3d+JagS1OL3M/fiIZ1FalNZdq7nGUJfX41ZMOOQfEIxqn\n\tHahxwxVYsbnZWYG/3+Guxvb+RPCoATv1Q7bzD7Hwkg+0uHiaCii9zKatfkPs7nW5mE\n\tpeStsOx0TD4uESJxq5REAH2MaFiszquOXN7V6lfA=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240315001613.2033-7-laurent.pinchart@ideasonboard.com>","References":"<20240315001613.2033-1-laurent.pinchart@ideasonboard.com>\n\t<20240315001613.2033-7-laurent.pinchart@ideasonboard.com>","Subject":"Re: [PATCH v2 06/14] libcamera: v4l2_subdevice: Rename\n\tV4L2SubdeviceFormat::mbus_code to code","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 15 Mar 2024 01:06:52 +0000","Message-ID":"<171046481240.1913896.15460182619213242462@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]