Update Sony(1|2) label/descriptions

Exiv2 · Aug 29, 2022 · dc6ae50 · dc6ae50
1 parent 812a683
commit dc6ae50
Showing 1 changed file with 56 additions and 50 deletions.
diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp
@@ -1388,19 +1388,19 @@ std::ostream& SonyMakerNote::printHighISONoiseReduction2(std::ostream& os, const
 constexpr TagInfo SonyMakerNote::tagInfo_[] = {
     {0x0102, "Quality", N_("Quality"), N_("Image quality"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
      EXV_PRINT_TAG(sonyImageQuality)},
-    {0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation"), IfdId::sony1Id,
-     SectionId::makerTags, signedRational, -1, print0x9204},
+    {0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation in EV"),
+     IfdId::sony1Id, SectionId::makerTags, signedRational, -1, print0x9204},
     {0x0105, "Teleconverter", N_("Teleconverter Model"), N_("Teleconverter Model"), IfdId::sony1Id,
      SectionId::makerTags, unsignedLong, -1, printMinoltaSonyTeleconverterModel},
     {0x0112, "WhiteBalanceFineTune", N_("White Balance Fine Tune"), N_("White Balance Fine Tune"), IfdId::sony1Id,
      SectionId::makerTags, unsignedLong, -1, printWhiteBalanceFineTune},
-    {0x0115, "WhiteBalance", N_("White Balance"), N_("White Balance"), IfdId::sony1Id, SectionId::makerTags,
+    {0x0115, "WhiteBalance", N_("White balance"), N_("White balance"), IfdId::sony1Id, SectionId::makerTags,
      unsignedLong, -1, EXV_PRINT_TAG(sonyWhiteBalanceStd)},
-    {0x1000, "MultiBurstMode", N_("Multi-Burst Mode"), N_("Multi-Burst Mode"), IfdId::sony1Id, SectionId::makerTags,
+    {0x1000, "MultiBurstMode", N_("Multi Burst Mode"), N_("Multi Burst Mode"), IfdId::sony1Id, SectionId::makerTags,
      undefined, -1, printMultiBurstMode},
     {0x1001, "MultiBurstImageWidth", N_("Multi Burst Image Width"), N_("Multi Burst Image Width"), IfdId::sony1Id,
      SectionId::makerTags, unsignedShort, -1, printMultiBurstSize},
-    {0x1002, "MultiBurstImageHeight", N_("Multi-Burst Image Height"), N_("Multi-Burst Image Height"), IfdId::sony1Id,
+    {0x1002, "MultiBurstImageHeight", N_("Multi Burst Image Height"), N_("Multi Burst Image Height"), IfdId::sony1Id,
      SectionId::makerTags, unsignedShort, -1, printMultiBurstSize},
     {0x2001, "PreviewImage", N_("Preview Image"), N_("JPEG preview image"), IfdId::sony1Id, SectionId::makerTags,
      undefined, -1, printValue},
@@ -1412,13 +1412,13 @@ constexpr TagInfo SonyMakerNote::tagInfo_[] = {
      printValue},
     {0x2007, "Brightness", "Brightness", N_("Brightness"), IfdId::sony1Id, SectionId::makerTags, signedLong, -1,
      printValue},
-    {0x2008, "LongExposureNoiseReduction", "Long Exposure Noise Reduction", N_("Long exposure noise reduction"),
+    {0x2008, "LongExposureNoiseReduction", "Long exposure noise reduction", N_("Long exposure noise reduction"),
      IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyLongExposureNoiseReduction)},
     {0x2009, "HighISONoiseReduction", "High ISO noise reduction", N_("High ISO noise reduction"), IfdId::sony1Id,
      SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyHighISONoiseReductionStd)},
-    {0x200a, "AutoHDR", N_("Auto HDR"), N_("High Dynamic Range Mode"), IfdId::sony1Id, SectionId::makerTags,
-     unsignedLong, -1, printAutoHDRStd},
-    {0x200b, "MultiFrameNoiseReduction", N_("Multi-Frame Noise Reduction"), N_("Multi-Frame Noise Reduction"),
+    {0x200a, "AutoHDR", N_("Auto high dynamic range mode"), N_("Auto high dynamic range mode"), IfdId::sony1Id,
+     SectionId::makerTags, unsignedLong, -1, printAutoHDRStd},
+    {0x200b, "MultiFrameNoiseReduction", N_("Multi frame noise reduction"), N_("Multi frame noise reduction"),
      IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyOffOnNA1)},
     {0x200e, "PictureEffect", N_("Picture effect"), N_("Picture effect"), IfdId::sony1Id, SectionId::makerTags,
      unsignedShort, -1, EXV_PRINT_TAG(sonyPictureEffect)},
@@ -1430,40 +1430,42 @@ constexpr TagInfo SonyMakerNote::tagInfo_[] = {
      IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyLateralChromaticAberration)},
     {0x2013, "DistortionCorrectionSetting", N_("Distortion correction setting"), N_("Distortion correction setting"),
      IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyDistortionCorrectionSettings)},
-    {0x2014, "WBShiftABGM", N_("White balance Shift (Amber/Blue, Green/Magenta)"),
-     N_("White balance Shift (Amber/Blue, Green/Magenta). First number is positive towards amber, second is "
-        "positive towards magenta"),
-     IfdId::sony1Id, SectionId::makerTags, signedLong, 2, printWBShiftABGM},
-    {0x2016, "AutoPortraitFramed", N_("Auto portrait framed"), N_("Auto portrait framed"), IfdId::sony1Id,
-     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyNoYes)},
+    {0x2014, "WBShiftABGM", N_("White balance Shift (amber/blue, green/magenta)"),
+     N_("First number is amber/blue, second is green/magenta"), IfdId::sony1Id, SectionId::makerTags, signedLong, 2,
+     printWBShiftABGM},
+    {0x2016, "AutoPortraitFramed", N_("Auto portrait framed"), N_("Indicates if the Portrait Framing feature was used"),
+     IfdId::sony1Id, SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyNoYes)},
     {0x2017, "FlashAction", N_("Flash action"), N_("Flash action"), IfdId::sony1Id, SectionId::makerTags, unsignedLong,
      -1, EXV_PRINT_TAG(sonyFlashAction)},
     {0x201a, "ElectronicFrontCurtainShutter", N_("Electronic front curtain shutter"),
      N_("Electronic front curtain shutter"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
      printMinoltaSonyBoolValue},
     {0x201b, "FocusMode2", N_("Focus mode 2"), N_("Focus mode 2"), IfdId::sony1Id, SectionId::makerTags, unsignedByte,
      -1, printFocusMode2},
-    {0x201c, "AFAreaModeSetting", N_("Auto-focus area mode setting"), N_("Auto-focus area mode setting"),
+    {0x201c, "AFAreaModeSetting", N_("Auto focus area mode setting"), N_("Auto focus area mode setting"),
      IfdId::sony1Id, SectionId::makerTags, unsignedByte, -1, printAFAreaModeSetting},
-    {0x201d, "FlexibleSpotPosition", N_("Flexible spot position"), N_("Flexible spot position"), IfdId::sony1Id,
+    {0x201d, "FlexibleSpotPosition", N_("Flexible spot position"),
+     N_("X and Y co-ordinates or the auto focus point. Only valid when AFAreaModeSetting is Flexible"), IfdId::sony1Id,
      SectionId::makerTags, unsignedShort, 2, printFlexibleSpotPosition},
-    {0x201e, "AFPointSelected", N_("Auto-focus point selected"), N_("Auto-focus point selected"), IfdId::sony1Id,
+    {0x201e, "AFPointSelected", N_("Auto focus point selected"), N_("Auto focus point selected"), IfdId::sony1Id,
      SectionId::makerTags, unsignedByte, -1, printAFPointSelected},
-    {0x2020, "AFPointsUsed", N_("Auto-focus points used"), N_("Auto-focus points used"), IfdId::sony1Id,
+    {0x2020, "AFPointsUsed", N_("Auto focus points used"), N_("Auto focus points used"), IfdId::sony1Id,
      SectionId::makerTags, unsignedByte, -1, printAFPointsUsed},
-    {0x2021, "AFTracking", N_("Auto-focus tracking"), N_("Auto-focus tracking"), IfdId::sony1Id, SectionId::makerTags,
+    {0x2021, "AFTracking", N_("Auto focus tracking"), N_("Auto focus tracking"), IfdId::sony1Id, SectionId::makerTags,
      unsignedByte, -1, printAFTracking},
-    {0x2022, "FocalPlaneAFPointsUsed", N_("Focal plane auto-focus points used"),
-     N_("Focal plane auto-focus points used"), IfdId::sony1Id, SectionId::makerTags, unsignedByte, -1,
+    {0x2022, "FocalPlaneAFPointsUsed", N_("Focal plane auto focus points used"),
+     N_("Focal plane auto focus points used"), IfdId::sony1Id, SectionId::makerTags, unsignedByte, -1,
      printFocalPlaneAFPointsUsed},
-    {0x2023, "MultiFrameNREffect", N_("Multi-frame noise reduction effect"), N_("Multi-frame noise reduction effect"),
+    {0x2023, "MultiFrameNREffect", N_("Multi frame noise reduction effect"), N_("Multi frame noise reduction effect"),
      IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyMultiFrameNREffect)},
-    {0x2026, "WBShiftABGMPrecise", N_("White balance shift amber/blue green/magenta precise"),
-     N_("White balance shift amber/blue green/magenta precise. First number is positive towards amber, second "
-        "is positive towards magenta"),
-     IfdId::sony1Id, SectionId::makerTags, signedLong, 2, printWBShiftABGMPrecise},
-    {0x2027, "FocusLocation", N_("Focus location"), N_("Focus location - origin is top left"), IfdId::sony1Id,
-     SectionId::makerTags, unsignedShort, -1, printValue},
+    {0x2026, "WBShiftABGMPrecise", N_("White balance shift (amber/blue, green/magenta) precise"),
+     N_("First number is amber/blue, second is green/magenta"), IfdId::sony1Id, SectionId::makerTags, signedLong, 2,
+     printWBShiftABGMPrecise},
+    {0x2027, "FocusLocation", N_("Focus location"),
+     N_("Location in the image where the camera focused, used for Playback Zoom. Origin is top left with the first "
+        "co-ordinate to the right and the second co-ordinate down. If focus location information cannot be obtained, "
+        "the center of the image is used"),
+     IfdId::sony1Id, SectionId::makerTags, unsignedShort, -1, printValue},
     {0x2028, "VariableLowPassFilter", N_("Variable low pass filter"), N_("Variable low pass filter"), IfdId::sony1Id,
      SectionId::makerTags, unsignedShort, -1, EXV_PRINT_STRING_TAG_2(sonyVariableLowPassFilter)},
     {0x2029, "RAWFileType", N_("RAW file type"), N_("RAW file type"), IfdId::sony1Id, SectionId::makerTags,
@@ -1475,9 +1477,10 @@ constexpr TagInfo SonyMakerNote::tagInfo_[] = {
      unsignedShort, -1, EXV_PRINT_TAG(sonyMeteringMode2)},
     {0x202d, "ExposureStandardAdjustment", N_("Exposure standard adjustment"), N_("Exposure standard adjustment"),
      IfdId::sony1Id, SectionId::makerTags, signedRational, -1, printExposureStandardAdjustment},
-    {0x202e, "Quality2", N_("Quality 2"), N_("Quality 2"), IfdId::sony1Id, SectionId::makerTags, unsignedShort, 2,
+    {0x202e, "Quality2", N_("Quality 2"), N_("Image quality 2"), IfdId::sony1Id, SectionId::makerTags, unsignedShort, 2,
      EXV_PRINT_STRING_TAG_2(sonyQuality2Std)},
-    {0x202f, "PixelShiftInfo", N_("Pixel shift info"), N_("Pixel shift info"), IfdId::sony1Id, SectionId::makerTags,
+    {0x202f, "PixelShiftInfo", N_("Pixel shift info"),
+     N_("Pixel shift information consisting of the group ID and shot number"), IfdId::sony1Id, SectionId::makerTags,
      undefined, -1, printPixelShiftInfo},
     {0x2031, "SerialNumber", N_("Serial number"), N_("Serial number"), IfdId::sony1Id, SectionId::makerTags,
      asciiString, -1, printValue},
@@ -1488,40 +1491,43 @@ constexpr TagInfo SonyMakerNote::tagInfo_[] = {
     {0x2035, "SharpnessRange", N_("Sharpness range"), N_("Sharpness range"), IfdId::sony1Id, SectionId::makerTags,
      signedLong, -1, printValue},
     {0x2036, "Clarity", N_("Clarity"), N_("Clarity"), IfdId::sony1Id, SectionId::makerTags, signedLong, -1, printValue},
-    {0x2037, "FocusFrameSize", N_("Focus frame size"), N_("Width and height of FocusFrame, centered on FocusLocation"),
-     IfdId::sony1Id, SectionId::makerTags, undefined, -1, printFocusFrameSize},
-    {0x2039, "JPEGHEIFSwitch", N_("JPEG HEIF switch"), N_("JPEG HEIF switch"), IfdId::sony1Id, SectionId::makerTags,
+    {0x2037, "FocusFrameSize", N_("Focus frame size"),
+     N_("Width and height of the focus frame, centered on FocusLocation"), IfdId::sony1Id, SectionId::makerTags,
+     undefined, -1, printFocusFrameSize},
+    {0x2039, "JPEGHEIFSwitch", N_("JPEG/HEIF switch"), N_("JPEG/HEIF switch"), IfdId::sony1Id, SectionId::makerTags,
      unsignedShort, -1, EXV_PRINT_TAG(sonyJPEGHEIFSwitch)},
     {0xb000, "FileFormat", N_("File Format"), N_("File Format"), IfdId::sony1Id, SectionId::makerTags, unsignedByte, -1,
      EXV_PRINT_STRING_TAG_4(sonyFileFormat)},
-    {0xb001, "SonyModelID", N_("Sony Model ID"), N_("Sony Model ID"), IfdId::sony1Id, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(sonyModelId)},
+    {0xb001, "SonyModelID", N_("Sony Model ID"),
+     N_("Similar to Exif.Image.Model but can contain multiple entries or conditions"), IfdId::sony1Id,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyModelId)},
     {0xb020, "CreativeStyle", N_("Creative style"), N_("Creative style"), IfdId::sony1Id, SectionId::makerTags,
      asciiString, -1, EXV_PRINT_STRING_TAG_1(sonyCreativeStyleStd)},
     {0xb021, "ColorTemperature", N_("Color Temperature"), N_("Color Temperature"), IfdId::sony1Id, SectionId::makerTags,
      unsignedLong, -1, printColorTemperature},
     {0xb022, "ColorCompensationFilter", N_("Color Compensation Filter"),
-     N_("Color Compensation Filter. Negative is green, positive is magenta"), IfdId::sony1Id, SectionId::makerTags,
-     unsignedLong, -1, printColorCompensationFilter},
+     N_("Color Compensation Filter, (green/magenta)"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
+     printColorCompensationFilter},
     {0xb023, "SceneMode", N_("Scene Mode"), N_("Scene Mode"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
      printMinoltaSonySceneMode},
     {0xb024, "ZoneMatching", N_("Zone Matching"), N_("Zone Matching"), IfdId::sony1Id, SectionId::makerTags,
      unsignedLong, -1, printMinoltaSonyZoneMatching},
     {0xb025, "DynamicRangeOptimizer", N_("Dynamic Range Optimizer"), N_("Dynamic Range Optimizer"), IfdId::sony1Id,
      SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(print0xb025)},
-    {0xb026, "ImageStabilization", N_("Image Stabilization"), N_("Image stabilization"), IfdId::sony1Id,
+    {0xb026, "ImageStabilization", N_("Image stabilization"), N_("Image stabilization"), IfdId::sony1Id,
      SectionId::makerTags, unsignedLong, -1, EXV_PRINT_TAG(sonyOffOnNA2)},
-    {0xb027, "LensID", N_("Lens ID"), N_("Lens identifier"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
+    {0xb027, "LensID", N_("Lens ID"), N_("Lens ID"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
      printMinoltaSonyLensID},
     {0xb029, "ColorMode", N_("Color Mode"), N_("Color Mode"), IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1,
      EXV_PRINT_TAG(sonyColorMode)},
     {0xb02a, "LensSpec", N_("Lens specification"),
-     N_("Lens specification. Similar to LensID but includes many cameras with fixed lenses."), IfdId::sony1Id,
-     SectionId::makerTags, unsignedByte, -1, printLensSpec},
-    {0xb02b, "FullImageSize", N_("Full Image Size"), N_("Full Image Size (Format: Width x Height)"), IfdId::sony1Id,
+     N_("Similar to Exif.Photo.LensModel but includes optional additional flags before and after (e.g., DT, Macro). "
+        "Works with most Sony cameras"),
+     IfdId::sony1Id, SectionId::makerTags, unsignedByte, -1, printLensSpec},
+    {0xb02b, "FullImageSize", N_("Full Image Size"), N_("Full image Size (width x height)"), IfdId::sony1Id,
+     SectionId::makerTags, unsignedLong, -1, printImageSize},
+    {0xb02c, "PreviewImageSize", N_("Preview image Size"), N_("Preview image size (width x height)"), IfdId::sony1Id,
      SectionId::makerTags, unsignedLong, -1, printImageSize},
-    {0xb02c, "PreviewImageSize", N_("Preview Image Size"), N_("Preview image size (Format: Width x Height)"),
-     IfdId::sony1Id, SectionId::makerTags, unsignedLong, -1, printImageSize},
     {0xb040, "Macro", N_("Macro"), N_("Macro"), IfdId::sony1Id, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(sonyMacro)},
     {0xb041, "ExposureMode", N_("Exposure Mode"), N_("Exposure Mode"), IfdId::sony1Id, SectionId::makerTags,
@@ -1530,8 +1536,8 @@ constexpr TagInfo SonyMakerNote::tagInfo_[] = {
      printFocusMode},
     {0xb043, "AFMode", N_("Auto focus area mode"), N_("Auto focus area mode"), IfdId::sony1Id, SectionId::makerTags,
      unsignedShort, -1, printAFMode},
-    {0xb044, "AFIlluminator", N_("AF Illuminator"), N_("AF Illuminator"), IfdId::sony1Id, SectionId::makerTags,
-     unsignedShort, -1, EXV_PRINT_TAG(sonyAFIlluminator)},
+    {0xb044, "AFIlluminator", N_("Auto focus illuminator"), N_("Auto focus illuminator"), IfdId::sony1Id,
+     SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyAFIlluminator)},
     {0xb047, "JPEGQuality", N_("JPEG Quality"), N_("JPEG Quality"), IfdId::sony1Id, SectionId::makerTags, unsignedShort,
      -1, EXV_PRINT_TAG(sonyJPEGQuality)},
     {0xb048, "FlashLevel", N_("Flash Level"), N_("Flash Level"), IfdId::sony1Id, SectionId::makerTags, signedShort, -1,
@@ -1542,15 +1548,15 @@ constexpr TagInfo SonyMakerNote::tagInfo_[] = {
      SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG_NO_ERROR(sonySequenceNumber)},
     {0xb04b, "AntiBlur", N_("Anti-Blur"), N_("Anti-Blur"), IfdId::sony1Id, SectionId::makerTags, unsignedShort, -1,
      EXV_PRINT_TAG(sonyAntiBlur)},
-    {0xb04e, "FocusMode3", N_("Focus Mode 3"), N_("Focus Mode 3"), IfdId::sony1Id, SectionId::makerTags, unsignedShort,
+    {0xb04e, "FocusMode3", N_("Focus mode 3"), N_("Focus mode 3"), IfdId::sony1Id, SectionId::makerTags, unsignedShort,
      -1, printFocusMode3},
     {0xb04f, "DynamicRangeOptimizer2", N_("Dynamic Range Optimizer 2"), N_("Dynamic Range Optimizer 2"), IfdId::sony1Id,
      SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(print0xb04f)},
-    {0xb050, "HighISONoiseReduction2", N_("High ISO Noise Reduction 2"), N_("High ISO noise reduction 2"),
+    {0xb050, "HighISONoiseReduction2", N_("High ISO noise reduction 2"), N_("High ISO noise reduction 2"),
      IfdId::sony1Id, SectionId::makerTags, unsignedShort, -1, printHighISONoiseReduction2},
     {0xb052, "IntelligentAuto", N_("Intelligent Auto"), N_("Intelligent Auto"), IfdId::sony1Id, SectionId::makerTags,
      unsignedShort, -1, EXV_PRINT_TAG(sonyIntelligentAuto)},
-    {0xb054, "WhiteBalance2", N_("White Balance 2"),
+    {0xb054, "WhiteBalance2", N_("White balance 2"),
      N_("White balance 2. Decoding the Fluorescent settings matches the EXIF standard, which is different from "
         "the names used by Sony for some models"),
      IfdId::sony1Id, SectionId::makerTags, unsignedShort, -1, EXV_PRINT_TAG(sonyWhiteBalance2)},