mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-17 18:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

keeping only three makernotes with face detect tags

Browse Source
This commit is contained in:
momo 2015-09-09 13:33:14 -04:00
parent 1e5d66332a
commit e4e46067db
1 changed files with 24 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java
View File

@ -268,18 +268,6 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
} }
} }
d = metadata.getFirstDirectoryOfType(CasioType1MakernoteDirectory.class);
if (d != null) {
try {
if (d.containsTag(CasioType1MakernoteDirectory.TAG_FLASH_MODE)
&& d.getInt(CasioType1MakernoteDirectory.TAG_FLASH_MODE) == 0x04) { //0x04 = "Red eye reduction"
return true;
}
} catch (MetadataException ex) {
// move on and check next directory
}
}
d = metadata.getFirstDirectoryOfType(FujifilmMakernoteDirectory.class); d = metadata.getFirstDirectoryOfType(FujifilmMakernoteDirectory.class);
if (d != null) { if (d != null) {
if (d.containsTag(FujifilmMakernoteDirectory.TAG_FACES_DETECTED) if (d.containsTag(FujifilmMakernoteDirectory.TAG_FACES_DETECTED)
@ -288,71 +276,39 @@ public final class ExifParserFileIngestModule implements FileIngestModule {
} }
} }
d = metadata.getFirstDirectoryOfType(KodakMakernoteDirectory.class); // d = metadata.getFirstDirectoryOfType(NikonType2MakernoteDirectory.class);
if (d != null) { // if (d != null) {
try { // if (d.containsTag(NikonType2MakernoteDirectory.TAG_SCENE_MODE)
if (d.containsTag(KodakMakernoteDirectory.TAG_FLASH_MODE) // && d.getString(NikonType2MakernoteDirectory.TAG_SCENE_MODE) != null
&& d.getInt(KodakMakernoteDirectory.TAG_FLASH_MODE) == 0x03) { //0x03 = "Red Eye" // && (d.getString(NikonType2MakernoteDirectory.TAG_SCENE_MODE).equals("BEST FACE") // NON-NLS
return true; // || (d.getString(NikonType2MakernoteDirectory.TAG_SCENE_MODE).equals("SMILE")))) { // NON-NLS
} // return true;
} catch (MetadataException ex) { // }
/// move on and check next directory // }
}
}
d = metadata.getFirstDirectoryOfType(NikonType2MakernoteDirectory.class);
if (d != null) {
if (d.containsTag(NikonType2MakernoteDirectory.TAG_SCENE_MODE)
&& d.getString(NikonType2MakernoteDirectory.TAG_SCENE_MODE) != null
&& (d.getString(NikonType2MakernoteDirectory.TAG_SCENE_MODE).equals("BEST FACE") // NON-NLS
|| (d.getString(NikonType2MakernoteDirectory.TAG_SCENE_MODE).equals("SMILE")))) { // NON-NLS
return true;
}
}
d = metadata.getFirstDirectoryOfType(PanasonicMakernoteDirectory.class); d = metadata.getFirstDirectoryOfType(PanasonicMakernoteDirectory.class);
if (d != null) { if (d != null) {
if (d.containsTag(PanasonicMakernoteDirectory.TAG_FACES_DETECTED) if (d.containsTag(PanasonicMakernoteDirectory.TAG_FACES_DETECTED)
&& d.getString(PanasonicMakernoteDirectory.TAG_FACES_DETECTED) != null) { && d.getString(PanasonicMakernoteDirectory.TAG_FACES_DETECTED) != null) {
return true; return true;
} }
} if(d.containsTag(PanasonicMakernoteDirectory.TAG_AF_AREA_MODE)
&& d.getString(PanasonicMakernoteDirectory.TAG_AF_AREA_MODE) != null
d = metadata.getFirstDirectoryOfType(PentaxMakernoteDirectory.class); && d.getString(PanasonicMakernoteDirectory.TAG_AF_AREA_MODE).equals("64 0")) { // NON-NLS
if (d != null) {
try {
if (d.containsTag(PentaxMakernoteDirectory.TAG_FLASH_MODE)
&& d.getInt(PentaxMakernoteDirectory.TAG_FLASH_MODE) == 6) { // 6 = Red-eye Reduction
return true;
}
} catch (MetadataException ex) {
// move on and check next directory
}
}
d = metadata.getFirstDirectoryOfType(SanyoMakernoteDirectory.class);
if (d != null) {
if (d.containsTag(SanyoMakernoteDirectory.TAG_MANUAL_FOCUS_DISTANCE_OR_FACE_INFO)
&& d.getString(SanyoMakernoteDirectory.TAG_MANUAL_FOCUS_DISTANCE_OR_FACE_INFO) != null) {
return true; return true;
}
} }
d = metadata.getFirstDirectoryOfType(SonyType1MakernoteDirectory.class); // d = metadata.getFirstDirectoryOfType(SonyType1MakernoteDirectory.class);
if (d != null) { // if (d != null) {
try { // try {
if (d.containsTag(SonyType1MakernoteDirectory.TAG_AF_MODE) // if (d.containsTag(SonyType1MakernoteDirectory.TAG_AF_MODE)
&& d.getInt(SonyType1MakernoteDirectory.TAG_AF_MODE) == 15) { //15 = "Face Detected" // && d.getInt(SonyType1MakernoteDirectory.TAG_AF_MODE) == 15) { //15 = "Face Detected"
return true; // return true;
} // }
if (d.containsTag(SonyType1MakernoteDirectory.TAG_EXPOSURE_MODE) // } catch (MetadataException ex) {
&& d.getInt(SonyType1MakernoteDirectory.TAG_EXPOSURE_MODE) == 14) { //14 = "Smile shutter" // // move on and check next directory
return true; // }
} // }
} catch (MetadataException ex) {
// move on and check next directory
}
}
return false; return false;
} }