Skip to content

Commit f22a40e

Browse files
committed
Add new Sony camera
1 parent 637a368 commit f22a40e

2 files changed

Lines changed: 25 additions & 6 deletions

File tree

src/sonymn_int.cpp

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,8 @@ constexpr StringTagDetails sonyVariableLowPassFilter[] = {
375375

376376
//! Lookup table to translate Sony RAW file type values to readable labels
377377
constexpr TagDetails sonyRAWFileType[] = {
378-
{0, N_("Compressed RAW")},
379-
{1, N_("Uncompressed RAW")},
380-
{2, N_("Lossless Compressed RAW")},
381-
{0xffff, N_("n/a")},
378+
{0, N_("Compressed RAW")}, {1, N_("Uncompressed RAW")}, {2, N_("Lossless Compressed RAW")},
379+
{3, N_("Compressed RAW 2")}, {0xffff, N_("n/a")},
382380
};
383381

384382
//! Lookup table to translate Sony metering mode 2 values to readable labels
@@ -407,6 +405,26 @@ constexpr StringTagDetails sonyQuality2Std[] = {
407405
{"1 2", N_("RAW + fine")},
408406
{"1 3", N_("RAW + extra fine")},
409407
{"1 4", N_("RAW + light")},
408+
{"2 0", N_("S-size RAW")},
409+
{"2 1", N_("S-size RAW + standard")},
410+
{"2 2", N_("S-size RAW + fine")},
411+
{"2 3", N_("S-size RAW + extra fine")},
412+
{"2 4", N_("S-size RAW + light")},
413+
{"3 0", N_("M-size RAW")},
414+
{"3 1", N_("M-size RAW + standard")},
415+
{"3 2", N_("M-size RAW + fine")},
416+
{"3 3", N_("M-size RAW + extra fine")},
417+
{"3 4", N_("M-size RAW + light")},
418+
{"4 0", N_("Compressed RAW")},
419+
{"4 1", N_("Compressed RAW + standard")},
420+
{"4 2", N_("Compressed RAW + fine")},
421+
{"4 3", N_("Compressed RAW + extra fine")},
422+
{"4 4", N_("Compressed RAW + light")},
423+
{"5 0", N_("Compressed (HQ) RAW")},
424+
{"5 1", N_("Compressed (HQ) RAW + standard")},
425+
{"5 2", N_("Compressed (HQ) RAW + fine")},
426+
{"5 3", N_("Compressed (HQ) RAW + extra fine")},
427+
{"5 4", N_("Compressed (HQ) RAW + light")},
410428
};
411429

412430
//! Lookup table to translate Sony JPEG/HEIF switch values to readable labels
@@ -531,6 +549,7 @@ constexpr TagDetails sonyModelId[] = {
531549
{403, "ILCE-6100A"},
532550
{404, "DSC-RX100M7A"},
533551
{406, "ILME-FX2"},
552+
{407, "ILCE-7M5"},
534553
{408, "ZV-1A"},
535554
};
536555

@@ -562,7 +581,7 @@ constexpr StringTagDetails sonyFileFormat[] = {
562581
{"0 0 0 2", "JPEG"}, {"1 0 0 0", "SR2 1.0"}, {"2 0 0 0", "ARW 1.0"}, {"3 0 0 0", "ARW 2.0"},
563582
{"3 1 0 0", "ARW 2.1"}, {"3 2 0 0", "ARW 2.2"}, {"3 3 0 0", "ARW 2.3"}, {"3 3 1 0", "ARW 2.3.1"},
564583
{"3 3 2 0", "ARW 2.3.2"}, {"3 3 3 0", "ARW 2.3.3"}, {"3 3 5 0", "ARW 2.3.5"}, {"4 0 0 0", "ARW 4.0"},
565-
{"4 0 1 0", "ARW 4.0.1"}, {"5 0 0 0", "ARW 5.0.0"}, {"5 0 1 0", "ARW 5.0.1"},
584+
{"4 0 1 0", "ARW 4.0.1"}, {"5 0 0 0", "ARW 5.0.0"}, {"5 0 1 0", "ARW 5.0.1"}, {"6 0 0 0", "ARW 6.0.0"},
566585
};
567586

568587
//! Lookup table to translate Sony dynamic range optimizer values to readable labels

src/tags_int.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ constexpr TagDetails exifCompression[] = {
243243
{8, N_("Adobe Deflate")},
244244
{9, N_("JBIG B&W")},
245245
{10, N_("JBIG Color")},
246-
{32766, N_("Next 2-bits RLE")},
246+
{32766, N_("NeXT 2-bits RLE or Sony ARW Compressed 2")},
247247
{32767, N_("Sony ARW Compressed")},
248248
{32769, N_("Epson ERF Compressed")},
249249
{32770, N_("Samsung SRW Compressed")},

0 commit comments

Comments
 (0)