From c12833f5e31c3f4a3c7302534960f27961e02486 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Sat, 8 Dec 2012 18:17:49 +0000
Subject: [PATCH] HLS casi terminado, añadido BandwidthMeasurer

---
 src/com/upc/pbe/upcnews/BandwidthMeasurer.java | 27 +++++++++++++++++++++++++++
 src/com/upc/pbe/upcnews/Directoris.java        |  5 ++---
 src/com/upc/pbe/upcnews/HLS.java               | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
 src/com/upc/pbe/upcnews/MainActivity.java      | 45 +++++----------------------------------------
 src/com/upc/pbe/upcnews/Parser.java            |  4 ++--
 src/com/upc/pbe/upcnews/UpcApp.java            | 15 +++++++++++----
 src/com/upc/pbe/upcnews/Video.java             |  8 ++++----
 7 files changed, 94 insertions(+), 67 deletions(-)
 create mode 100644 src/com/upc/pbe/upcnews/BandwidthMeasurer.java

diff --git a/src/com/upc/pbe/upcnews/BandwidthMeasurer.java b/src/com/upc/pbe/upcnews/BandwidthMeasurer.java
new file mode 100644
index 0000000..12a879f
--- /dev/null
+++ b/src/com/upc/pbe/upcnews/BandwidthMeasurer.java
@@ -0,0 +1,27 @@
+package com.upc.pbe.upcnews;
+
+import android.net.TrafficStats;
+
+public class BandwidthMeasurer
+{
+	public double Measure(long rxBytes, long Time)
+	{
+	    double bps;
+		long TotalRxAfterTest = TrafficStats.getTotalRxBytes();
+		long AfterTime = System.currentTimeMillis();
+
+		double TimeDifference = AfterTime - Time;
+
+		double rxDiff = TotalRxAfterTest - rxBytes;
+		
+		if(rxDiff != 0)
+		{
+			bps = (rxDiff / (TimeDifference/1000)); // total rx bytes per second.
+		}
+		else
+		{
+			bps = -1; //No transmitted data
+		}
+		return bps;
+	}
+}
diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java
index 8a37f91..fe5bc93 100644
--- a/src/com/upc/pbe/upcnews/Directoris.java
+++ b/src/com/upc/pbe/upcnews/Directoris.java
@@ -112,9 +112,8 @@ public class Directoris extends Activity implements OnItemClickListener
 			{
 				ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
 				Log.d(TAG, "parsing completed");
-				HLS h = new HLS(m3u8parsed);
-			//	h.start();
-
+				HLS h = new HLS(m3u8parsed,((UpcApp)getApplication()).getLocalPath());
+				h.start();
 			}
 			catch (ErrorException e)
 			{
diff --git a/src/com/upc/pbe/upcnews/HLS.java b/src/com/upc/pbe/upcnews/HLS.java
index 9c3c74f..a66c859 100644
--- a/src/com/upc/pbe/upcnews/HLS.java
+++ b/src/com/upc/pbe/upcnews/HLS.java
@@ -2,31 +2,60 @@ package com.upc.pbe.upcnews;
 
 import java.util.ArrayList;
 
+import android.util.Log;
+
 public class HLS {
 
-	static final String TAG = "HLS";
-	
-	ArrayList<ParentList> videos;
-	int video;
-	int quality; //0 es la más alta
+	private static final String TAG = "HLS";
+	private ArrayList<ParentList> videos;
+	private int currentVideo ;
+	private int currentQuality; //0 es la más alta
+	private int currentSegment;
+	private boolean endReached;
+	private String localFolder;
+	//private fileDownloader fd;
+	private BandwidthMeasurer bm;
 	
-	public HLS(ArrayList<ParentList> parsed)
+	public HLS(ArrayList<ParentList> parsed, String localFolder)
 	{
+		currentVideo = currentQuality = currentSegment = 0;
 		this.videos = parsed;
-		video = 0;
-		quality = 0;
+		endReached = false;
+		this.localFolder = localFolder;
+		bm = new BandwidthMeasurer();
 	}
 	
 	public void start()
 	{
-		int currentVideo = 0;
-		for(video = 0; video < videos.size(); video++)
+		for(currentVideo = 0; currentVideo < videos.size(); currentVideo++)
 		{
-			ArrayList<Video> qualities = videos.get(video).getLists();
-			/*while(i > videos.get(quality).getLists())
+			ArrayList<Video> qualities = videos.get(currentVideo++).getLists();
+			while(!endReached)
 			{
-				Segment seg = videos.get(video).getLists().get(quality).getSegments().get(i);
-			}*/			
+				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())
+					{
+						currentQuality++;
+						break;
+					}
+					 /*
+					  * REPRODUCIR SEGMENTO
+					  */
+					if(currentSegment == segments.size())
+					{
+						endReached = true;
+						break;
+					}
+				}
+			}		
 		}
 	}
 }
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 4833510..869bda0 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -1,10 +1,7 @@
 package com.upc.pbe.upcnews;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -12,55 +9,23 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
