From b5b6fb67ccbd77909b6c2db06beb43100c65cff2 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 18 Nov 2012 20:37:26 +0000 Subject: [PATCH] raw compression decoding git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14140 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/ptp2/config.c | 9 +++++++++ camlibs/ptp2/ptp.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index fbf73d9c2..4f68f2b4c 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -3748,6 +3748,12 @@ static struct deviceproptableu8 nikon_d90_meterofftime[] = { GENERIC8TABLE(Nikon_D90_MeterOffTime,nikon_d90_meterofftime) +static struct deviceproptableu8 nikon_rawcompression[] = { + { N_("Lossless"), 0x00, 0 }, + { N_("Lossy"), 0x01, 0 }, +}; +GENERIC8TABLE(Nikon_RawCompression,nikon_rawcompression) + static struct deviceproptableu8 nikon_d3s_jpegcompressionpolicy[] = { { N_("Size Priority"), 0x00, 0 }, { N_("Optimal quality"),0x01, 0 }, @@ -5431,6 +5437,7 @@ static struct submenu capture_settings_menu[] = { { N_("Hue Adjustment"), "hueadjustment", PTP_DPC_NIKON_HueAdjustment, PTP_VENDOR_NIKON, PTP_DTC_INT8, _get_Nikon_HueAdjustment, _put_Nikon_HueAdjustment }, { N_("Auto Exposure Bracketing"), "aeb", PTP_DPC_CANON_EOS_AEB, PTP_VENDOR_CANON, PTP_DTC_UINT16, _get_Canon_EOS_AEB, _put_Canon_EOS_AEB}, { N_("Movie Sound"), "moviesound", PTP_DPC_NIKON_MovVoice, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OffOn_UINT8, _put_Nikon_OffOn_UINT8}, + { N_("Manual Movie Setting"), "manualmoviesetting", PTP_DPC_NIKON_ManualMovieSetting, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OnOff_UINT8, _put_Nikon_OnOff_UINT8 }, { N_("Microphone"), "microphone", PTP_DPC_NIKON_MovMicrophone, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_Microphone, _put_Nikon_Microphone}, { N_("Reverse Indicators"), "reverseindicators", PTP_DPC_NIKON_IndicatorDisp, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OffOn_UINT8, _put_Nikon_OffOn_UINT8}, { N_("Auto Distortion Control"), "autodistortioncontrol", PTP_DPC_NIKON_AutoDistortionControl, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_OffOn_UINT8, _put_Nikon_OffOn_UINT8}, @@ -5499,6 +5506,8 @@ static struct submenu nikon_generic_capture_settings[] = { { N_("Maximum continuous release"), "maximumcontinousrelease", PTP_DPC_NIKON_D2MaximumShots, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Range_UINT8, _put_Range_UINT8}, { N_("Movie Quality"), "moviequality", PTP_DPC_NIKON_MovScreenSize, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_MovieQuality, _put_Nikon_MovieQuality}, + { N_("Raw Compression"), "rawcompression", PTP_DPC_NIKON_RawCompression, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_RawCompression, _put_Nikon_RawCompression}, + /* And some D3s values */ { N_("Continuous Shooting Speed High"), "shootingspeedhigh", PTP_DPC_NIKON_ContinuousSpeedHigh, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_D3s_ShootingSpeedHigh, _put_Nikon_D3s_ShootingSpeedHigh}, { N_("Flash Sync. Speed"), "flashsyncspeed", PTP_DPC_NIKON_FlashSyncSpeed, PTP_VENDOR_NIKON, PTP_DTC_UINT8, _get_Nikon_D3s_FlashSyncSpeed, _put_Nikon_D3s_FlashSyncSpeed}, diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c index 0de296246..02fe7c39c 100644 --- a/camlibs/ptp2/ptp.c +++ b/camlibs/ptp2/ptp.c @@ -4450,7 +4450,9 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc, {PTP_DPC_NIKON_FinderISODisp, PTP_VENDOR_NIKON, 1, "Show ISO/Easy ISO"}, {PTP_DPC_NIKON_FinderISODisp, PTP_VENDOR_NIKON, 2, "Show frame count"}, - PTP_VENDOR_VAL_YN(PTP_DPC_NIKON_RawCompression,PTP_VENDOR_NIKON), /* D016 */ + {PTP_DPC_NIKON_RawCompression, PTP_VENDOR_NIKON, 0, N_("Lossless")}, /* D016 */ + {PTP_DPC_NIKON_RawCompression, PTP_VENDOR_NIKON, 1, N_("Lossy")}, + PTP_VENDOR_VAL_YN(PTP_DPC_NIKON_ACPower,PTP_VENDOR_NIKON), /* D101 */ PTP_VENDOR_VAL_YN(PTP_DPC_NIKON_AFLockStatus,PTP_VENDOR_NIKON), /* D104 */ PTP_VENDOR_VAL_YN(PTP_DPC_NIKON_AELockStatus,PTP_VENDOR_NIKON), /* D105 */