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

Fix eos imageformat #1031

Merged
merged 3 commits into from
Sep 27, 2024
Merged

Fix eos imageformat #1031

merged 3 commits into from
Sep 27, 2024

Commits on Sep 26, 2024

  1. ptp2: use hex format in debug output for GenericTable enum lookups

    We use hex format for the same information in other parts of the log file.
    axxel committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    c053bd7 View commit details
    Browse the repository at this point in the history
  2. ptp2: fix missing JPEG info for RAW+JPEG formats of 1DX and R5m2

    This brings my original ptp_unpack_EOS_ImageFormat() documentation
    up-to-date with new M1/M2 and new 0/1 compression info added with 5Ds,
    1DXm2 and R5m2.
    
    It also fixes the problem that led to a double entry of e.g. `RAW` in the
    imageformat config output visible in gphoto#1028 and also in the 1DX sample here:
    https://github.com/gphoto/libgphoto2/blob/5b7f7c168dd3e86f43b590a7456883e1dec11709/camlibs/ptp2/cameras/canon-eos-1dx.txt#L255-L269
    axxel committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    601734e View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. new EOS ImageFormat get/set implementation

    The current `imageformat` with it's table lookup for every RAW+JPEG
    combination became cumbersome to maintain and outdated. This leads to
    e.g. lost of unsupported JPEG variants for e.g. the 5Ds, R5m2, 1DX.
    
    The used naming also became inconsistent with the addition of the 1DXm2
    labels in gphoto@1402f88
    
    This patch adds an (incompatible) new imageformat2 widget as a temporary
    test to then hopefully replace the existing imageformat. I expect this new
    implementation to fix all "Unknown value" occurrences of all currently
    available EOS cameras.
    
    I chose to do away with the verbose and arbitrary labels like
    "Smaller Fine JPEG" and instead tried to mimic the strings that are
    actually used by the cameras, like 'S2', etc. I added a 'c' for the
    higher compression versions, along the lines of 'cRAW'. The 'c' could
    also stand for 'coarse' to describe the blocky curve that is used by the
    Canons to distinguish between lower and higher Jpeg quality.
    
    Here is some sample output from the 5Ds:
    Choice: 5 cM2
    Choice: 6 S1
    Choice: 7 cS1
    Choice: 8 S2
    Choice: 9 S3
    Choice: 10 RAW + L
    Choice: 11 RAW + cL
    Choice: 12 RAW + M1
    Choice: 13 RAW + cM1
    axxel committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    7a254b8 View commit details
    Browse the repository at this point in the history