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

Changed the way problematic video files are tracked: now using a set of

Browse Source 
strings that are the file names of the bad video files rather than a set
of the java.io.Files themselves.
This commit is contained in:
Tim McIver 2013-04-05 11:22:19 -04:00
parent 4b571295dd
commit e2e4e05597
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Core/src/org/sleuthkit/autopsy/corecomponents/MediaViewVideoPanel.java
View File

@ -83,7 +83,7 @@ public class MediaViewVideoPanel extends javax.swing.JPanel implements FrameCapt
private boolean autoTracking = false; // true if the slider is moving automatically private boolean autoTracking = false; // true if the slider is moving automatically
private final Object playbinLock = new Object(); // lock for synchronization of gstPlaybin2 player private final Object playbinLock = new Object(); // lock for synchronization of gstPlaybin2 player
private AbstractFile currentFile; private AbstractFile currentFile;
private Set<java.io.File> badVideoFiles = Collections.synchronizedSet(new HashSet<java.io.File>()); private Set<String> badVideoFiles = Collections.synchronizedSet(new HashSet<String>());
/** /**
* Creates new form MediaViewVideoPanel * Creates new form MediaViewVideoPanel
@ -316,7 +316,7 @@ public class MediaViewVideoPanel extends javax.swing.JPanel implements FrameCapt
} }
// throw exception if this file is known to be problematic // throw exception if this file is known to be problematic
if (badVideoFiles.contains(file)) { if (badVideoFiles.contains(file.getName())) {
throw new Exception("Cannot capture frames from this file (" + file.getName() + ")."); throw new Exception("Cannot capture frames from this file (" + file.getName() + ").");
} }
@ -330,13 +330,13 @@ public class MediaViewVideoPanel extends javax.swing.JPanel implements FrameCapt
StateChangeReturn ret = playbin.play(); StateChangeReturn ret = playbin.play();
if (ret == StateChangeReturn.FAILURE) { if (ret == StateChangeReturn.FAILURE) {
// add this file to the set of known bad ones // add this file to the set of known bad ones
badVideoFiles.add(file); badVideoFiles.add(file.getName());
throw new Exception("Problem with video file; problem when attempting to play while obtaining duration."); throw new Exception("Problem with video file; problem when attempting to play while obtaining duration.");
} }
ret = playbin.pause(); ret = playbin.pause();
if (ret == StateChangeReturn.FAILURE) { if (ret == StateChangeReturn.FAILURE) {
// add this file to the set of known bad ones // add this file to the set of known bad ones
badVideoFiles.add(file); badVideoFiles.add(file.getName());
throw new Exception("Problem with video file; problem when attempting to pause while obtaining duration."); throw new Exception("Problem with video file; problem when attempting to pause while obtaining duration.");
} }
playbin.getState(); playbin.getState();
@ -362,7 +362,7 @@ public class MediaViewVideoPanel extends javax.swing.JPanel implements FrameCapt
ret = playbin.pause(); ret = playbin.pause();
if (ret == StateChangeReturn.FAILURE) { if (ret == StateChangeReturn.FAILURE) {
// add this file to the set of known bad ones // add this file to the set of known bad ones
badVideoFiles.add(file); badVideoFiles.add(file.getName());
throw new Exception("Problem with video file; problem when attempting to pause while capturing a frame."); throw new Exception("Problem with video file; problem when attempting to pause while capturing a frame.");
} }
playbin.getState(); playbin.getState();
@ -375,7 +375,7 @@ public class MediaViewVideoPanel extends javax.swing.JPanel implements FrameCapt
ret = playbin.play(); ret = playbin.play();
if (ret == StateChangeReturn.FAILURE) { if (ret == StateChangeReturn.FAILURE) {
// add this file to the set of known bad ones // add this file to the set of known bad ones
badVideoFiles.add(file); badVideoFiles.add(file.getName());
throw new Exception("Problem with video file; problem when attempting to play while capturing a frame."); throw new Exception("Problem with video file; problem when attempting to play while capturing a frame.");
} }
@ -392,13 +392,14 @@ public class MediaViewVideoPanel extends javax.swing.JPanel implements FrameCapt
ret = playbin.stop(); ret = playbin.stop();
if (ret == StateChangeReturn.FAILURE) { if (ret == StateChangeReturn.FAILURE) {
// add this file to the set of known bad ones // add this file to the set of known bad ones
badVideoFiles.add(file); badVideoFiles.add(file.getName());
throw new Exception("Problem with video file; problem when attempting to stop while capturing a frame."); throw new Exception("Problem with video file; problem when attempting to stop while capturing a frame.");
} }
if (image == null) { if (image == null) {
logger.log(Level.WARNING, "There was a problem while trying to capture a frame from file " + file.getName()); logger.log(Level.WARNING, "There was a problem while trying to capture a frame from file " + file.getName());
continue; badVideoFiles.add(file.getName());
break;
} }
frames.add(new VideoFrame(image, timeStamp)); frames.add(new VideoFrame(image, timeStamp));