From 05d0c1cfe263c990e380b22b4bd4781433d87e3b Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 13 Dec 2018 13:13:45 +0100
Subject: [PATCH] Updated capa with better protocol descriptions (Pro outputs)

---
 src/input/input_ts.cpp                   | 2 ++
 src/output/output_dash_mp4.cpp           | 3 ++-
 src/output/output_dtsc.cpp               | 3 ++-
 src/output/output_h264.cpp               | 3 ++-
 src/output/output_http_minimalserver.cpp | 1 +
 src/output/output_https.cpp              | 3 +++
 src/output/output_rtsp.cpp               | 5 +++--
 src/output/output_wav.cpp                | 3 ++-
 8 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/input/input_ts.cpp b/src/input/input_ts.cpp
index bcdca873..2673b85a 100755
--- a/src/input/input_ts.cpp
+++ b/src/input/input_ts.cpp
@@ -126,6 +126,8 @@ namespace Mist {
     capa["always_match"].append("ts-exec:*");
     capa["always_match"].append("http://*.ts");
     capa["always_match"].append("http-ts://*");
+    capa["incoming_push_url"] = "udp://$host:$port";
+    capa["incoming_push_url_match"] = "tsudp://*";
     capa["priority"] = 9ll;
     capa["codecs"][0u][0u].append("H264");
     capa["codecs"][0u][0u].append("HEVC");
diff --git a/src/output/output_dash_mp4.cpp b/src/output/output_dash_mp4.cpp
index ee48919d..c2bc18e1 100644
--- a/src/output/output_dash_mp4.cpp
+++ b/src/output/output_dash_mp4.cpp
@@ -487,7 +487,8 @@ namespace Mist{
   void OutDashMP4::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "DASHMP4";
-    capa["desc"] = "Enables HTTP protocol progressive streaming.";
+    capa["friendly"] = "DASH (fMP4) over HTTP";
+    capa["desc"] = "Segmented streaming in DASH (fMP4) format over HTTP";
     capa["url_rel"] = "/dash/$/index.mpd";
     capa["url_prefix"] = "/dash/$/";
     capa["socket"] = "http_dash_mp4";
diff --git a/src/output/output_dtsc.cpp b/src/output/output_dtsc.cpp
index d0c2ae99..cf9d7484 100644
--- a/src/output/output_dtsc.cpp
+++ b/src/output/output_dtsc.cpp
@@ -56,7 +56,8 @@ namespace Mist {
   void OutDTSC::init(Util::Config * cfg){
     Output::init(cfg);
     capa["name"] = "DTSC";
-    capa["desc"] = "Enables the DTSC protocol for efficient inter-server stream exchange.";
+    capa["friendly"] = "DTSC";
+    capa["desc"] = "Real time streaming over DTSC (MistServer proprietary protocol, for efficient inter-server streaming)";
     capa["deps"] = "";
     capa["codecs"][0u][0u].append("+*");
     cfg->addConnectorOptions(4200, capa);
diff --git a/src/output/output_h264.cpp b/src/output/output_h264.cpp
index 71395076..7d41dbac 100644
--- a/src/output/output_h264.cpp
+++ b/src/output/output_h264.cpp
@@ -32,7 +32,8 @@ namespace Mist{
   void OutH264::init(Util::Config *cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "H264";
-    capa["desc"] = "Enables HTTP protocol H264 Annex B streaming";
+    capa["friendly"] = "H264 over HTTP";
+    capa["desc"] = "Pseudostreaming in raw H264 Annex B format over HTTP";
     capa["url_rel"] = "/$.h264";
     capa["url_match"] = "/$.h264";
     capa["codecs"][0u][0u].append("H264");
diff --git a/src/output/output_http_minimalserver.cpp b/src/output/output_http_minimalserver.cpp
index 7b198507..85aba7d0 100644
--- a/src/output/output_http_minimalserver.cpp
+++ b/src/output/output_http_minimalserver.cpp
@@ -16,6 +16,7 @@ namespace Mist {
   void OutHTTPMinimalServer::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "HTTPMinimalServer";
+    capa["friendly"] = "Utility: Static HTTP file server";
     capa["desc"] = "Serves static files over HTTP from a set folder";
     capa["url_rel"] = "/static/";
     capa["url_prefix"] = "/static/";
diff --git a/src/output/output_https.cpp b/src/output/output_https.cpp
index 581e33f8..afdc4506 100644
--- a/src/output/output_https.cpp
+++ b/src/output/output_https.cpp
@@ -10,6 +10,9 @@ namespace Mist{
 
   void OutHTTPS::init(Util::Config *cfg){
     Output::init(cfg);
+    capa["name"] = "HTTPS";
+    capa["friendly"] = "HTTPS (HTTP+TLS)";
+    capa["desc"] = "HTTPS connection handler, provides all enabled HTTP-based outputs";
     capa["provides"] = "HTTP";
     capa["protocol"] = "https://";
     capa["required"]["cert"]["name"] = "Certificate";
diff --git a/src/output/output_rtsp.cpp b/src/output/output_rtsp.cpp
index ff7d4821..47001029 100644
--- a/src/output/output_rtsp.cpp
+++ b/src/output/output_rtsp.cpp
@@ -83,10 +83,11 @@ namespace Mist{
   void OutRTSP::init(Util::Config *cfg){
     Output::init(cfg);
     capa["name"] = "RTSP";
-    capa["desc"] =
-        "Provides Real Time Streaming Protocol output, supporting both UDP and TCP transports.";
+    capa["friendly"] = "RTSP";
+    capa["desc"] = "Real Time Streaming in RTSP, over both RTP UDP and TCP";
     capa["deps"] = "";
     capa["url_rel"] = "/$";
+    capa["incoming_push_url"] = "rtsp://$host:$port/$stream?pass=$password";
     capa["codecs"][0u][0u].append("H264");
     capa["codecs"][0u][0u].append("HEVC");
     capa["codecs"][0u][0u].append("MPEG2");
diff --git a/src/output/output_wav.cpp b/src/output/output_wav.cpp
index e088bae9..36ed5038 100644
--- a/src/output/output_wav.cpp
+++ b/src/output/output_wav.cpp
@@ -8,7 +8,8 @@ namespace Mist{
   void OutWAV::init(Util::Config *cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "WAV";
-    capa["desc"] = "Enables HTTP protocol progressive WAV streaming";
+    capa["friendly"] = "WAV over HTTP";
+    capa["desc"] = "Pseudostreaming in WAV format over HTTP";
     capa["url_rel"] = "/$.wav";
     capa["url_match"] = "/$.wav";
     capa["codecs"][0u][0u].append("ALAW");