added video type ffmpeg

README.md

@@ -5,6 +5,6 @@ Video analysis and modeling tool built on the Open Source Physics (OSP) framewor
 
 This code requires the OSP Core Library available in the <a href="https://github.com/OpenSourcePhysics/osp" target="_blank">OpenSourcePhysics/osp</a> repository.
 
-Optional Xuggle video engine support is available in the <a href="https://github.com/OpenSourcePhysics/video-engines" target="_blank">OpenSourcePhysics/video-engines</a> repository. Without a video engine Tracker will only open images (JPEG, PNG) and animated GIFs.
+Optional video engine support (FFMPeg on Win/OSX/linux, QuickTime on Win/OSX) is available in the <a href="https://github.com/OpenSourcePhysics/video-engines" target="_blank">OpenSourcePhysics/video-engines</a> repository. Without a video engine Tracker will only open images (JPEG, PNG) and animated GIFs.
 
 Note: Tracker includes classes to handle apple events that to compile require the Apple Java Extensions library (AppleJavaExtensions.jar) which can be downloaded <a href="http://physlets.org/tracker/code_libraries/AppleJavaExtensions.jar" target="_blank">here</a>.

src/org/opensourcephysics/cabrillo/tracker/AnalyticParticle.java

@@ -93,7 +93,7 @@ protected void reset() {
     	dt = trackerPanel.getPlayer().getMeanStepDuration() / (1000*tracePtsPerStep);
       VideoClip clip = trackerPanel.getPlayer().getVideoClip();
       // find last frame included in both model and clip
-  		int end = Math.min(getEndFrame(), clip.getLastFrameNumber());
+  		int end = Math.min(getEndFrame(), clip.getFrameCount()-1);
   		while (end>getStartFrame() && !clip.includesFrame(end)) {
   			end--;
   		}
@@ -119,7 +119,7 @@ protected void reset() {
     	// mark a step at firstFrameInClip
 	  	steps.setLength(firstFrameInClip+1);
 	    PositionStep step = (PositionStep)getStep(firstFrameInClip);
-	  	for (int i = 0; i<steps.array.length; i++) {
+	  	for (int i = 0; i<steps.length; i++) {
 	  		if (i<firstFrameInClip)
 	  			steps.setStep(i, null);
 	  		else if (step==null) {

src/org/opensourcephysics/cabrillo/tracker/AttachmentDialog.java

@@ -284,7 +284,6 @@ public Dimension getPreferredSize() {
     stepsButton = new JRadioButton();
     tracksButton = new JRadioButton();
     Action tracksOrStepsAction = new AbstractAction() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
       	if (refreshing) return;
       	CircleFitter fitter = (CircleFitter)TTrack.getTrack(trackID);
@@ -306,7 +305,6 @@ public void actionPerformed(ActionEvent e) {
     relativeCheckbox = new JCheckBox();
     relativeCheckbox.setSelected(false);
     relativeCheckbox.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
       	if (refreshing) return;
       	CircleFitter fitter = (CircleFitter)TTrack.getTrack(trackID);
@@ -319,7 +317,6 @@ public void actionPerformed(ActionEvent e) {
 
     // range action, listener and fields
     final Action frameRangeAction = new AbstractAction() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
       	CircleFitter fitter = (CircleFitter)TTrack.getTrack(trackID);
     		fitter.setAttachmentStartFrame(startField.getIntValue());   		

src/org/opensourcephysics/cabrillo/tracker/CircleFitter.java

@@ -246,7 +246,6 @@ public void focusLost(FocusEvent e) {
     // originToCenter item
     originToCenterItem = new JMenuItem();
     originToCenterItem.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
 				setCoordsOriginToCenter();
 			}  		
@@ -255,7 +254,6 @@ public void actionPerformed(ActionEvent e) {
     // clearPoints item
     clearPointsItem = new JMenuItem();
     clearPointsItem.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
 				XMLControl control = new XMLControlElement(CircleFitter.this);
 				boolean changed = false;

src/org/opensourcephysics/cabrillo/tracker/CircleFitterFootprint.java

@@ -184,7 +184,6 @@ public Rectangle getBounds(boolean highlighted) {
    *
    * @return the hit shapes
    */
-  @Override
   public Shape[] getHitShapes() {
     return hitShapes.toArray(new Shape[hitShapes.size()]);
   }

src/org/opensourcephysics/cabrillo/tracker/DataTrackClipControl.java

@@ -265,7 +265,6 @@ public Dimension getMaximumSize() {
     return dim;
   }
 
-	@Override
 	public void propertyChange(PropertyChangeEvent e) {
 		refreshSpinners();
 //		if (e.getPropertyName().equals("dataclip")) { //$NON-NLS-1$
@@ -323,7 +322,6 @@ class MappingGraphic implements Interactive {
 
 		GeneralPath path = new GeneralPath();
 
-		@Override
 		public void draw(DrawingPanel panel, Graphics g) {
 	    VideoPanel vidPanel = dataTrack.getVideoPanel();
 	    if (vidPanel==null) return;
@@ -519,72 +517,57 @@ public Shape[] getHitShapes() {
 	  public Mark getMark(Point[] points) {
 	  	return new Mark() {
 
-				@Override
 				public void draw(Graphics2D g, boolean highlighted) {
 				}
 
-				@Override
 				public Rectangle getBounds(boolean highlighted) {
 					return null;
 				}
 
 	  	};
 	  }
 
-		@Override
 		public double getXMin() {
 			return 0;
 		}
 
-		@Override
 		public double getXMax() {
 			return 100;
 		}
 
-		@Override
 		public double getYMin() {
 			return 0;
 		}
 
-		@Override
 		public double getYMax() {
 			return 100;
 		}
 
-		@Override
 		public boolean isMeasured() {
 			return true;
 		}
 
-		@Override
 		public Interactive findInteractive(DrawingPanel panel, int _xpix, int _ypix) {
 			return null;
 		}
 
-		@Override
 		public void setEnabled(boolean enabled) {}
 
-		@Override
 		public boolean isEnabled() {
 			return true;
 		}
 
-		@Override
 		public void setXY(double x, double y) {}
 
-		@Override
 		public void setX(double x) {
 		}
 
-		@Override
 		public void setY(double y) {}
 
-		@Override
 		public double getX() {
 			return 0;
 		}
 
-		@Override
 		public double getY() {
 			return 0;
 		}

src/org/opensourcephysics/cabrillo/tracker/DataTrackTimeControl.java

@@ -106,7 +106,6 @@ public Dimension getMaximumSize() {
     return dim;
   }
 
-	@Override
 	public void propertyChange(PropertyChangeEvent e) {
 		refreshGUI();
 	}

src/org/opensourcephysics/cabrillo/tracker/DynamicParticle.java

@@ -208,7 +208,7 @@ public void reset() {
 				models[i].lastValidFrame = firstFrameInClip;
 		  	models[i].steps.setLength(firstFrameInClip+1);
 		    PositionStep step = (PositionStep)models[i].getStep(firstFrameInClip);
-		  	for (int j = 0; j < models[i].steps.array.length;j++) {
+		  	for (int j = 0; j < models[i].steps.length;j++) {
 		  		if (j<firstFrameInClip)
 		  			models[i].steps.setStep(j, null);
 		  		else if (step==null) {

src/org/opensourcephysics/cabrillo/tracker/ExportVideoDialog.java

@@ -110,12 +110,12 @@ public static ExportVideoDialog getDialog(TrackerPanel panel) {
   public static void refreshFormats() {
 		formats.clear(); 
 		formatDescriptions.clear();  
-		// eliminate xuggle types if VideoIO engine is NONE
+		// eliminate ffmpeg types if VideoIO engine is NONE
   	ArrayList<VideoType> unwanted = new ArrayList<VideoType>();
-  	boolean skipXuggle = VideoIO.getEngine().equals(VideoIO.ENGINE_NONE);
+  	boolean skipFFMPeg = VideoIO.getEngine().equals(VideoIO.ENGINE_NONE);
   	for (String ext: VideoIO.VIDEO_EXTENSIONS) {
-    	if (skipXuggle)
-    		unwanted.add(VideoIO.getVideoType(VideoIO.ENGINE_XUGGLE, ext));
+    	if (skipFFMPeg)
+    		unwanted.add(VideoIO.getVideoType(VideoIO.ENGINE_FFMPEG, ext));
   	}
 		for (VideoType next: VideoIO.getVideoTypes()) {
       if (next.canRecord() && !unwanted.contains(next)) {
@@ -589,7 +589,7 @@ public void setTrackerPanel(TrackerPanel panel) {
   /**
    * Gets the smallest acceptable dimension >= a specified width and height.
    * This is a work-around to avoid image artifacts introduced by the converter 
-   * in xuggle.
+   * in ffmpeg.
    * 
    * @param w the desired width
    * @param h the desired height
@@ -605,7 +605,7 @@ private Dimension getAcceptedDimension(int w, int h) {
   }
 
   /**
-   * Determines if a width and height are acceptable (for xuggle).
+   * Determines if a width and height are acceptable (for ffmpeg).
    * 
    * @param w the width
    * @param h the height

src/org/opensourcephysics/cabrillo/tracker/FileDropHandler.java

@@ -260,8 +260,7 @@ public void dragExit(DropTargetEvent dte) {
 	    dropList = null;
 	  }
 
-  	@Override
-		public void drop(DropTargetDropEvent e) {
+  	public void drop(DropTargetDropEvent e) {
   		dropList = null;
 		}
 

src/org/opensourcephysics/cabrillo/tracker/ParticleDataTrack.java

@@ -1242,7 +1242,7 @@ protected void initializeFunctionPanel() {
   @Override
 	protected void reset() {
 		// clear existing steps
-		for (int i=0; i<steps.array.length; i++) {
+		for (int i=0; i<steps.length; i++) {
 			Step step = steps.getStep(i);
 			if (step!=null) {
 				step.erase();
@@ -1270,7 +1270,7 @@ protected void reset() {
 
   	// mark a step at firstFrameInVideoClip unless dataclip length is zero
   	steps.setLength(firstFrameInVideoClip+1);
-  	for (int i = 0; i<steps.array.length; i++) {
+  	for (int i = 0; i<steps.length; i++) {
   		if (i<firstFrameInVideoClip || index==-1)
   			steps.setStep(i, null);
   		else {
@@ -1292,13 +1292,11 @@ protected void reset() {
 		stepCounter = 0;
 	}
 
-	@Override
 	public void setData(Data data, Object source) throws Exception {
 		setData(data);
 		setSource(source);
 	}
 
-	@Override
 	public VideoPanel getVideoPanel() {
 		return trackerPanel;
 	}
@@ -1780,7 +1778,6 @@ class ComboIcon implements Icon {
 			shapeIcons = icons;
 		}
 
-		@Override
 		public void paintIcon(Component c, Graphics g, int x, int y) {
 			if (shapeIcons.size()==1) {
 				shapeIcons.get(0).paintIcon(c, g, x, y);
@@ -1804,12 +1801,10 @@ public void paintIcon(Component c, Graphics g, int x, int y) {
 			}
 		}
 
-		@Override
 		public int getIconWidth() {
 			return shapeIcons.get(0).getIconWidth();
 		}
 
-		@Override
 		public int getIconHeight() {
 			return shapeIcons.get(0).getIconHeight();
 		}

src/org/opensourcephysics/cabrillo/tracker/PointMass.java

@@ -1893,10 +1893,10 @@ protected void updateDerivatives(TrackerPanel trackerPanel,
 			return;
     VideoClip clip = trackerPanel.getPlayer().getVideoClip();
     // initialize data arrays
-    if (xData.length < steps.array.length) {
-      derivData[1] = xData = new double[steps.array.length + 5];
-      derivData[2] = yData = new double[steps.array.length + 5];
-      derivData[3] = validData = new boolean[steps.array.length + 5];
+    if (xData.length < steps.length) {
+      derivData[1] = xData = new double[steps.length + 5];
+      derivData[2] = yData = new double[steps.length + 5];
+      derivData[3] = validData = new boolean[steps.length + 5];
     }
     // set up derivative parameters
     params[1] = startFrame;
@@ -2042,12 +2042,12 @@ else if ( (int) (100 * a.getXComponent()) != (int) (100 * x) ||
    */
   protected Object[] getRotationData() {
     // initialize data arrays once, for all panels
-    if (xData.length < steps.array.length) {
-      derivData[1] = xData = new double[steps.array.length + 5];
-      derivData[2] = yData = new double[steps.array.length + 5];
-      derivData[3] = validData = new boolean[steps.array.length + 5];
+    if (xData.length < steps.length) {
+      derivData[1] = xData = new double[steps.length + 5];
+      derivData[2] = yData = new double[steps.length + 5];
+      derivData[3] = validData = new boolean[steps.length + 5];
     }
-    for (int i = 0; i < steps.array.length; i++)
+    for (int i = 0; i < steps.length; i++)
       validData[i] = false;
     // set up derivative parameters
     VideoClip clip = trackerPanel.getPlayer().getVideoClip();
@@ -2103,12 +2103,12 @@ protected Object[] getRotationData() {
    */
   protected Object[] getRotationData(int startFrame, int stepCount) {
     // initialize data arrays once, for all panels
-    if (xData.length < steps.array.length) {
-      derivData[1] = xData = new double[steps.array.length + 5];
-      derivData[2] = yData = new double[steps.array.length + 5];
-      derivData[3] = validData = new boolean[steps.array.length + 5];
+    if (xData.length < steps.length) {
+      derivData[1] = xData = new double[steps.length + 5];
+      derivData[2] = yData = new double[steps.length + 5];
+      derivData[3] = validData = new boolean[steps.length + 5];
     }
-    for (int i = 0; i < steps.array.length; i++)
+    for (int i = 0; i < steps.length; i++)
       validData[i] = false;
     // set up derivative parameters
     VideoClip clip = trackerPanel.getPlayer().getVideoClip();