From 79fb64fdc241859cb1c9ee9d891d076548278cef Mon Sep 17 00:00:00 2001
From: Can Bal <cbal@twitter.com>
Date: Wed, 19 Jul 2017 17:35:16 -0700
Subject: [PATCH] rtmp-services: Add Twitter / Periscope as a service

---
 plugins/rtmp-services/data/package.json  |  4 +-
 plugins/rtmp-services/data/services.json | 47 ++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index 7a94667b8..383ea8671 100644
--- a/plugins/rtmp-services/data/package.json
+++ b/plugins/rtmp-services/data/package.json
@@ -1,10 +1,10 @@
 {
 	"url": "https://obsproject.com/obs2_update/rtmp-services",
-	"version": 65,
+	"version": 66,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 65
+			"version": 66
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index a397f82da..3bb892fb6 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -904,6 +904,53 @@
                     "url": "rtmp://apmedia1.liveedu.tv/liveedutv"
                 }
             ]
+        },
+        {
+            "name": "Twitter / Periscope",
+            "common": true,
+            "servers": [
+                {
+                    "name": "US West: California",
+                    "url": "rtmp://ca.pscp.tv:80/x"
+                },
+                {
+                    "name": "US West: Oregon",
+                    "url": "rtmp://or.pscp.tv:80/x"
+                },
+                {
+                    "name": "US East: Virginia",
+                    "url": "rtmp://va.pscp.tv:80/x"
+                },
+                {
+                    "name": "South America: Brazil",
+                    "url": "rtmp://br.pscp.tv:80/x"
+                },
+                {
+                    "name": "EU West: Ireland",
+                    "url": "rtmp://ie.pscp.tv:80/x"
+                },
+                {
+                    "name": "EU Central: Germany",
+                    "url": "rtmp://de.pscp.tv:80/x"
+                },
+                {
+                    "name": "Asia/Pacific: Australia",
+                    "url": "rtmp://au.pscp.tv:80/x"
+                },
+                {
+                    "name": "Asia/Pacific: Japan",
+                    "url": "rtmp://jp.pscp.tv:80/x"
+                },
+                {
+                    "name": "Asia/Pacific: Singapore",
+                    "url": "rtmp://sg.pscp.tv:80/x"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "max video bitrate": 800,
+                "max audio bitrate": 96
+            }
         }
     ]
 }
-- 
GitLab