updates for consul

Author: jq5

P2Pconsul/NodeUrl.go

@@ -149,7 +149,7 @@ func (n *NodeUrl) RegisterNode() {
 }
 
 //Search search network for a given url
-func (n *NodeUrl) Search(url string, segmentDuration int, addSegDuration bool) string {
+func (n *NodeUrl) Search(url string, segmentDuration int, addSegDuration bool, dashProfile string) string {
 	//start timer of search fucntion
 	start := time.Now()
 	n.DebugPrint("in consul search url :" + url)
@@ -160,7 +160,7 @@ func (n *NodeUrl) Search(url string, segmentDuration int, addSegDuration bool) s
 	//location := l[len(l)-1]
 	var location string
 	if addSegDuration {
-		location = strconv.Itoa(segmentDuration) + "sec_" + l[len(l)-1]
+		location = strconv.Itoa(segmentDuration) + "sec_" + dashProfile + "_" + l[len(l)-1]
 	} else {
 		location = l[len(l)-1]
 	}

evaluate/config/configure.json

@@ -15,7 +15,7 @@
         "expRatio" : 0.2,
         "quic" : "off",
         "useTestbed" : "off",
-        "url" : "[http://cs1dev.ucc.ie/misl/4K_non_copyright_dataset/2_sec/x264/bbb/DASH_Files/full/bbb_enc_x264_dash.mpd]",
+        "url" : "[http://cs1dev.ucc.ie/misl/4K_non_copyright_dataset/2_sec/x264/bbb/DASH_Files/full_byte_range/bbb_enc_x264_dash.mpd]",
         "QoE" : "on",
         "serveraddr" : "on"
 }

http/mpdParsing.go

@@ -73,6 +73,7 @@ type StreamStruct struct {
 	AudioContent          bool
 	RepRate               int
 	BandwithList          []int
+	Profile               string
 }
 
 // MPD structure

http/urlParsing.go

@@ -504,7 +504,7 @@ func JoinURL(baseURL string, append string, debugLog bool) string {
  */
 func GetFile(currentURL string, fileBaseURL string, fileLocation string, isByteRangeMPD bool, startRange int, endRange int,
 	segmentNumber int, segmentDuration int, addSegDuration bool, quicBool bool, debugFile string, debugLog bool,
-	useTestbedBool bool, repRate int, saveFilesBool bool, AudioByteRange bool) (time.Duration, int, string, string, float64) {
+	useTestbedBool bool, repRate int, saveFilesBool bool, AudioByteRange bool, profile string) (time.Duration, int, string, string, float64) {
 
 	// create the string where we want to save this file
 	var createFile string
@@ -522,14 +522,17 @@ func GetFile(currentURL string, fileBaseURL string, fileLocation string, isByteR
 	base := path.Base(fileBaseURL)
 
 	// we need to create a file to save for the byte-range content
-	if isByteRangeMPD && !AudioByteRange {
+	// but only for the video byte range and not audio byte range
+	// if isByteRangeMPD && !AudioByteRange {
+	// for now, lets just save each segment
+	if isByteRangeMPD {
 		s := strings.Split(base, ".")
 		base = s[0] + "_segment" + strconv.Itoa(segmentNumber) + ".m4s"
 	}
 
 	// create the new file location, or not
-	if addSegDuration || AudioByteRange {
-		createFile = fileLocation + "/" + strconv.Itoa(segmentDuration) + "sec_" + base
+	if !strings.Contains(base, profile) && (addSegDuration || AudioByteRange) {
+		createFile = fileLocation + "/" + strconv.Itoa(segmentDuration) + "sec_" + profile + "_" + base
 	} else {
 		createFile = fileLocation + "/" + base
 	}
@@ -629,7 +632,7 @@ func GetFile(currentURL string, fileBaseURL string, fileLocation string, isByteR
  * get the provided file from the online HTTP server and save to folder
  * get a 1-second piece of each file
  */
-func GetFileProgressively(currentURL string, fileBaseURL string, fileLocation string, isByteRangeMPD bool, startRange int, endRange int, segmentNumber int, segmentDuration int, addSegDuration bool, debugLog bool, AudioByteRange bool) (time.Duration, int) {
+func GetFileProgressively(currentURL string, fileBaseURL string, fileLocation string, isByteRangeMPD bool, startRange int, endRange int, segmentNumber int, segmentDuration int, addSegDuration bool, debugLog bool, AudioByteRange bool, profile string) (time.Duration, int) {
 
 	// create the string where we want to save this file
 	var createFile string
@@ -646,14 +649,16 @@ func GetFileProgressively(currentURL string, fileBaseURL string, fileLocation st
 	base := path.Base(fileBaseURL)
 
 	// we need to create a file to save for the byte-range content
-	if isByteRangeMPD && !AudioByteRange {
+	// if isByteRangeMPD && !AudioByteRange {
+	if isByteRangeMPD {
+		// for now, lets just save each segment
 		s := strings.Split(base, ".")
 		base = s[0] + "_segment" + strconv.Itoa(segmentNumber) + ".m4s"
 	}
 
 	// create the new file location, or not
-	if addSegDuration {
-		createFile = fileLocation + "/" + strconv.Itoa(segmentDuration) + "sec_" + base
+	if addSegDuration && !strings.Contains(base, profile) {
+		createFile = fileLocation + "/" + strconv.Itoa(segmentDuration) + "sec_" + profile + "_" + base
 	} else {
 		createFile = fileLocation + "/" + base
 	}

logging/debug.go

@@ -80,6 +80,7 @@ type SegPrintLogInformation struct {
 	SumRateChange  float64
 	RateChange     []float64
 	MimeType       string
+	Profile        string
 }
 
 // headers for the print log