| Message ID | 20251204164918.83334-1-mzamazal@redhat.com |
|---|---|
| Headers | show |
| Series |
|
| Related | show |
I think Umang's and my work on this patch series is done, all the patches are Reviewed-By Umang now and CI is happy (https://gitlab.freedesktop.org/camera/libcamera-softisp/-/pipelines/1560575). Unless there are further comments from anybody, it might be worth to retest this version independently: https://gitlab.freedesktop.org/camera/libcamera-softisp/-/tree/pdm-raw-simple?ref_type=heads Milan Zamazal <mzamazal@redhat.com> writes: > This makes raw streams working again in ‘simple’ pipeline when software > ISP is enabled for the given device. At most one raw stream and one > processed stream (possibly both at once) are supported. > > An example ‘cam’ invocation requesting a raw stream rather than a debayered stream: > > cam -c1 -C8 -s role=raw,width=1920,height=1080 -Ffile#.raw > > Or for both raw and processed streams: > > cam -c1 -C8 -Ffile# \ > -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 \ > -s role=raw,width=3280,height=2464,pixelformat=SRGGB8 > > When only a raw stream is requested, there are no exposure/gain > adjustments applied. This could be improved in future, once software > ISP gets a mechanism to gather image statistics without processing and > using them to make the adjustments, or once manual exposure controls are > added to software ISP. In the meantime, exposure must be changed > externally. > > Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Tested-by: Pavel Machek <pavel@ucw.cz> > > Changes in v17: > - The patch moving colour space logging took out of the series. > - A comment about stream sizes changed to plural. > - Logging message of max stream sizes improved as suggested by Umang. > - The patch handling max stream sizes squashed to the validation patch > as requested by Umang. > > Changes in v16: > - Buffer completion with processed+raw streams fixed as suggested by > Umang. > - A spelling fix. > - Patch fixing a misplaced LOG added. > - Patch fixing invalid raw stream size adjustment added. > > Changes in v15: > - The removed useConversion_ part of the condition for request > completion on error returned back. > - Missing Reviewed-by tags added. > - Duplicate Signed-off-by tags. > > Changes in v14: > - Some redundant conditions removed. > - Missing data->rawStream_ reset to nullptr added in configure. > - SimpleCameraConfiguration::validate() brought close to Umang’s version. > - Spelling typo in log messages fixed. > > Changes in v13: > - The redundant check for multiple raw streams in > SimplePipelineHandler::configure() removed. > - Typo in a source code comment fixed. > - Information about the number of streams in a commit message corrected. > > Changes in v12: > - Formatting change suggested by Laurent. > - The patch setting the number of software ISP streams moved after the > patches enabling raw streams. > - Colour spaces are set and validated according to the pixel format and > only pixel format. > > Changes in v11: > - Use rawStream_ pointer to a raw stream rather than rawRequested_ and > processedRequested_ flags, as suggested by Umang. > - Selection of pipeline configurations reworked, partially incorporating > Umang’s ideas and permitting adjustments of raw stream configurations > if they don’t match the processed stream or what’s available from the > sensor. > - Tested-by tags removed from here because the changes are substantial. > v11 works better for me than both v10 and Umang’s RFC but it requires > independent testing. > > Changes in v10: > - Missing initialisation of swIspEnabled_ added. > - "Add plain output configurations" patch dropped. Raw configurations > can be built implicitly from capture parameters. Related adjustments > in "Validate raw stream configurations". > - "Identify requested stream roles" patch dropped and merged into > followup patches; camera configuration is updated in validate() and > not in generateConfiguration() now. > - A commit title improved as suggested by Umang. > > Changes in v9: > - Fix of calling a wrong output buffer allocator when both raw and > processed streams are used. > > Changes in v8: > - A missing `status = Adjusted' added to > SimpleCameraConfiguration::validate. > - Code comments regarding raw colour space for raw requested roles > added. > - Dropped raw format helpers. > > Changes in v7: > - Rebased on current master. > > Changes in v6: > - An unnecessary copy of formats avoided. > - rawRequested_ and processedrequested_ set to false when there are no > roles. > - rawRequested_ and processedrequested_ updated in > SimpleCameraConfiguration::validate(). > > Changes in v5: > - Possible temporary segfault in the patch adding plain output > configurations avoided. > - PixelFormatInfo::isRaw() helper added. > - SimplePipelineHandler::setUpFormatSizes replaced with a lambda > function. > - SimpleCameraData::{rawRequested_,processedRequested_} are set in > SimpleCameraConfiguration first and copied to SimpleCameraData only > after successful configure(). > > Changes in v4: > - Broken range pruning due to passing a value rather than a reference > fixed. > - New common function isFormatRaw introduced. > - The patch assigning colour spaces in the simple pipeline, previously > posted separately, included in this series, as the first patch. It > can still be handled separately; in any case the rest sort of depends > on it. > - Setting metadataRequired to false where needed to prevent freezes and > assertion errors; related to metadata reporting support merged to > master since v3. > > Changes in v3: > - Significantly reworked, with both functional and clarity improvements. > The level of guesswork and confusion is hopefully reduced enough now > to drop the RFC prefix. > - The number of streams is set to 2 only with software ISP. > - SimpleCameraData::pipeConfig_ nullptr check patch dropped. > - PPM/raw file output patch dropped from this series. Let’s handle this > separately as the patch series is already complex enough. > > Changes in v2: > - Completely reworked. > - Extended to be able to produce a raw stream together with a processed > stream. > > Milan Zamazal (7): > libcamera: simple: Exclude raw configurations from output conversions > libcamera: simple: Handle processed and raw formats separately > libcamera: simple: Validate raw stream configurations > libcamera: simple: Don't enforce conversion with an added raw stream > libcamera: simple: Set the number of software ISP streams to 2 > libcamera: simple: Require metadata only when software ISP is used > libcamera: simple: Make raw streams working > > src/libcamera/pipeline/simple/simple.cpp | 262 +++++++++++++++++------ > 1 file changed, 191 insertions(+), 71 deletions(-)
Quoting Milan Zamazal (2025-12-12 21:43:21) > I think Umang's and my work on this patch series is done, all the > patches are Reviewed-By Umang now and CI is happy > (https://gitlab.freedesktop.org/camera/libcamera-softisp/-/pipelines/1560575). > Unless there are further comments from anybody, it might be worth to > retest this version independently: https://gitlab.freedesktop.org/camera/libcamera-softisp/-/tree/pdm-raw-simple?ref_type=heads Just retested. There's a merge conflict against "libcamera: simple: Move colour space logging after adjustment" which is the current HEAD - but it's easy to solve, and I can easily verify the resolution is correct. Works to support capture in both ARGB and SGRBG10_CSI2P in camshark. https://gitlab.freedesktop.org/camera/libcamera/-/pipelines/1566422 says success so merging! Argh, except the merge checks fail "Missing co-developer 'Umang Jain <uajain@igalia.com>' Signed-off-by in commit 75b1067adf176636f9efd9c2c8a5216bbc87e799" Umang, could you reply to "libcamera: simple: Validate raw stream configurations" with your SoB please, then I can merge. Thanks Kieran > > Milan Zamazal <mzamazal@redhat.com> writes: > > > This makes raw streams working again in ‘simple’ pipeline when software > > ISP is enabled for the given device. At most one raw stream and one > > processed stream (possibly both at once) are supported. > > > > An example ‘cam’ invocation requesting a raw stream rather than a debayered stream: > > > > cam -c1 -C8 -s role=raw,width=1920,height=1080 -Ffile#.raw > > > > Or for both raw and processed streams: > > > > cam -c1 -C8 -Ffile# \ > > -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 \ > > -s role=raw,width=3280,height=2464,pixelformat=SRGGB8 > > > > When only a raw stream is requested, there are no exposure/gain > > adjustments applied. This could be improved in future, once software > > ISP gets a mechanism to gather image statistics without processing and > > using them to make the adjustments, or once manual exposure controls are > > added to software ISP. In the meantime, exposure must be changed > > externally. > > > > Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > Tested-by: Pavel Machek <pavel@ucw.cz> > > > > Changes in v17: > > - The patch moving colour space logging took out of the series. > > - A comment about stream sizes changed to plural. > > - Logging message of max stream sizes improved as suggested by Umang. > > - The patch handling max stream sizes squashed to the validation patch > > as requested by Umang. > > > > Changes in v16: > > - Buffer completion with processed+raw streams fixed as suggested by > > Umang. > > - A spelling fix. > > - Patch fixing a misplaced LOG added. > > - Patch fixing invalid raw stream size adjustment added. > > > > Changes in v15: > > - The removed useConversion_ part of the condition for request > > completion on error returned back. > > - Missing Reviewed-by tags added. > > - Duplicate Signed-off-by tags. > > > > Changes in v14: > > - Some redundant conditions removed. > > - Missing data->rawStream_ reset to nullptr added in configure. > > - SimpleCameraConfiguration::validate() brought close to Umang’s version. > > - Spelling typo in log messages fixed. > > > > Changes in v13: > > - The redundant check for multiple raw streams in > > SimplePipelineHandler::configure() removed. > > - Typo in a source code comment fixed. > > - Information about the number of streams in a commit message corrected. > > > > Changes in v12: > > - Formatting change suggested by Laurent. > > - The patch setting the number of software ISP streams moved after the > > patches enabling raw streams. > > - Colour spaces are set and validated according to the pixel format and > > only pixel format. > > > > Changes in v11: > > - Use rawStream_ pointer to a raw stream rather than rawRequested_ and > > processedRequested_ flags, as suggested by Umang. > > - Selection of pipeline configurations reworked, partially incorporating > > Umang’s ideas and permitting adjustments of raw stream configurations > > if they don’t match the processed stream or what’s available from the > > sensor. > > - Tested-by tags removed from here because the changes are substantial. > > v11 works better for me than both v10 and Umang’s RFC but it requires > > independent testing. > > > > Changes in v10: > > - Missing initialisation of swIspEnabled_ added. > > - "Add plain output configurations" patch dropped. Raw configurations > > can be built implicitly from capture parameters. Related adjustments > > in "Validate raw stream configurations". > > - "Identify requested stream roles" patch dropped and merged into > > followup patches; camera configuration is updated in validate() and > > not in generateConfiguration() now. > > - A commit title improved as suggested by Umang. > > > > Changes in v9: > > - Fix of calling a wrong output buffer allocator when both raw and > > processed streams are used. > > > > Changes in v8: > > - A missing `status = Adjusted' added to > > SimpleCameraConfiguration::validate. > > - Code comments regarding raw colour space for raw requested roles > > added. > > - Dropped raw format helpers. > > > > Changes in v7: > > - Rebased on current master. > > > > Changes in v6: > > - An unnecessary copy of formats avoided. > > - rawRequested_ and processedrequested_ set to false when there are no > > roles. > > - rawRequested_ and processedrequested_ updated in > > SimpleCameraConfiguration::validate(). > > > > Changes in v5: > > - Possible temporary segfault in the patch adding plain output > > configurations avoided. > > - PixelFormatInfo::isRaw() helper added. > > - SimplePipelineHandler::setUpFormatSizes replaced with a lambda > > function. > > - SimpleCameraData::{rawRequested_,processedRequested_} are set in > > SimpleCameraConfiguration first and copied to SimpleCameraData only > > after successful configure(). > > > > Changes in v4: > > - Broken range pruning due to passing a value rather than a reference > > fixed. > > - New common function isFormatRaw introduced. > > - The patch assigning colour spaces in the simple pipeline, previously > > posted separately, included in this series, as the first patch. It > > can still be handled separately; in any case the rest sort of depends > > on it. > > - Setting metadataRequired to false where needed to prevent freezes and > > assertion errors; related to metadata reporting support merged to > > master since v3. > > > > Changes in v3: > > - Significantly reworked, with both functional and clarity improvements. > > The level of guesswork and confusion is hopefully reduced enough now > > to drop the RFC prefix. > > - The number of streams is set to 2 only with software ISP. > > - SimpleCameraData::pipeConfig_ nullptr check patch dropped. > > - PPM/raw file output patch dropped from this series. Let’s handle this > > separately as the patch series is already complex enough. > > > > Changes in v2: > > - Completely reworked. > > - Extended to be able to produce a raw stream together with a processed > > stream. > > > > Milan Zamazal (7): > > libcamera: simple: Exclude raw configurations from output conversions > > libcamera: simple: Handle processed and raw formats separately > > libcamera: simple: Validate raw stream configurations > > libcamera: simple: Don't enforce conversion with an added raw stream > > libcamera: simple: Set the number of software ISP streams to 2 > > libcamera: simple: Require metadata only when software ISP is used > > libcamera: simple: Make raw streams working > > > > src/libcamera/pipeline/simple/simple.cpp | 262 +++++++++++++++++------ > > 1 file changed, 191 insertions(+), 71 deletions(-) >
This makes raw streams working again in ‘simple’ pipeline when software ISP is enabled for the given device. At most one raw stream and one processed stream (possibly both at once) are supported. An example ‘cam’ invocation requesting a raw stream rather than a debayered stream: cam -c1 -C8 -s role=raw,width=1920,height=1080 -Ffile#.raw Or for both raw and processed streams: cam -c1 -C8 -Ffile# \ -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 \ -s role=raw,width=3280,height=2464,pixelformat=SRGGB8 When only a raw stream is requested, there are no exposure/gain adjustments applied. This could be improved in future, once software ISP gets a mechanism to gather image statistics without processing and using them to make the adjustments, or once manual exposure controls are added to software ISP. In the meantime, exposure must be changed externally. Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Tested-by: Pavel Machek <pavel@ucw.cz> Changes in v17: - The patch moving colour space logging took out of the series. - A comment about stream sizes changed to plural. - Logging message of max stream sizes improved as suggested by Umang. - The patch handling max stream sizes squashed to the validation patch as requested by Umang. Changes in v16: - Buffer completion with processed+raw streams fixed as suggested by Umang. - A spelling fix. - Patch fixing a misplaced LOG added. - Patch fixing invalid raw stream size adjustment added. Changes in v15: - The removed useConversion_ part of the condition for request completion on error returned back. - Missing Reviewed-by tags added. - Duplicate Signed-off-by tags. Changes in v14: - Some redundant conditions removed. - Missing data->rawStream_ reset to nullptr added in configure. - SimpleCameraConfiguration::validate() brought close to Umang’s version. - Spelling typo in log messages fixed. Changes in v13: - The redundant check for multiple raw streams in SimplePipelineHandler::configure() removed. - Typo in a source code comment fixed. - Information about the number of streams in a commit message corrected. Changes in v12: - Formatting change suggested by Laurent. - The patch setting the number of software ISP streams moved after the patches enabling raw streams. - Colour spaces are set and validated according to the pixel format and only pixel format. Changes in v11: - Use rawStream_ pointer to a raw stream rather than rawRequested_ and processedRequested_ flags, as suggested by Umang. - Selection of pipeline configurations reworked, partially incorporating Umang’s ideas and permitting adjustments of raw stream configurations if they don’t match the processed stream or what’s available from the sensor. - Tested-by tags removed from here because the changes are substantial. v11 works better for me than both v10 and Umang’s RFC but it requires independent testing. Changes in v10: - Missing initialisation of swIspEnabled_ added. - "Add plain output configurations" patch dropped. Raw configurations can be built implicitly from capture parameters. Related adjustments in "Validate raw stream configurations". - "Identify requested stream roles" patch dropped and merged into followup patches; camera configuration is updated in validate() and not in generateConfiguration() now. - A commit title improved as suggested by Umang. Changes in v9: - Fix of calling a wrong output buffer allocator when both raw and processed streams are used. Changes in v8: - A missing `status = Adjusted' added to SimpleCameraConfiguration::validate. - Code comments regarding raw colour space for raw requested roles added. - Dropped raw format helpers. Changes in v7: - Rebased on current master. Changes in v6: - An unnecessary copy of formats avoided. - rawRequested_ and processedrequested_ set to false when there are no roles. - rawRequested_ and processedrequested_ updated in SimpleCameraConfiguration::validate(). Changes in v5: - Possible temporary segfault in the patch adding plain output configurations avoided. - PixelFormatInfo::isRaw() helper added. - SimplePipelineHandler::setUpFormatSizes replaced with a lambda function. - SimpleCameraData::{rawRequested_,processedRequested_} are set in SimpleCameraConfiguration first and copied to SimpleCameraData only after successful configure(). Changes in v4: - Broken range pruning due to passing a value rather than a reference fixed. - New common function isFormatRaw introduced. - The patch assigning colour spaces in the simple pipeline, previously posted separately, included in this series, as the first patch. It can still be handled separately; in any case the rest sort of depends on it. - Setting metadataRequired to false where needed to prevent freezes and assertion errors; related to metadata reporting support merged to master since v3. Changes in v3: - Significantly reworked, with both functional and clarity improvements. The level of guesswork and confusion is hopefully reduced enough now to drop the RFC prefix. - The number of streams is set to 2 only with software ISP. - SimpleCameraData::pipeConfig_ nullptr check patch dropped. - PPM/raw file output patch dropped from this series. Let’s handle this separately as the patch series is already complex enough. Changes in v2: - Completely reworked. - Extended to be able to produce a raw stream together with a processed stream. Milan Zamazal (7): libcamera: simple: Exclude raw configurations from output conversions libcamera: simple: Handle processed and raw formats separately libcamera: simple: Validate raw stream configurations libcamera: simple: Don't enforce conversion with an added raw stream libcamera: simple: Set the number of software ISP streams to 2 libcamera: simple: Require metadata only when software ISP is used libcamera: simple: Make raw streams working src/libcamera/pipeline/simple/simple.cpp | 262 +++++++++++++++++------ 1 file changed, 191 insertions(+), 71 deletions(-)