Rename ohost to media-host

Author: darkdarkdragon

README.md

@@ -29,6 +29,7 @@ Usage:
 Params:
 
  - `-host` Host name of broadcaster to stream to
+ - `-media-host` Host name to read transcoded stream from. If not specified, `-host` will be used
  - `-rtmp` Port number to stream RTMP stream to
  - `-media` Port number to download media from
  - `-profiles` How many transcoding profiles broadcaster configured with
@@ -136,6 +137,7 @@ Accepts object:
 ```json
 {
     "host": "localhost",
+    "media_host": "",
     "file_name": "official_test_source_2s_keys_24pfs.mp4",
     "rtmp": 1935,
     "media": 8935,

cmd/streamtester/streamtester.go

@@ -30,8 +30,8 @@ func main() {
 	sim := flag.Uint("sim", 1, "Number of simulteneous streams to stream")
 	repeat := flag.Uint("repeat", 1, "Number of time to repeat")
 	profiles := flag.Int("profiles", 2, "Number of transcoding profiles configured on broadcaster")
-	bhost := flag.String("host", "localhost", "Broadcaster's host name")
-	ohost := flag.String("orch", "", "Orchestrator's host name - Broadcaster host will be used by default if not specified")
+	bhost := flag.String("host", "localhost", "Host name (usually broadcaster's) to stream RTMP stream to")
+	mhost := flag.String("media-host", "", "Host name to read transcoded segments back from. -host will be used by default if not specified")
 	rtmp := flag.String("rtmp", "1935", "RTMP port number")
 	media := flag.String("media", "8935", "Media port number")
 	stime := flag.String("time", "", "Time to stream streams (40s, 4m, 24h45m). Not compatible with repeat option.")
@@ -126,9 +126,9 @@ func main() {
 		return
 	}
 
-	oHost := *ohost
-	if oHost == "" {
-		oHost = *bhost
+	mHost := *mhost
+	if mHost == "" {
+		mHost = *bhost
 	}
 
 	var streamDuration time.Duration
@@ -150,7 +150,7 @@ func main() {
 	} else {
 		sr = testers.NewHTTPLoadTester()
 	}
-	err = sr.StartStreams(fn, *bhost, *rtmp, oHost, *media, *sim, *repeat, streamDuration, false, *latency, *noBar, 3, 5*time.Second, waitForDur)
+	err = sr.StartStreams(fn, *bhost, *rtmp, mHost, *media, *sim, *repeat, streamDuration, false, *latency, *noBar, 3, 5*time.Second, waitForDur)
 	if err != nil {
 		glog.Fatal(err)
 	}

internal/model/models.go

@@ -31,7 +31,7 @@ type Streamer2 interface {
 
 // Streamer interface
 type Streamer interface {
-	StartStreams(sourceFileName, bhost, rtmpPort, ohost, mediaPort string, simStreams, repeat uint, streamDuration time.Duration,
+	StartStreams(sourceFileName, bhost, rtmpPort, mhost, mediaPort string, simStreams, repeat uint, streamDuration time.Duration,
 		notFinal, measureLatency, noBar bool, groupStartBy int, startDelayBetweenGroups, waitForTarget time.Duration) error
 	Stats() *Stats
 	StatsFormatted() string
@@ -80,8 +80,8 @@ type Stats struct {
 // StartStreamsReq start streams request
 type StartStreamsReq struct {
 	FileName        string `json:"file_name"`
-	BHost           string `json:"host"`
-	OHost           string `json:"ohost"`
+	Host            string `json:"host"`
+	MHost           string `json:"media_host"`
 	RTMP            int    `json:"rtmp"`
 	Media           int    `json:"media"`
 	Repeat          uint   `json:"repeat"`

internal/server/server.go

@@ -122,13 +122,13 @@ func (ss *StreamerServer) handleStartStreams(w http.ResponseWriter, r *http.Requ
 		return
 	}
 	glog.Infof("Start streams request %+v", *ssr)
-	if ssr.BHost == "" {
+	if ssr.Host == "" {
 		w.WriteHeader(http.StatusBadRequest)
 		w.Write([]byte("Should specify 'host' field"))
 		return
 	}
-	if ssr.OHost == "" {
-		ssr.OHost = ssr.BHost
+	if ssr.MHost == "" {
+		ssr.MHost = ssr.Host
 	}
 	if ssr.Repeat <= 0 {
 		ssr.Repeat = 1
@@ -170,7 +170,7 @@ func (ss *StreamerServer) handleStartStreams(w http.ResponseWriter, r *http.Requ
 		}
 	}
 
-	ss.streamer.StartStreams(ssr.FileName, ssr.BHost, strconv.Itoa(ssr.RTMP), ssr.OHost, strconv.Itoa(ssr.Media), ssr.Simultaneous,
+	ss.streamer.StartStreams(ssr.FileName, ssr.Host, strconv.Itoa(ssr.RTMP), ssr.MHost, strconv.Itoa(ssr.Media), ssr.Simultaneous,
 		ssr.Repeat, streamDuration, true, ssr.MeasureLatency, true, 3, 5*time.Second, 0)
 
 	w.Header().Set("Content-Type", "application/json")

internal/testers/streamer.go

@@ -114,11 +114,12 @@ func (sr *streamer) StartStreams(sourceFileName, bhost, rtmpPort, ohost, mediaPo
 	return nil
 }
 
-func (sr *streamer) startStreams(sourceFileName, bhost, ohost string, nRtmpPort, nMediaPort int, simStreams uint, showProgress,
+func (sr *streamer) startStreams(sourceFileName, bhost, mhost string, nRtmpPort, nMediaPort int, simStreams uint, showProgress,
 	measureLatency bool, totalSegments int, groupStartBy int, startDelayBetweenGroups, waitForTarget time.Duration) error {
 
 	// fmt.Printf("Starting streaming %s to %s:%d, number of streams is %d\n", sourceFileName, bhost, nRtmpPort, simStreams)
-	msg := fmt.Sprintf("Starting streaming %s to %s:%d, number of streams is %d\n", sourceFileName, bhost, nRtmpPort, simStreams)
+	msg := fmt.Sprintf("Starting streaming %s to %s:%d, number of streams is %d, reading back from %s:%d\n", sourceFileName, bhost, nRtmpPort, simStreams,
+		mhost, nMediaPort)
 	messenger.SendMessage(msg)
 	fmt.Println(msg)
 	rtmpURLTemplate := "rtmp://%s:%d/%s"
@@ -140,7 +141,7 @@ func (sr *streamer) startStreams(sourceFileName, bhost, ohost string, nRtmpPort,
 			}
 			manifesID := fmt.Sprintf("%s_%d", baseManfistID, i)
 			rtmpURL := fmt.Sprintf(rtmpURLTemplate, bhost, nRtmpPort, manifesID)
-			mediaURL := fmt.Sprintf(mediaURLTemplate, ohost, nMediaPort, manifesID)
+			mediaURL := fmt.Sprintf(mediaURLTemplate, mhost, nMediaPort, manifesID)
 			glog.Infof("RTMP: %s", rtmpURL)
 			glog.Infof("MEDIA: %s", mediaURL)
 			var bar *uiprogress.Bar