From 22d060e3cc9c71a30590cedd71f9d80f5e8bba5c Mon Sep 17 00:00:00 2001
From: Maya Venkatraman <mvenkat@google.com>
Date: Tue, 13 Oct 2020 13:52:26 -0700
Subject: [PATCH] rtmp-services: Add YouTube HLS service selection

---
 plugins/rtmp-services/data/package.json  |  4 ++--
 plugins/rtmp-services/data/services.json | 28 ++++++++++++++++++++++--
 plugins/rtmp-services/rtmp-format-ver.h  |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/plugins/rtmp-services/data/package.json b/plugins/rtmp-services/data/package.json
index d1195ee9c..85889e35b 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": 148,
+	"version": 149,
 	"files": [
 		{
 			"name": "services.json",
-			"version": 148
+			"version": 149
 		}
 	]
 }
diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json
index 6fbdf29aa..9641f46c3 100644
--- a/plugins/rtmp-services/data/services.json
+++ b/plugins/rtmp-services/data/services.json
@@ -1,5 +1,5 @@
 {
-    "format_version": 2,
+    "format_version": 3,
     "services": [
         {
             "name": "Twitch",
@@ -198,8 +198,32 @@
             }
         },
         {
-            "name": "YouTube / YouTube Gaming",
+            "name": "YouTube - HLS",
+            "common": false,
+            "more_info_link": "https://developers.google.com/youtube/v3/live/guides/ingestion-protocol-comparison",
+            "servers": [
+                {
+                    "name": "Primary YouTube ingest server",
+                    "url": "https://a.upload.youtube.com/http_upload_hls?cid={stream_key}&copy=0&file=out.m3u8"
+                },
+                {
+                    "name": "Backup YouTube ingest server",
+                    "url": "https://b.upload.youtube.com/http_upload_hls?cid={stream_key}&copy=1&file=out.m3u8"
+                }
+            ],
+            "recommended": {
+                "keyint": 2,
+                "output": "ffmpeg_hls_muxer",
+                "max video bitrate": 51000,
+                "max audio bitrate": 160
+            }
+        },
+        {
+            "name": "YouTube - RTMP",
             "common": true,
+            "alt_names": [
+                "YouTube / YouTube Gaming"
+            ],
             "servers": [
                 {
                     "name": "Primary YouTube ingest server",
diff --git a/plugins/rtmp-services/rtmp-format-ver.h b/plugins/rtmp-services/rtmp-format-ver.h
index 8e4952a71..8909b9a65 100644
--- a/plugins/rtmp-services/rtmp-format-ver.h
+++ b/plugins/rtmp-services/rtmp-format-ver.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define RTMP_SERVICES_FORMAT_VERSION 2
+#define RTMP_SERVICES_FORMAT_VERSION 3