PImage will be initialized in the child class

Signed-off-by: Umair Khan <[email protected]>

Author: omerjerk

src/in/omerjerk/processing/video/android/Capture.java

@@ -33,7 +33,12 @@ public Capture(PApplet parent) {
 	}
 
 	public Capture(final PApplet parent, int width, int height) {
-		super(parent, width, height);
+		super(parent);
+		if (width == -1 || height == -1) {
+		    width = 720;
+		    height = 720;
+		}
+		init(width, height, ARGB);
 
 		activity.runOnUiThread(new Runnable() {
 			@Override

src/in/omerjerk/processing/video/android/Movie.java

@@ -1,6 +1,7 @@
 package in.omerjerk.processing.video.android;
 
 import in.omerjerk.processing.video.android.callbacks.MediaPlayerHandlerCallback;
+import android.media.MediaMetadataRetriever;
 import android.media.MediaPlayer;
 import android.os.Handler;
 import android.os.Looper;
@@ -13,12 +14,14 @@ public class Movie extends VideoBase implements MediaPlayerHandlerCallback {
     private MediaPlayerHandler handler;
     private MediaPlayer player;
 
-	public Movie(PApplet parent) {
-		this(parent, -1, -1);
-	}
-	
-	public Movie(PApplet parent, int width, int height) {
-	    super(parent, width, height);
+	public Movie(PApplet parent, String fileName) {
+	    super(parent);
+	    MediaMetadataRetriever metaRetriever = new MediaMetadataRetriever();
+	    metaRetriever.setDataSource(fileName);
+	    String height = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT);
+	    String width = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH);
+	    init(Integer.valueOf(width), Integer.valueOf(height), ARGB);
+	    
 	    new Thread(new Runnable() {
             @Override
             public void run() {

src/in/omerjerk/processing/video/android/VideoBase.java

@@ -50,15 +50,9 @@ public static void log(String log) {
     public abstract void onResume();
     public abstract void onPause();
 
-    public VideoBase(PApplet parent, int width, int height) {
+    public VideoBase(PApplet parent) {
         super();
         this.parent = parent;
-        if (width == -1 || height == -1) {
-            //TODO: Temp hack. Needs to be handled intelligently.
-            width = 720;
-            height = 1280;
-        }
-        init(width, height, ARGB);
 
         parent.registerMethod("pause", this);
         parent.registerMethod("resume", this);