Project

General

Profile

Camera Support #10355

Support for Olympus Stylus1 w. firmware 2.0

Added by Olivier P over 3 years ago. Updated over 3 years ago.

Status:
Fixed
Priority:
Medium
Assignee:
-
Category:
General
Start date:
03/03/2015
Due date:
% Done:

100%

Affected Version:
1.6.3

Description

The Olympus Stylus 1's firmware version 2.0 has changed the camera's model name to: "STYLUS1,1s"
I have added the following to /usr/share/darktable/rawspeed/cameras.xml to avoid a) "broken" thumbnails in the lighttable, b) darktable going into a spinning loop when loading a RAW taken with this firmware.
Note: I get this console message after my change: [adobe_coeff] Warning: partial matching of "OLYMPUS STYLUS1,1s" to "OLYMPUS STYLUS1"
Do you need a RAW file to "fix" the above ?

<Camera make="OLYMPUS IMAGING CORP." model="STYLUS1,1s">
<CFA width="2" height="2">
<Color x="0" y="0">RED</Color>
<Color x="1" y="0">GREEN</Color>
<Color x="0" y="1">GREEN</Color>
<Color x="1" y="1">BLUE</Color>
</CFA>
<Crop x="0" y="0" width="-14" height="0"/>
<Sensor black="200" white="3900"/>
</Camera>

P3101285.JPG - SooC photo (5.97 MB) Olivier P, 03/11/2015 09:21 AM

P3101285.ORF (11.9 MB) Olivier P, 03/11/2015 09:22 AM

PB200011_FW1.0.ORF - Firmware 1.0 (11.8 MB) Olivier P, 03/13/2015 08:25 AM

PC110092.ORF - Firmware 1.1 (12.9 MB) Olivier P, 03/13/2015 08:26 AM

History

#1 Updated by Pedro Côrte-Real over 3 years ago

Could you please attach a sample file?

#2 Updated by Olivier P over 3 years ago

Attached the RAW file & the straight from camera JPEG.

#3 Updated by Pedro Côrte-Real over 3 years ago

Could you please also attach a file from the old firmware version? I'm not sure we have the correct data for it. Either that or the new firmware also changed the color matrix.

#4 Updated by Olivier P over 3 years ago

Sure, PB200011_FW1.0.ORF is with the original firmware (1.0, visible in the "software" exif tag)
PC110092.ORF is with firmware 1.1.

Note: with my initial "hack" firware 2.0 images load & process fine. I assume the matching in adobe_coeff.cc is done based on the camera make tag. I would doubt that Olympus has changed the color matrix (or how it's handled) between 1.0,1.1 and 2.0
The new 2.0 firmware corresponds to features "added" the Olympus Stylus 1*s* which is only released in Japan. Both models are based on the same base platform, no hardware changes. By "fixing" the Stylus 1, I think you'll also gain support for the new model :-)
FWIW: I sent a similar "fix" to the lensfun team.

#5 Updated by Pedro Côrte-Real over 3 years ago

  • % Done changed from 0 to 100
  • Affected Version changed from 1.6.2 to 1.6.3
  • Status changed from New to Fixed

#6 Updated by Pedro Côrte-Real over 3 years ago

  • Status changed from Fixed to In Progress
  • % Done changed from 100 to 50

#7 Updated by Pedro Côrte-Real over 3 years ago

There seems to have been a mixup with the Stylus 1 data. The matrix currently in darktable for this camera was copied in error from the XZ2 matrix. According to adobe the old and new firmware have the same matrix but the old firmware should have a blackpoint of 0 and the new 200. We currently have 200 for the old firmware so maybe 200 is actually correct for both.

#8 Updated by Pedro Côrte-Real over 3 years ago

  • Status changed from In Progress to Fixed
  • Target version set to Candidate for next minor release
  • % Done changed from 50 to 100

This has been fixed in this commit:

https://github.com/darktable-org/darktable/commit/e3ef46cda67b54dd67e5466e6279d12ef9a70c70

It seems the color matrix we had before was wrong, so this sets the correct matrix for both the old and new firmware. Colors should change slightly, hopefully for the better.

Also available in: Atom PDF