diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2020-09-27 14:27:19 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2020-09-27 14:27:19 +0200 |
| commit | 3d0cb0d8731d024094fa28ecacb2fd2aa74fb126 (patch) | |
| tree | a68c94a9cd824e65d4eda490ff1986c839dda01b | |
| parent | b8f845b924538b9cd8324edd5acde532c4e9daf7 (diff) | |
| download | libgphoto2-3d0cb0d8731d024094fa28ecacb2fd2aa74fb126.tar.gz | |
added liveview image quality as override
| -rw-r--r-- | camlibs/ptp2/library.c | 8 | ||||
| -rw-r--r-- | camlibs/ptp2/ptp.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index c306dc9fd..f5d42ddf4 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -388,7 +388,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) { } if (di->VendorExtensionID == PTP_VENDOR_FUJI) { - C_MEM (di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported[0])*(di->DevicePropertiesSupported_len + 9))); + C_MEM (di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported[0])*(di->DevicePropertiesSupported_len + 11))); di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+0] = PTP_DPC_ExposureTime; di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+1] = PTP_DPC_FNumber; di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+2] = 0xd38c; /* PC Mode */ @@ -397,8 +397,10 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) { di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+5] = 0xd347; /* Focus Position */ di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+6] = PTP_DPC_FUJI_LensZoomPos; di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+7] = 0xd242; - di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+8] = PTP_DPC_FUJI_LiveViewImageSize; - di->DevicePropertiesSupported_len += 9; + di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+8] = PTP_DPC_FUJI_LiveViewImageSize; /* xt3 confirmed */ + di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+9] = 0xd168; /* video out on/off (unconfirmed) */ + di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+10] = PTP_DPC_FUJI_LiveViewImageQuality; /* xt3 confirmed */ + di->DevicePropertiesSupported_len += 11; if (ptp_operation_issupported(&camera->pl->params, PTP_OC_FUJI_GetDeviceInfo)) { uint16_t *props; diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index 3c59dcfef..b391b1c87 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -2648,7 +2648,9 @@ typedef struct _PTPCanonEOSDeviceInfo { #define PTP_DPC_FUJI_ExposureIndex 0xD02A #define PTP_DPC_FUJI_MovieISO 0xD02B #define PTP_DPC_FUJI_VideoMode 0xD15C +#define PTP_DPC_FUJI_VideoOutOnOff 0xD168 #define PTP_DPC_FUJI_LensZoomPos 0xD170 +#define PTP_DPC_FUJI_LiveViewImageQuality 0xD173 #define PTP_DPC_FUJI_LiveViewImageSize 0xD174 #define PTP_DPC_FUJI_FocusMeteringMode 0xD17C #define PTP_DPC_FUJI_IOPCode 0xD184 @@ -2686,6 +2688,7 @@ typedef struct _PTPCanonEOSDeviceInfo { #define PTP_DPC_FUJI_ImageAspectRatio 0xD241 #define PTP_DPC_FUJI_BatteryLevel 0xD242 /* Movie Sensitivity???? */ #define PTP_DPC_FUJI_FocusPoint 0xD347 +#define PTP_DPC_FUJI_DateTimeDispFormat 0xD352 #define PTP_DPC_FUJI_FileNamePrefix1 0xD365 #define PTP_DPC_FUJI_FileNamePrefix2 0xD366 #define PTP_DPC_FUJI_LensZoomPosCaps 0xD38C |