Updated capa for outputs

src/output/output_ebml.cpp

@@ -18,7 +18,8 @@ namespace Mist{
   void OutEBML::init(Util::Config *cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "EBML";
-    capa["desc"] = "Enables MKV and WebM streaming over HTTP.";
+    capa["friendly"] = "WebM/MKV over HTTP";
+    capa["desc"] = "Pseudostreaming in MKV and WebM (EBML) formats over HTTP";
     capa["url_rel"] = "/$.webm";
     capa["url_match"].append("/$.mkv");
     capa["url_match"].append("/$.webm");

src/output/output_hds.cpp

@@ -140,7 +140,8 @@ namespace Mist {
   void OutHDS::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "HDS";
-    capa["desc"] = "Enables HTTP protocol Adobe-specific dynamic streaming (also known as HDS).";
+    capa["friendly"] = "Flash segmented over HTTP (HDS)";
+    capa["desc"] = "Segmented streaming in Adobe/Flash (FLV-based) format over HTTP ( = HTTP Dynamic Streaming)";
     capa["url_rel"] = "/dynamic/$/manifest.f4m";
     capa["url_prefix"] = "/dynamic/$/";
     capa["codecs"][0u][0u].append("H264");

src/output/output_hls.cpp

@@ -152,7 +152,8 @@ namespace Mist {
   void OutHLS::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "HLS";
-    capa["desc"] = "Enables HTTP protocol Apple-specific streaming (also known as HLS).";
+    capa["friendly"] = "Apple segmented over HTTP (HLS)";
+    capa["desc"] = "Segmented streaming in Apple (TS-based) format over HTTP ( = HTTP Live Streaming)";
     capa["url_rel"] = "/hls/$/index.m3u8";
     capa["url_prefix"] = "/hls/$/";
     capa["codecs"][0u][0u].append("H264");

src/output/output_hss.cpp

@@ -49,7 +49,8 @@ namespace Mist {
   void OutHSS::init(Util::Config * cfg) {
     HTTPOutput::init(cfg);
     capa["name"] = "HSS";
-    capa["desc"] = "Enables HTTP protocol Microsoft-specific smooth streaming through silverlight (also known as HSS).";
+    capa["friendly"] = "Microsoft segmented over HTTP (HSS)";
+    capa["desc"] = "Segmented streaming in Microsoft Silverlight (fMP4-based) format over HTTP ( = HTTP Smooth Streaming)";
     capa["url_rel"] = "/smooth/$.ism/Manifest";
     capa["url_prefix"] = "/smooth/$.ism/";
     capa["codecs"][0u][0u].append("H264");

src/output/output_http_internal.cpp

@@ -100,7 +100,8 @@ namespace Mist {
     HTTPOutput::init(cfg);
     capa.removeMember("deps");
     capa["name"] = "HTTP";
-    capa["desc"] = "Generic HTTP handler, required for all other HTTP-based outputs.";
+    capa["friendly"] = "HTTP";
+    capa["desc"] = "HTTP connection handler, provides all enabled HTTP-based outputs";
     capa["provides"] = "HTTP";
     capa["protocol"] = "http://";
     capa["codecs"][0u][0u].append("*");

src/output/output_httpts.cpp

@@ -14,7 +14,8 @@ namespace Mist {
   void OutHTTPTS::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "HTTPTS";
-    capa["desc"] = "Enables HTTP protocol MPEG2/TS pseudostreaming.";
+    capa["friendly"] = "TS over HTTP";
+    capa["desc"] = "Pseudostreaming in MPEG2/TS format over HTTP";
     capa["url_rel"] = "/$.ts";
     capa["url_match"] = "/$.ts";
     capa["socket"] = "http_ts";

src/output/output_json.cpp

@@ -14,7 +14,8 @@ namespace Mist {
   void OutJSON::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "JSON";
-    capa["desc"] = "Enables HTTP protocol JSON streaming.";
+    capa["name"] = "JSON over HTTP";
+    capa["desc"] = "Pseudostreaming in JSON format over HTTP";
     capa["url_match"] = "/$.json";
     capa["codecs"][0u][0u].append("@+meta");
     capa["methods"][0u]["handler"] = "http";

src/output/output_progressive_flv.cpp

@@ -6,7 +6,8 @@ namespace Mist {
   void OutProgressiveFLV::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "FLV";
-    capa["desc"] = "Enables HTTP protocol progressive streaming.";
+    capa["name"] = "Flash progressive over HTTP (FLV)";
+    capa["desc"] = "Pseudostreaming in Adobe Flash FLV format over HTTP";
     capa["url_rel"] = "/$.flv";
     capa["url_match"] = "/$.flv";
     capa["codecs"][0u][0u].append("H264");

src/output/output_progressive_mp3.cpp

@@ -6,7 +6,8 @@ namespace Mist {
   void OutProgressiveMP3::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "MP3";
-    capa["desc"] = "Enables HTTP protocol progressive streaming.";
+    capa["friendly"] = "MP3 over HTTP";
+    capa["desc"] = "Pseudostreaming in MP3 format over HTTP";
     capa["url_rel"] = "/$.mp3";
     capa["url_match"] = "/$.mp3";
     capa["codecs"][0u][0u].append("MP3");

src/output/output_progressive_mp4.cpp

@@ -15,7 +15,8 @@ namespace Mist {
   void OutProgressiveMP4::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "MP4";
-    capa["desc"] = "Enables HTTP protocol progressive streaming.";
+    capa["friendly"] = "MP4 over HTTP";
+    capa["desc"] = "Pseudostreaming in MP4 format over HTTP";
     capa["url_rel"] = "/$.mp4";
     capa["url_match"] = "/$.mp4";
     capa["codecs"][0u][0u].append("H264");

src/output/output_progressive_ogg.cpp

@@ -13,7 +13,8 @@ namespace Mist {
   void OutProgressiveOGG::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "OGG";
-    capa["desc"] = "Enables HTTP protocol progressive streaming.";
+    capa["friendly"] = "OGG over HTTP";
+    capa["desc"] = "Pseudostreaming in OGG format over HTTP";
     capa["deps"] = "HTTP";
     capa["url_rel"] = "/$.ogg";
     capa["url_match"] = "/$.ogg";

src/output/output_raw.cpp

@@ -32,7 +32,8 @@ namespace Mist {
   void OutRaw::init(Util::Config * cfg){
     Output::init(cfg);
     capa["name"] = "RAW";
-    capa["desc"] = "Enables raw DTSC over TCP.";
+    capa["name"] = "DTSC over stdout";
+    capa["desc"] = "Pseudostreaming in DTSC format over standard output";
     capa["deps"] = "";
     capa["required"]["streamname"]["name"] = "Stream";
     capa["required"]["streamname"]["help"] = "What streamname to serve. For multiple streams, add this protocol multiple times using different ports.";

src/output/output_rtmp.cpp

@@ -73,9 +73,11 @@ namespace Mist {
   void OutRTMP::init(Util::Config * cfg){
     Output::init(cfg);
     capa["name"] = "RTMP";
-    capa["desc"] = "Enables ingest and output over Adobe's RTMP protocol.";
+    capa["friendly"] = "RTMP";
+    capa["desc"] = "Real time streaming over Adobe RTMP";
     capa["deps"] = "";
     capa["url_rel"] = "/play/$";
+    capa["incoming_push_url"] = "rtmp://$host:$port/$password/$stream";
     capa["codecs"][0u][0u].append("H264");
     capa["codecs"][0u][0u].append("H263");
     capa["codecs"][0u][0u].append("VP6");

src/output/output_srt.cpp

@@ -11,7 +11,8 @@ namespace Mist {
   void OutProgressiveSRT::init(Util::Config * cfg){
     HTTPOutput::init(cfg);
     capa["name"] = "SRT";
-    capa["desc"] = "Enables HTTP protocol subtitle streaming in subrip and WebVTT formats.";
+    capa["friendly"] = "SubRip/WebVTT over HTTP";
+    capa["desc"] = "Pseudostreaming in SubRip Text (SRT) and WebVTT formats over HTTP";
     capa["url_match"].append("/$.srt");
     capa["url_match"].append("/$.vtt");
     capa["codecs"][0u][0u].append("srt");

src/output/output_ts.cpp

@@ -35,7 +35,8 @@ namespace Mist {
   void OutTS::init(Util::Config * cfg){
     Output::init(cfg);
     capa["name"] = "TS";
-    capa["desc"] = "Enables the raw MPEG Transport Stream protocol over TCP.";
+    capa["friendly"] = "TS over TCP";
+    capa["desc"] = "Real time streaming in MPEG2/TS format over raw TCP";
     capa["deps"] = "";
     capa["required"]["streamname"]["name"] = "Stream";
     capa["required"]["streamname"]["help"] = "What streamname to serve. For multiple streams, add this protocol multiple times using different ports.";