From 44688419cd4ae29c38488553465f1c35fd2fd784 Mon Sep 17 00:00:00 2001 From: Equip de Desenvolupadors de PBE Date: Sun, 18 Nov 2012 21:28:27 +0000 Subject: [PATCH] --- hls_script.sh | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/com/upc/pbe/upcnews/Parser.java | 80 +++++++++++++++++++++++++++++++++++--------------------------------------------- 2 files changed, 209 insertions(+), 45 deletions(-) create mode 100755 hls_script.sh diff --git a/hls_script.sh b/hls_script.sh new file mode 100755 index 0000000..80549c5 --- /dev/null +++ b/hls_script.sh @@ -0,0 +1,174 @@ +#!/bin/bash + +# WIFLY VARIABLES + +SSID=PBE +#SSID=SERVER_WLAN +ROUTE=$1 +DEST_IP=10.0.2.100 +#DEST_IP=192.168.1.1 +PORT=80 +WIFLY=/dev/ttyUSB0 +SERIAL_OPTS="ispeed $SPEED ospeed $SPEED" +SPEED=9600 +STARTWORD="Content-Type: application/vnd.apple.mpegurl" +ENDWORD="*CLOS*" +WRITE=0 + +# PARSING VARIABLES + +M3U8_VALIDATED=0 +SEQUENCE_FIRST=0 +MAX_DURATION=-1 +CURRENT_SEGMENT=0 +CURRENT_LINE=1 +EXTINF=0 +CODECS="" +RESOLUTION="" +BANDWIDTH="" +PROGRAMID="" +EXTXSTREAM=0 + +# FUNCTIONS + +parse() +{ + if [[ $line == "" ]];then + ((CURRENT_LINE++)) + return + else + if [[ $M3U8_VALIDATED -eq 0 ]]; then + if [[ $line == "#EXTM3U" ]]; then + M3U8_VALIDATED=1 + else + echo "ERROR: This is not an m3u8 file!!" + exit 1 + fi + else + if [[ `echo $line | head -c1` == "#" ]]; then + if [[ `echo $line | head -c4` == "#EXT" ]]; then + case `echo $line | cut -d':' -f 1` in + "#EXT-X-MEDIA-SEQUENCE") + SEQUENCE_FIRST=`echo $line | cut -d':' -f 2`; + echo "INFO: First element to be played is: $SEQUENCE_FIRST";; + "#EXT-X-TARGETDURATION") + MAX_DURATION=`echo $line | cut -d':' -f 2`; + echo "INFO: Maximum segment duration is: $MAX_DURATION";; + "#EXTINF") + DURATION=`echo $line | cut -d':' -f 2 | cut -d',' -f 1` + if [[ $DURATION > $MAX_DURATION ]]; then + echo "ERROR: Segment $CURRENT_SEGMENT on line $CURRENT_LINE is larger than EXT-X-TARGETDURATION" + exit 1 + else + NAME=`echo $line | cut -d':' -f 2 | cut -d',' -f 2` + EXTINF=1 + fi;; + "#EXT-X-STREAM-INF") + EXTXSTREAM=1 + PROGRAMID="" + CODECS="" + RESOLUTION="" + ARGUMENTS=`echo $line | cut -d':' -f 2` + i=1 + while [[ `echo $ARGUMENTS | cut -d',' -f $i` != "" ]]; do + PARAMETER=`echo $ARGUMENTS | cut -d',' -f $i | cut -d'=' -f 2` + case `echo $ARGUMENTS | cut -d',' -f $i | cut -d'=' -f 1` in + "PROGRAM-ID") + PROGRAMID=$PARAMETER;; + "BANDWIDTH") + BANDWIDTH=$PARAMETER;; + "RESOLUTION") + RESOLUTION=$PARAMETER;; + "CODECS") + CODECS=$PARAMETER;; + esac + ((i++)) + done;; + "#EXT-X-ENDLIST") + echo "INFO: Playlist end reached";; + esac + else + echo "INFO: Comment found on line $CURRENT_LINE: \"`echo $line | cut -d'#' -f 2`\"" + fi; + else + if [[ $EXTINF -eq 1 ]]; then + echo -n "SEGMENT $CURRENT_SEGMENT: \"$NAME\" - $DURATION seconds ($line)" + EXTINF=0 + if [[ $CURRENT_SEGMENT -eq $SEQUENCE_FIRST ]]; then + echo " (first element)" + else + echo "" + fi; + ((CURRENT_SEGMENT++)) + elif [[ $EXTXSTREAM -eq 1 ]]; then + echo "PLAYLIST: $line [PROGRAM-ID=$PROGRAMID,BANDWIDTH=$BANDWIDTH,RESOLUTION=$RESOLUTION,CODECS=$CODECS]" + EXTXSTREAM=0 + else + echo "ERROR: Unexpected string \"$line\"" + exit 1 + fi + fi + fi + fi + ((CURRENT_LINE++)) +} + +fetch() +{ + echo -ne "set com remote GET\$$1\r" >> $WIFLY + echo -ne "open $DEST_IP $PORT\r" >> $WIFLY + + # PARSE + + cat $WIFLY | while read line; do + line=`echo $line | tr -d '\r' | sed 's/\*CLOS\*CMD/\*CLOS\*/g'` # STRIP EXTRA CR AND DETECT EOF + if [[ "$line" == "$STARTWORD" && $WRITE == 0 ]]; then + echo "INFO: Playlist $1 START:" + WRITE=1; + continue; + fi + if [[ "$line" == "$ENDWORD" ]]; then + echo "INFO: EOF" + break; + fi + if [[ $WRITE -eq 0 ]]; then + continue; + else + parse $line + fi + done +} + +initialize() +{ + echo -n "\$\$\$" >> $WIFLY + # IF ANY CHARACTER GETS INTO THE BUFFER 250 ms AFTER THE $$$ SEQUENCE IT WILL NOT ENTER COMMAND MODE + sleep 0.300 # TO BE SAFE +} + +if [[ -z $1 ]]; then + echo "ERROR: Missing path" + echo -e "\nUSAGE: $0 (i.e /playlist.m3u8)" + exit 1 +fi + +# SERIAL PORT CONFIGURATION + +stty -F $WIFLY $SERIAL_OPTS + +# INPUT COMMANDS + +initialize +echo -ne "set wlan join 1\r" >> $WIFLY +echo -ne "set wlan auth 0\r" >> $WIFLY +echo -ne "set wlan ssid $SSID\r" >> $WIFLY +echo -ne "join $SSID\r" >> $WIFLY +sleep 5 # GIVE TIME TO THE DHCP CLIENT +echo -ne "set ip proto 18\r" >> $WIFLY +fetch $ROUTE + +#cat $1 | while read line; do +# parse $line +#done + +exit 0 diff --git a/src/com/upc/pbe/upcnews/Parser.java b/src/com/upc/pbe/upcnews/Parser.java index 0260806..7c4075e 100644 --- a/src/com/upc/pbe/upcnews/Parser.java +++ b/src/com/upc/pbe/upcnews/Parser.java @@ -86,7 +86,27 @@ public class Parser else if(extTag[0].equals("#EXT-X-STREAM-INF")) { - + /*"#EXT-X-STREAM-INF") + EXTXSTREAM=1 + PROGRAMID="" + CODECS="" + RESOLUTION="" + ARGUMENTS=`echo $line | cut -d':' -f 2` + i=1 + while [[ `echo $ARGUMENTS | cut -d',' -f $i` != "" ]]; do + PARAMETER=`echo $ARGUMENTS | cut -d',' -f $i | cut -d'=' -f 2` + case `echo $ARGUMENTS | cut -d',' -f $i | cut -d'=' -f 1` in + "PROGRAM-ID") + PROGRAMID=$PARAMETER;; + "BANDWIDTH") + BANDWIDTH=$PARAMETER;; + "RESOLUTION") + RESOLUTION=$PARAMETER;; + "CODECS") + CODECS=$PARAMETER;; + esac + ((i++)) + done;;*/ } else if(extTag[0].equals("#EXT-X-ENDLIST")) @@ -100,42 +120,16 @@ public class Parser } } - } - - } - } - - - /* - "#EXT-X-STREAM-INF") - EXTXSTREAM=1 - PROGRAMID="" - CODECS="" - RESOLUTION="" - ARGUMENTS=`echo $line | cut -d':' -f 2` - i=1 - while [[ `echo $ARGUMENTS | cut -d',' -f $i` != "" ]]; do - PARAMETER=`echo $ARGUMENTS | cut -d',' -f $i | cut -d'=' -f 2` - case `echo $ARGUMENTS | cut -d',' -f $i | cut -d'=' -f 1` in - "PROGRAM-ID") - PROGRAMID=$PARAMETER;; - "BANDWIDTH") - BANDWIDTH=$PARAMETER;; - "RESOLUTION") - RESOLUTION=$PARAMETER;; - "CODECS") - CODECS=$PARAMETER;; - esac - ((i++)) - done;; - "#EXT-X-ENDLIST") - echo "INFO: Playlist end reached";; - esac - else + /*else echo "INFO: Comment found on line $CURRENT_LINE: \"`echo $line | cut -d'#' -f 2`\"" - fi; - else - if [[ $EXTINF -eq 1 ]]; then + fi;*/ + + + } //es tag + else + { + + /*if [[ $EXTINF -eq 1 ]]; then echo -n "SEGMENT $CURRENT_SEGMENT: \"$NAME\" - $DURATION seconds ($line)" EXTINF=0 if [[ $CURRENT_SEGMENT -eq $SEQUENCE_FIRST ]]; then @@ -150,15 +144,11 @@ public class Parser else echo "ERROR: Unexpected string \"$line\"" exit 1 - fi - fi - fi - fi - ((CURRENT_LINE++)) -} - - */ - + */ + } //no es tag + } //ya validado + } + currentLine++; } } -- libgit2 0.22.2