diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h index b5348c6fe..13fa75826 100644 --- a/include/libcamera/internal/software_isp/swstats_cpu.h +++ b/include/libcamera/internal/software_isp/swstats_cpu.h @@ -98,6 +98,9 @@ private: /* Bayer 10 bpp packed */ void statsBGGR10PLine0(const uint8_t *src[], SwIspStats &stats); void statsGBRG10PLine0(const uint8_t *src[], SwIspStats &stats); + /* Bayer 12 bpp packed */ + void statsBGGR12PLine0(const uint8_t *src[], SwIspStats &stats); + void statsGBRG12PLine0(const uint8_t *src[], SwIspStats &stats); void processBayerFrame2(MappedFrameBuffer &in); diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index 1f9b24da0..d2596d32b 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -351,6 +351,78 @@ void DebayerCpu::debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]) } } +template +void DebayerCpu::debayer12P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]) +{ + const int widthInBytes = window_.width * 3 / 2; + const uint8_t *prev = src[0]; + const uint8_t *curr = src[1]; + const uint8_t *next = src[2]; + + for (int x = 0; x < widthInBytes;) { + /* Even pixel */ + BGGR_BGR888(2, 1, 1) + /* Odd pixel BGGR -> GBRG */ + GBRG_BGR888(1, 2, 1) + /* Skip 3rd src byte with 2 x 4 least-significant-bits */ + x++; + } +} + +template +void DebayerCpu::debayer12P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]) +{ + const int widthInBytes = window_.width * 3 / 2; + const uint8_t *prev = src[0]; + const uint8_t *curr = src[1]; + const uint8_t *next = src[2]; + + for (int x = 0; x < widthInBytes;) { + /* Even pixel */ + GRBG_BGR888(2, 1, 1) + /* Odd pixel GRBG -> RGGB */ + RGGB_BGR888(1, 2, 1) + /* Skip 3rd src byte with 2 x 4 least-significant-bits */ + x++; + } +} + +template +void DebayerCpu::debayer12P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]) +{ + const int widthInBytes = window_.width * 3 / 2; + const uint8_t *prev = src[0]; + const uint8_t *curr = src[1]; + const uint8_t *next = src[2]; + + for (int x = 0; x < widthInBytes;) { + /* Even pixel */ + GBRG_BGR888(2, 1, 1) + /* Odd pixel GBRG -> BGGR */ + BGGR_BGR888(1, 2, 1) + /* Skip 3rd src byte with 2 x 4 least-significant-bits */ + x++; + } +} + +template +void DebayerCpu::debayer12P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]) +{ + const int widthInBytes = window_.width * 3 / 2; + const uint8_t *prev = src[0]; + const uint8_t *curr = src[1]; + const uint8_t *next = src[2]; + + for (int x = 0; x < widthInBytes;) { + /* Even pixel */ + RGGB_BGR888(2, 1, 1) + /* Odd pixel RGGB -> GRBG */ + GRBG_BGR888(1, 2, 1) + /* Skip 3rd src byte with 2 x 4 least-significant-bits */ + x++; + } +} + /* * Setup the Debayer object according to the passed in parameters. * Return 0 on success, a negative errno value on failure @@ -360,6 +432,12 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf { BayerFormat bayerFormat = BayerFormat::fromPixelFormat(inputFormat); + std::vector outputFormats = { formats::RGB888, + formats::XRGB8888, + formats::ARGB8888, + formats::BGR888, + formats::XBGR8888, + formats::ABGR8888 }; if ((bayerFormat.bitDepth == 8 || bayerFormat.bitDepth == 10 || bayerFormat.bitDepth == 12) && bayerFormat.packing == BayerFormat::Packing::None && @@ -367,12 +445,7 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf config.bpp = (bayerFormat.bitDepth + 7) & ~7; config.patternSize.width = 2; config.patternSize.height = 2; - config.outputFormats = std::vector({ formats::RGB888, - formats::XRGB8888, - formats::ARGB8888, - formats::BGR888, - formats::XBGR8888, - formats::ABGR8888 }); + config.outputFormats = outputFormats; return 0; } @@ -382,12 +455,17 @@ int DebayerCpu::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf config.bpp = 10; config.patternSize.width = 4; /* 5 bytes per *4* pixels */ config.patternSize.height = 2; - config.outputFormats = std::vector({ formats::RGB888, - formats::XRGB8888, - formats::ARGB8888, - formats::BGR888, - formats::XBGR8888, - formats::ABGR8888 }); + config.outputFormats = outputFormats; + return 0; + } + + if (bayerFormat.bitDepth == 12 && + bayerFormat.packing == BayerFormat::Packing::CSI2 && + isStandardBayerOrder(bayerFormat.order)) { + config.bpp = 12; + config.patternSize.width = 2; /* 3 bytes per *2* pixels */ + config.patternSize.height = 2; + config.outputFormats = outputFormats; return 0; } @@ -538,6 +616,26 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, } } + if (bayerFormat.bitDepth == 12 && + bayerFormat.packing == BayerFormat::Packing::CSI2) { + switch (bayerFormat.order) { + case BayerFormat::BGGR: + SET_DEBAYER_METHODS(debayer12P_BGBG_BGR888, debayer12P_GRGR_BGR888) + return 0; + case BayerFormat::GBRG: + SET_DEBAYER_METHODS(debayer12P_GBGB_BGR888, debayer12P_RGRG_BGR888) + return 0; + case BayerFormat::GRBG: + SET_DEBAYER_METHODS(debayer12P_GRGR_BGR888, debayer12P_BGBG_BGR888) + return 0; + case BayerFormat::RGGB: + SET_DEBAYER_METHODS(debayer12P_RGRG_BGR888, debayer12P_GBGB_BGR888) + return 0; + default: + break; + } + } + return invalidFmt(); } diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h index 68da95083..5281c65cb 100644 --- a/src/libcamera/software_isp/debayer_cpu.h +++ b/src/libcamera/software_isp/debayer_cpu.h @@ -110,6 +110,15 @@ private: void debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]); template void debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]); + /* CSI-2 packed 12-bit raw bayer format (all the 4 orders) */ + template + void debayer12P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]); + template + void debayer12P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]); + template + void debayer12P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]); + template + void debayer12P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]); static int getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config); static int getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config); diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 7b9e02d90..9ea892f11 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -52,16 +52,18 @@ int DebayerEGL::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf BayerFormat bayerFormat = BayerFormat::fromPixelFormat(inputFormat); + std::vector outputFormats = { formats::XRGB8888, + formats::ARGB8888, + formats::XBGR8888, + formats::ABGR8888 }; + if ((bayerFormat.bitDepth == 8 || bayerFormat.bitDepth == 10) && bayerFormat.packing == BayerFormat::Packing::None && isStandardBayerOrder(bayerFormat.order)) { config.bpp = (bayerFormat.bitDepth + 7) & ~7; config.patternSize.width = 2; config.patternSize.height = 2; - config.outputFormats = std::vector({ formats::XRGB8888, - formats::ARGB8888, - formats::XBGR8888, - formats::ABGR8888 }); + config.outputFormats = outputFormats; return 0; } @@ -71,10 +73,17 @@ int DebayerEGL::getInputConfig(PixelFormat inputFormat, DebayerInputConfig &conf config.bpp = 10; config.patternSize.width = 4; /* 5 bytes per *4* pixels */ config.patternSize.height = 2; - config.outputFormats = std::vector({ formats::XRGB8888, - formats::ARGB8888, - formats::XBGR8888, - formats::ABGR8888 }); + config.outputFormats = outputFormats; + return 0; + } + + if (bayerFormat.bitDepth == 12 && + bayerFormat.packing == BayerFormat::Packing::CSI2 && + isStandardBayerOrder(bayerFormat.order)) { + config.bpp = 12; + config.patternSize.width = 2; /* 3 bytes per *2* pixels */ + config.patternSize.height = 2; + config.outputFormats = outputFormats; return 0; } diff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp index 0815ec9a3..2f57a5f33 100644 --- a/src/libcamera/software_isp/swstats_cpu.cpp +++ b/src/libcamera/software_isp/swstats_cpu.cpp @@ -323,6 +323,58 @@ void SwStatsCpu::statsGBRG10PLine0(const uint8_t *src[], SwIspStats &stats) SWSTATS_FINISH_LINE_STATS() } +void SwStatsCpu::statsBGGR12PLine0(const uint8_t *src[], SwIspStats &stats) +{ + const uint8_t *src0 = src[1] + window_.x * 3 / 2; + const uint8_t *src1 = src[2] + window_.x * 3 / 2; + const unsigned int widthInBytes = window_.width * 3 / 2; + + SWSTATS_START_LINE_STATS(uint8_t) + + if (swapLines_) + std::swap(src0, src1); + + /* x += 6 sample every other 2x2 block */ + for (unsigned int x = 0; x < widthInBytes; x += 6) { + b = src0[x]; + g = src0[x + 1]; + g2 = src1[x]; + r = src1[x + 1]; + + g = (g + g2) / 2; + + SWSTATS_ACCUMULATE_LINE_STATS(1) + } + + SWSTATS_FINISH_LINE_STATS() +} + +void SwStatsCpu::statsGBRG12PLine0(const uint8_t *src[], SwIspStats &stats) +{ + const uint8_t *src0 = src[1] + window_.x * 3 / 2; + const uint8_t *src1 = src[2] + window_.x * 3 / 2; + const unsigned int widthInBytes = window_.width * 3 / 2; + + SWSTATS_START_LINE_STATS(uint8_t) + + if (swapLines_) + std::swap(src0, src1); + + /* x += 6 sample every other 2x2 block */ + for (unsigned int x = 0; x < widthInBytes; x += 6) { + g = src0[x]; + b = src0[x + 1]; + r = src1[x]; + g2 = src1[x + 1]; + + g = (g + g2) / 2; + + SWSTATS_ACCUMULATE_LINE_STATS(1) + } + + SWSTATS_FINISH_LINE_STATS() +} + /** * \brief Reset state to start statistics gathering for a new frame * \param[in] frame The frame number @@ -440,10 +492,17 @@ int SwStatsCpu::configure(const StreamConfiguration &inputCfg, unsigned int stat } } - if (bayerFormat.bitDepth == 10 && + uint8_t bitDepth = bayerFormat.bitDepth; + + if ((bitDepth == 10 || bitDepth == 12) && bayerFormat.packing == BayerFormat::Packing::CSI2) { + if (bitDepth == 10) + patternSize_.width = 4; /* 5 bytes per *4* pixels */ + else + patternSize_.width = 2; /* 3 bytes for *2* pixels */ + patternSize_.height = 2; - patternSize_.width = 4; /* 5 bytes per *4* pixels */ + /* Skip every 3th and 4th line, sample every other 2x2 block */ ySkipMask_ = 0x02; xShift_ = 0; @@ -453,12 +512,12 @@ int SwStatsCpu::configure(const StreamConfiguration &inputCfg, unsigned int stat switch (bayerFormat.order) { case BayerFormat::BGGR: case BayerFormat::GRBG: - stats0_ = &SwStatsCpu::statsBGGR10PLine0; + stats0_ = (bitDepth == 10) ? &SwStatsCpu::statsBGGR10PLine0 : &SwStatsCpu::statsBGGR12PLine0; swapLines_ = bayerFormat.order == BayerFormat::GRBG; return 0; case BayerFormat::GBRG: case BayerFormat::RGGB: - stats0_ = &SwStatsCpu::statsGBRG10PLine0; + stats0_ = (bitDepth == 10) ? &SwStatsCpu::statsGBRG10PLine0 : &SwStatsCpu::statsGBRG12PLine0; swapLines_ = bayerFormat.order == BayerFormat::RGGB; return 0; default: