diff --git a/.classpath b/.classpath
index 6170310..06efd60 100644
--- a/.classpath
+++ b/.classpath
@@ -4,6 +4,6 @@
-
+
diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index cebd22e..7054edd 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -1,76 +1,76 @@
-/* AUTO-GENERATED FILE. DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found. It
- * should not be modified by hand.
- */
-
-package com.upc.pbe.upcnews;
-
-public final class R {
- public static final class attr {
- }
- public static final class drawable {
- public static final int ic_action_search=0x7f020000;
- public static final int ic_launcher=0x7f020001;
- public static final int ic_menu_name=0x7f020002;
- }
- public static final class id {
- public static final int AbsoluteLayout1=0x7f08000a;
- public static final int ImageView01=0x7f08000c;
- public static final int ImageView1=0x7f08000b;
- public static final int LinearLayout1=0x7f080001;
- public static final int button=0x7f08000f;
- public static final int button1=0x7f080003;
- public static final int button2=0x7f080004;
- public static final int button3=0x7f080005;
- public static final int button4=0x7f080006;
- public static final int button5=0x7f080007;
- public static final int itemhelp=0x7f080012;
- public static final int itemprefs=0x7f080011;
- public static final int menu_settings=0x7f080010;
- public static final int textView1=0x7f080008;
- public static final int textView2=0x7f080009;
- public static final int textViewRoute=0x7f08000d;
- public static final int textViewTitle=0x7f080002;
- public static final int textViewXml=0x7f08000e;
- public static final int videoView1=0x7f080000;
- }
- public static final class layout {
- public static final int activity_video=0x7f030000;
- public static final int dirs=0x7f030001;
- public static final int help=0x7f030002;
- public static final int main_activity=0x7f030003;
- }
- public static final class menu {
- public static final int activity_main=0x7f070000;
- public static final int activity_video=0x7f070001;
- public static final int menu=0x7f070002;
- }
- public static final class string {
- public static final int app_name=0x7f050000;
- public static final int button=0x7f05000c;
- public static final int button1=0x7f05000d;
- public static final int desc=0x7f050009;
- public static final int descarregar=0x7f050003;
- public static final int dir=0x7f05000a;
- public static final int directoris=0x7f05000b;
- public static final int hello_world=0x7f050010;
- public static final int help=0x7f050008;
- public static final int hint=0x7f050004;
- public static final int logodescription=0x7f05000f;
- public static final int menu_settings=0x7f050001;
- public static final int prefs=0x7f050007;
- public static final int title=0x7f05000e;
- public static final int title_activity_main=0x7f050002;
- public static final int title_activity_video=0x7f050011;
- public static final int url=0x7f050005;
- public static final int urlhint=0x7f050006;
- }
- public static final class style {
- public static final int AppTheme=0x7f060000;
- }
- public static final class xml {
- public static final int prefs=0x7f040000;
- }
-}
+/* AUTO-GENERATED FILE. DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found. It
+ * should not be modified by hand.
+ */
+
+package com.upc.pbe.upcnews;
+
+public final class R {
+ public static final class attr {
+ }
+ public static final class drawable {
+ public static final int ic_action_search=0x7f020000;
+ public static final int ic_launcher=0x7f020001;
+ public static final int ic_menu_name=0x7f020002;
+ }
+ public static final class id {
+ public static final int AbsoluteLayout1=0x7f08000a;
+ public static final int ImageView01=0x7f08000c;
+ public static final int ImageView1=0x7f08000b;
+ public static final int LinearLayout1=0x7f080001;
+ public static final int button=0x7f08000f;
+ public static final int button1=0x7f080003;
+ public static final int button2=0x7f080004;
+ public static final int button3=0x7f080005;
+ public static final int button4=0x7f080006;
+ public static final int button5=0x7f080007;
+ public static final int itemhelp=0x7f080012;
+ public static final int itemprefs=0x7f080011;
+ public static final int menu_settings=0x7f080010;
+ public static final int textView1=0x7f080008;
+ public static final int textView2=0x7f080009;
+ public static final int textViewRoute=0x7f08000d;
+ public static final int textViewTitle=0x7f080002;
+ public static final int textViewXml=0x7f08000e;
+ public static final int videoView1=0x7f080000;
+ }
+ public static final class layout {
+ public static final int activity_video=0x7f030000;
+ public static final int dirs=0x7f030001;
+ public static final int help=0x7f030002;
+ public static final int main_activity=0x7f030003;
+ }
+ public static final class menu {
+ public static final int activity_main=0x7f070000;
+ public static final int activity_video=0x7f070001;
+ public static final int menu=0x7f070002;
+ }
+ public static final class string {
+ public static final int app_name=0x7f050000;
+ public static final int button=0x7f05000c;
+ public static final int button1=0x7f05000d;
+ public static final int desc=0x7f050009;
+ public static final int descarregar=0x7f050003;
+ public static final int dir=0x7f05000a;
+ public static final int directoris=0x7f05000b;
+ public static final int hello_world=0x7f050010;
+ public static final int help=0x7f050008;
+ public static final int hint=0x7f050004;
+ public static final int logodescription=0x7f05000f;
+ public static final int menu_settings=0x7f050001;
+ public static final int prefs=0x7f050007;
+ public static final int title=0x7f05000e;
+ public static final int title_activity_main=0x7f050002;
+ public static final int title_activity_video=0x7f050011;
+ public static final int url=0x7f050005;
+ public static final int urlhint=0x7f050006;
+ }
+ public static final class style {
+ public static final int AppTheme=0x7f060000;
+ }
+ public static final class xml {
+ public static final int prefs=0x7f040000;
+ }
+}
diff --git a/src/com/upc/pbe/upcnews/HLS.java b/src/com/upc/pbe/upcnews/HLS.java
index a3f0d65..1e8a961 100644
--- a/src/com/upc/pbe/upcnews/HLS.java
+++ b/src/com/upc/pbe/upcnews/HLS.java
@@ -2,6 +2,9 @@ package com.upc.pbe.upcnews;
import java.util.ArrayList;
+import com.xuggle.mediatool.IMediaReader;
+import com.xuggle.mediatool.ToolFactory;
+
public class HLS {
static final String TAG = "HLS";
@@ -9,6 +12,7 @@ public class HLS {
ArrayList ppls;
int numvideo;
int quality; //0 és la més alta
+ IMediaReader reader;
public HLS(ArrayList parsed)
{
@@ -21,7 +25,11 @@ public class HLS {
//Primer vídeo que hi hagi, amb la millor qualitat possible
for(int i = 0 ; i < ppls.get(numvideo).getLists().get(quality).getSegments().size() ; i++){
-
+
+ //canviar .ts en .mp4
+ reader = ToolFactory.makeReader(ppls.get(numvideo).getLists().get(quality).getSegments().get(i).getURL());
+ reader.addListener(ToolFactory.makeWriter("output.mov", reader));
+ while (reader.readPacket() == null);
}
}
diff --git a/src/com/upc/pbe/upcnews/Segment.java b/src/com/upc/pbe/upcnews/Segment.java
index 6b944a9..6a773f7 100644
--- a/src/com/upc/pbe/upcnews/Segment.java
+++ b/src/com/upc/pbe/upcnews/Segment.java
@@ -34,8 +34,8 @@ public class Segment
this.url = new URL(url);
}
- public URL getURL()
+ public String getURL()
{
- return url;
+ return url.toString();
}
}
diff --git a/src/com/upc/pbe/upcnews/VideoActivity.java b/src/com/upc/pbe/upcnews/VideoActivity.java
index eb1b3bd..c323d5d 100644
--- a/src/com/upc/pbe/upcnews/VideoActivity.java
+++ b/src/com/upc/pbe/upcnews/VideoActivity.java
@@ -1,44 +1,40 @@
package com.upc.pbe.upcnews;
-import com.xuggle.mediatool.IMediaReader;
-import com.xuggle.mediatool.ToolFactory;
-
+import android.app.Activity;
import android.net.Uri;
import android.os.Bundle;
-import android.app.Activity;
import android.view.Menu;
import android.widget.MediaController;
import android.widget.VideoView;
+import com.xuggle.mediatool.IMediaReader;
+
public class VideoActivity extends Activity {
-
+
VideoView video;
String url;
- IMediaReader reader;
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_video);
- url = "http://imanolbarba.myftp.biz/video.mp4";
- //url = ((UpcApp) getApplication()).getDesc();
-
- reader = ToolFactory.makeReader("input.flv");
- reader.addListener(ToolFactory.makeWriter("output.mov", reader));
- while(reader.readPacket() == null);
-
- //Creacio del VideoPlayer associat a una URL
- video = (VideoView) findViewById(R.id.videoView1);
- video.setVideoURI(Uri.parse(url));
- video.setMediaController(new MediaController(this));
- video.start();
- video.requestFocus();
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.activity_video, menu);
- return true;
- }
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_video);
+ url = "http://imanolbarba.myftp.biz/video.mp4";
+ // url = ((UpcApp) getApplication()).getDesc();
+
+
+
+ // Creacio del VideoPlayer associat a una URL
+ video = (VideoView) findViewById(R.id.videoView1);
+ video.setVideoURI(Uri.parse(url));
+ video.setMediaController(new MediaController(this));
+ video.start();
+ video.requestFocus();
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.activity_video, menu);
+ return true;
+ }
}