Reproductor funcionando 100%

Imanol-Mikel Barba Sabariego
1 parent 29086b71
Showing 5 changed files with 92 additions and 90 deletions
src/com/upc/pbe/upcnews/BandwidthMeasurer.java
src/com/upc/pbe/upcnews/Descarrega.java
src/com/upc/pbe/upcnews/HLS.java
src/com/upc/pbe/upcnews/MainActivity.java
src/com/upc/pbe/upcnews/VideoActivity.java
 package com.upc.pbe.upcnews;
 import android.net.TrafficStats;
+import android.util.Log;
 //Mesura la velocitat (Bandwidth) d'Internet
 public class BandwidthMeasurer 
 {
-	public double Measure(long rxBytes, long Time){
+	private final static String TAG = "Measurer";
+	public double Measure(long rxBytes, long Time)
+	{
 		long AfterTime = System.currentTimeMillis();
 	    double bps;
 		long TotalRxAfterTest = TrafficStats.getTotalRxBytes();
 		double TimeDifference = AfterTime - Time;
 		double rxDiff = TotalRxAfterTest - rxBytes;
-		
+		Log.d(TAG,"Time difference = " + TimeDifference/1000);
+		Log.d(TAG, "Bytes difference = " + rxDiff);
 		if(rxDiff != 0){
 			bps = ((rxDiff*8) / (TimeDifference/1000)); // total rx bits per second.
 		}
@@ -7,7 +7,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -15,72 +14,60 @@ import android.os.AsyncTask;
 import android.util.Log;
 //Descarrega un arxiu i el guarda o retorna en String
-public class Descarrega extends AsyncTask<Object, Object, Object> {
-	
+public class Descarrega extends AsyncTask<Object, Object, Object>
+{
+
 	final static String TAG = "Descarrega";
-	private String url, carpeta, nomarxiu, html;
-	private File arxiu;
+	private String html;
-	public Descarrega() {
-		nomarxiu = "ejemplo.xml";
-		carpeta = "Environment.getExternalStorageDirectory.getPath()";
-		this.carpeta = null;
-		this.html = "";
-		this.arxiu = null;
+	public Descarrega()
+	{
+		html = "";
 	}
-	public void descarregarguardar(String u, String nom, String car) {
-		//Descarrega un arxiu i el guarda
-		this.nomarxiu = nom;
-		this.carpeta = car;
-		this.url = u;
-		//Creem el directori
-		File dir = new File(carpeta);
-		if (!dir.exists()) {
-			if (!dir.mkdir()) {
-				return; // No s'ha pogut crear (ja existeix)
-			}
-		}
-		//Creem l'arxiu
-		arxiu = new File(carpeta + nomarxiu);
-		//Iniciem la descarrega
-		try {
-			URLConnection conn = new URL(url).openConnection();
-			conn.connect();
-			Log.d(TAG, "\nDescarregant: \n");
-			Log.d(TAG, " >> URL: " + url + " >> Nom: " + nomarxiu
-					+ " >> Tamany: " + conn.getContentLength() + " bytes");
-			//Llegeix cada byte i l'escriu en un arxiu fins que arriba a -1
-			InputStream in = conn.getInputStream();
-			OutputStream out = new FileOutputStream(arxiu);
-			int b = 0;
-			while (b != -1) {
-				b = in.read();
-				if (b != -1) {
-					out.write(b);
-				}
+	public long descarregarguardar(String url, String path) throws IOException
+	{
+		// Descarrega un arxiu i el guarda
+		// Creem l'arxiu
+		File file = new File(path + url.substring(url.lastIndexOf("/")+1, url.length()));
+		// Iniciem la descarrega
+
+		URLConnection conn = new URL(url).openConnection();
+		conn.connect();
+		Log.d(TAG, "\nDescarregant: \n");
+		Log.d(TAG, " >> URL: " + url + " >> Desti: " + path + " >> Tamany: "
+				+ conn.getContentLength() + " bytes");
+		// Llegeix cada byte i l'escriu en un arxiu fins que arriba a -1
+		InputStream in = conn.getInputStream();
+		OutputStream out = new FileOutputStream(file);
+		int b = 0;
+		while (b != -1)
+		{
+			b = in.read();
+			if (b != -1)
+			{
+				out.write(b);
 			}
-			out.close();
-			in.close();
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
 		}
+		out.close();
+		in.close();
+		return conn.getContentLength();
 	}
-	protected String doInBackground(String u) throws IOException {
-		//Descarrega un arxiu i el retorna en un String
-		this.url = u;
+	protected String doInBackground(String url) throws IOException
+	{
+		// Descarrega un arxiu i el retorna en un String
 		html = "";
-		//Iniciem la connexió i creem els Streams
+		// Iniciem la connexiï¿½ i creem els Streams
 		URLConnection conn = new URL(url).openConnection();
 		BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-		//Iniciem la descarrega i anem guardant al String
+		// Iniciem la descarrega i anem guardant al String
 		Log.d(TAG, "\nDescarregant: \n");
-		Log.d(TAG, ">> URL: " + url + " >> Tamany: " + conn.getContentLength()+ " bytes");
+		Log.d(TAG, ">> URL: " + url + " >> Tamany: " + conn.getContentLength()
+				+ " bytes");
 		String inputLine;
-		while ((inputLine = in.readLine()) != null) {
+		while ((inputLine = in.readLine()) != null)
+		{
 			html = html + "\n" + inputLine;
 		}
 		Log.d(TAG, "Descarrega finalitzada");
@@ -89,8 +76,9 @@ public class Descarrega extends AsyncTask&lt;Object, Object, Object&gt; {
 	}
 	@Override
-	protected Object doInBackground(Object... arg0) {
-		//Metode Overrided, no te utilitat
+	protected Object doInBackground(Object... arg0)
+	{
+		// Metode Overrided, no te utilitat
 		return null;
 	}
 }
 package com.upc.pbe.upcnews;
-
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
+
+import android.net.TrafficStats;
 import android.util.Log;
 //Gestor del protocol HTTP Live Streaming
-public class HLS 
+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 currentVideo;
+	private int currentQuality; // 0 es la mas alta
 	private int currentSegment;
 	private boolean endReached;
 	private String localFolder;
-	//private FileDownloader fd;
+	private Descarrega d;
 	private BandwidthMeasurer bm;
-	
+
 	public HLS(ArrayList<ParentList> parsed, String localFolder)
 	{
 		/*
@@ -27,10 +29,10 @@ public class HLS
 		 */
 		File dir = new File(localFolder);
 		String[] files = dir.list();
-		for(int i = 0; i < files.length; i++)
+		for (int i = 0; i < files.length; i++)
 		{
-			File deleteme = new File(dir,files[i]);
-			Log.d(TAG,"Deleted " + files[i].toString());
+			File deleteme = new File(dir, files[i]);
+			Log.d(TAG, "Deleted " + files[i].toString());
 			deleteme.delete();
 		}
 		currentVideo = currentQuality = currentSegment = 0;
@@ -38,31 +40,21 @@ public class HLS
 		endReached = false;
 		this.localFolder = localFolder;
 		bm = new BandwidthMeasurer();
-		//fd = new FileDownloader();
+		d = new Descarrega();
 	}
-	
+
 	public void loadVideo()
 	{
 		qualities = videos.get(currentVideo++).getLists();
 		segments = qualities.get(currentQuality).getSegments();
-		if(currentVideo == videos.size())
+		if (currentVideo == videos.size())
 		{
 			endReached = true;
 		}
 	}
-	
-	public String next()
+
+	public String next() throws IOException
 	{
-		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++;
-		}
 		if(currentSegment == segments.size())
 		{
 			if(endReached)
@@ -71,7 +63,17 @@ public class HLS
 			}
 			loadVideo();
 		}
-		
+		Segment seg = segments.get(currentSegment++);
+		Log.d(TAG, seg.getName() + " " + seg.getURL());
+		long startTime = System.currentTimeMillis();
+		long segmentBytes = TrafficStats.getTotalRxBytes();
+		d.descarregarguardar(seg.getURL(),localFolder);
+		double bps = bm.Measure(segmentBytes,startTime);
+		Log.d(TAG, "Current KB/s: " + (bps/8e3));
+		if((bps < qualities.get(currentQuality).getQuality()) && (bps != -1))
+		{
+			currentQuality++;
+		}
 		return localFolder + seg.getURL().substring(seg.getURL().lastIndexOf("/")+1, seg.getURL().length());
 	}
 }
 \ No newline at end of file
@@ -107,7 +107,7 @@ public class MainActivity extends Activity implements OnClickListener {
 	/*
 	 * COSAS POR HACER
 	 * Qué coño pasa con los codecs -- Yo
-	 * Descargador de archivos binario -- Marc
+	 * CRASH AL DARLE A LA TECLA MENU DENTRO DE LAS PREFERENCES -- Marc
 	 * Poner la defaultURL al server de PBE
 	 * Unificar la lengua de todo (WERT STYLE FUCK YES) y que cada uno documente minimamente su codigo
 	 * Borrar esta puta mierda
 package com.upc.pbe.upcnews;
+import java.io.IOException;
+
 import android.app.Activity;
 import android.media.MediaPlayer;
 import android.net.Uri;
@@ -7,6 +9,7 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
 import android.widget.MediaController;
+import android.widget.Toast;
 import android.widget.VideoView;
 public class VideoActivity extends Activity
@@ -24,8 +27,7 @@ public class VideoActivity extends Activity
 		{
 		    public void onCompletion(MediaPlayer mp)
 		    {
-		    	play(null);
-		        //playNext();
+		        playNext();
 		    } 
 		});
 		h = ((UpcApp)getApplication()).getHLS();
@@ -40,6 +42,7 @@ public class VideoActivity extends Activity
 			super.finish();
 			return;
 		}
+		Log.d(TAG,url);
 		video.setVideoURI(Uri.parse(url));
 		video.setMediaController(new MediaController(this));
 		video.start();
@@ -48,10 +51,15 @@ public class VideoActivity extends Activity
 	public void playNext()
 	{
-		String next = h.next();
-		Log.d(TAG,next);
-		//play(next);
-		play("/sdcard/a.ts");
+		try
+		{
+			String next = h.next();
+			play(next);
+		}
+		catch(IOException e)
+		{
+			Toast.makeText(this, "Can't find segment", Toast.LENGTH_LONG).show();
+		}
 	}
 	@Override