primer intento de reproducir: FAIL

Imanol-Mikel Barba Sabariego
1 parent e7ab16fe
Showing 2 changed files with 63 additions and 48 deletions
src/com/upc/pbe/upcnews/Directoris.java
src/com/upc/pbe/upcnews/HLS.java
@@ -4,7 +4,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -76,7 +78,21 @@ public class Directoris extends Activity implements OnItemClickListener {
 					ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
 					Log.d(TAG, "parsing completed");
 					HLS h = new HLS(m3u8parsed,((UpcApp)getApplication()).getLocalPath());
-					h.start();
+					h.loadVideo();
+					/*
+					 * while(true)
+					 * {
+					 * 	  String[] segment = h.next();
+					 * 	  if(segment == null)
+					 *    {
+					 *        break;
+					 *    }
+					 * Log.d(TAG,segment[0]);
+					 * startPlayer(segment[0],segment[1]);
+					 */
+					String[] test = {"/sdcard/a.ts","LE TEST"};
+					startPlayer(test[0],test[1]);
+					
 				}
 				catch (ErrorException e){
 					Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
@@ -108,29 +124,15 @@ public class Directoris extends Activity implements OnItemClickListener {
 		}
 	}
-	public boolean onCreateOptionsMenu(Menu menu){
-		//Determina el funcionament al apretar la tecla d'opcions
-		getMenuInflater().inflate(R.menu.menu, menu);
-		Log.d(TAG, "Menu");
-		return true;
+	private void startPlayer(String url, String title) {
+	    Intent i = new Intent();
+	    i.setComponent(new ComponentName("me.abitno.vplayer.t", "me.abitno.vplayer.VideoActivity"));
+	    i.setAction("me.abitno.vplayer.action.VIEW");
+	    i.setData(Uri.parse(url));
+	    i.putExtra("displayName", title);
+	    startActivity(i);
 	}
-
-	public boolean onOptionsItemSelected(MenuItem item){
-		//Determina el funcionament al clickar en el menu d'opcions
-		switch (item.getItemId()){
-			case R.id.itemprefs:
-				startActivity(new Intent(this, Prefs.class));
-				Log.d(TAG, "Preferences");
-				return true;
-			case R.id.itemhelp:
-				startActivity(new Intent(this, Help.class));
-				Log.d(TAG, "Help");
-				return true;
-			default:
-				return false;
-		}
-	}
-
+	
 	public boolean onKeyDown(int keyCode, KeyEvent event)  {
 		//Determina el funcionament al apretar la tecla de tornar enrere
 	    if (keyCode == KeyEvent.KEYCODE_BACK && event.getRepeatCount() == 0){
@@ -2,6 +2,9 @@ package com.upc.pbe.upcnews;
 import java.util.ArrayList;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
 import android.util.Log;
 //Gestor del protocol HTTP Live Streaming
@@ -9,6 +12,8 @@ public class HLS {
 	private static final String TAG = "HLS";
 	private ArrayList<ParentList> videos;
+	private ArrayList<Segment> segments;
+	private ArrayList<Video> qualities;
 	private int currentVideo ;
 	private int currentQuality; //0 es la mas alta
 	private int currentSegment;
@@ -25,31 +30,39 @@ public class HLS {
 		bm = new BandwidthMeasurer();
 	}
-	public void start(){
-		for(currentVideo = 0; currentVideo < videos.size(); currentVideo++){
-			ArrayList<Video> qualities = videos.get(currentVideo++).getLists();
-			while(!endReached){
-				ArrayList<Segment> segments = qualities.get(currentQuality).getSegments(); 
-				while(true){
-					Segment seg = segments.get(currentSegment++);
-					Log.d(TAG, seg.getName() + " " + seg.getURL());
-					long startTime = System.currentTimeMillis();
-					//long segmentBytes = fd.Download(seg.getURL(),localFolder);
-					long segmentBytes = 0;
-					double bps = bm.Measure(segmentBytes,startTime);
-					if((bps < qualities.get(currentQuality).getQuality()) && (bps != -1)){
-						currentQuality++;
-						break;
-					}
-					 /*
-					  * REPRODUCIR SEGMENTO
-					  */
-					if(currentSegment == segments.size()){
-						endReached = true;
-						break;
-					}
-				}
-			}		
+	public void loadVideo()
+	{
+		qualities = videos.get(currentVideo++).getLists();
+		segments = qualities.get(currentQuality).getSegments();
+		if(currentVideo == videos.size())
+		{
+			endReached = true;
 		}
 	}
+	
+	public String[] next()
+	{
+		Segment seg = segments.get(currentSegment++);
+		Log.d(TAG, seg.getName() + " " + seg.getURL());
+		long startTime = System.currentTimeMillis();
+		//long segmentBytes = fd.Download(seg.getURL(),localFolder);
+		long segmentBytes = 0;
+		double bps = bm.Measure(segmentBytes,startTime);
+		if((bps < qualities.get(currentQuality).getQuality()) && (bps != -1))
+		{
+			currentQuality++;
+		}
+		String[] data = new String[2];
+		data[0] = seg.getURL().substring(seg.getURL().lastIndexOf("/")+2, seg.getURL().length());
+		data[1] = seg.getName();
+		if(currentSegment == segments.size())
+		{
+			if(endReached)
+			{
+				return null;
+			}
+			loadVideo();
+		}
+		return data;
+	}
 }
 \ No newline at end of file