Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Hasselblad uncompressed 3FR support #466

Merged
merged 1 commit into from
May 3, 2023

Conversation

kmilos
Copy link
Contributor

@kmilos kmilos commented May 2, 2023

As found in X1D, X1D II 50C and X2D 100C (all available on RPU).

Split from #463

Also bumps size checks to 12000 x 8842 to support both H6D-100 and X2D 100C sensors.

@kmilos kmilos requested a review from LebedevRI as a code owner May 2, 2023 13:03
@kmilos kmilos changed the title Hasselblad X2D 100C support Add Hasselblad uncompressed 3FR support May 2, 2023
@@ -44,7 +44,7 @@ HasselbladDecompressor::HasselbladDecompressor(const RawImage& mRaw_,

// FIXME: could be wrong. max "active pixels" - "100 MP"
if (mRaw->dim.x == 0 || mRaw->dim.y == 0 || mRaw->dim.x % 2 != 0 ||
mRaw->dim.x > 12000 || mRaw->dim.y > 8816) {
mRaw->dim.x > 12000 || mRaw->dim.y > 8842) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(nitpick) Like i said, this is adding support for uncompressed, why is it touching something else?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ended up not merging this part.
After the main change of this PR, no RPU sample fails with this error,
which leads me to believe this was superficial.
This is why i'm asking for small separate changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In theory, the tethered download from camera will produce a compressed .FFF file of this size, but indeed, there is no such sample in RPU currently. Maybe @kkempter-getswift can supply one as well please?

@LebedevRI
Copy link
Member

Thank you!

@LebedevRI LebedevRI merged commit b83e075 into darktable-org:develop May 3, 2023
40 of 41 checks passed
@kmilos kmilos deleted the hassy_uncompressed branch May 3, 2023 08:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Resolved
Development

Successfully merging this pull request may close these issues.

None yet

2 participants