-import android.widget.TextView;
 import android.widget.Toast;
 
 public class MainActivity extends Activity implements OnClickListener {
-	final static String TAG = "Main";
-	static String html;
-	WifiManager wifi;
-
-	Directoris dir;
-	ImageButton buttonDescarrega;
-	String file = "ejemplo.xml";
-	String folder = "Environment.getExternalStorageDirectory.getPath()";
-	TextView showText;
+	private final static String TAG = "Main";
+	private static String html;
+	private ImageButton buttonDescarrega;
 
 	
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		/*
-		 * FALTA:
-		 * 			Boton mayor resolucion
-		 */
+	public void onCreate(Bundle savedInstanceState) 
+	{
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main_activity);
 		Log.d(TAG, "onCreated");
 		buttonDescarrega = (ImageButton) findViewById(R.id.button);
 		buttonDescarrega.setOnClickListener(this);
-		showText = (TextView) findViewById(R.id.textViewXml);
 		this.getUrl();
-		
-		new Thread() {
-			public void run() {
-				//Wifi Info
-				int speed = 0;
-				for (int i = 0; i < 5; i++) {
-					wifi = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-					WifiInfo info = wifi.getConnectionInfo();
-					speed = speed + info.getLinkSpeed();
-					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-						e.printStackTrace();
-					}
-					
-				}
-			
-				String str = "Speed: " + speed/5;
-				Log.d(TAG, str);
-			}
-		}.start();
 	}
 
 	public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/src/com/upc/pbe/upcnews/Parser.java b/src/com/upc/pbe/upcnews/Parser.java
index d51faff..4e5a32c 100644
--- a/src/com/upc/pbe/upcnews/Parser.java
+++ b/src/com/upc/pbe/upcnews/Parser.java
@@ -221,7 +221,7 @@ public class Parser
 							}
 							expectList = true;
 							String programID = "";
-							int bandwidth = -1;
+							double bandwidth = -1;
 							String[] arguments = extTag[1].split(",");
 							for (int i = 0; i < arguments.length; i++)
 							{
@@ -261,7 +261,7 @@ public class Parser
 								}
 								else if (argument[0].equals("BANDWIDTH"))
 								{
-									bandwidth = Integer.parseInt(argument[1]);
+									bandwidth = Double.parseDouble(argument[1]);
 								}
 							}
 							if (programID.equals("") || bandwidth == -1)
diff --git a/src/com/upc/pbe/upcnews/UpcApp.java b/src/com/upc/pbe/upcnews/UpcApp.java
index 6d6ff75..39dcf32 100644
--- a/src/com/upc/pbe/upcnews/UpcApp.java
+++ b/src/com/upc/pbe/upcnews/UpcApp.java
@@ -3,6 +3,7 @@ package com.upc.pbe.upcnews;
 import android.app.Application;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
@@ -10,10 +11,16 @@ import android.util.Log;
 public class UpcApp extends Application implements OnSharedPreferenceChangeListener {
 
 	final static String TAG = "Application";
-	SharedPreferences prefs;
-	String defaultUrl = "imanolbarba.myftp.biz/PBE";
-	String url = null;
-	String desc;
+	private SharedPreferences prefs;
+	private String defaultUrl = "imanolbarba.myftp.biz/PBE";
+	private String url = null;
+	private String desc;
+	private final static String localPath = Environment.getExternalStorageDirectory().getPath() + "UPC/";
+	
+	public String getLocalPath()
+	{
+		return localPath;
+	}
 	
 	public String getUrl() {
 		url = "http://" + prefs.getString("server", defaultUrl);
diff --git a/src/com/upc/pbe/upcnews/Video.java b/src/com/upc/pbe/upcnews/Video.java
index 0b4c9c9..4361cd2 100644
--- a/src/com/upc/pbe/upcnews/Video.java
+++ b/src/com/upc/pbe/upcnews/Video.java
@@ -5,12 +5,12 @@ import java.util.ArrayList;
 public class Video
 {
 
-	private int quality;
+	private double quality;
 	private int sequenceFirst;
 	private int maxDuration;
 	private ArrayList<Segment> segments; //Lista de SEGMENTOS
 
-	public Video(int q)
+	public Video(double q)
 	{
 		quality = q;
 		segments = new ArrayList<Segment>();
@@ -36,12 +36,12 @@ public class Video
 		return maxDuration;
 	}
 	
-	public int getQuality()
+	public double getQuality()
 	{
 		return quality;
 	}
 	
-	public void setQuality(int q)
+	public void setQuality(double q)
 	{
 		quality = q;
 	}
--
libgit2 0.22.2