Selaa lähdekoodia

rtmp-services: Always use CBR for all services

Services almost always recommend this be enabled, and I generally want
to make configuration easier for users; with CBR they don't have to set
things like the CRF value.
jp9000 10 vuotta sitten
vanhempi
sitoutus
61d86d938a

+ 0 - 4
plugins/rtmp-services/data/services.json

@@ -109,7 +109,6 @@
         ],
         "recommended": {
             "keyint": 2,
-            "cbr": true,
             "profile": "main",
             "max video bitrate": 3500,
             "max audio bitrate": 160
@@ -129,7 +128,6 @@
         ],
         "recommended": {
             "keyint": 4,
-            "cbr": true,
             "profile": "main",
             "max video bitrate": 9000,
             "max audio bitrate": 160
@@ -209,7 +207,6 @@
         ],
         "recommended": {
             "keyint": 2,
-            "cbr": true,
             "profile": "main",
             "max video bitrate": 3500,
             "max audio bitrate": 160
@@ -311,7 +308,6 @@
             }
         ],
         "recommended": {
-            "cbr": true,
             "keyint": 2,
             "max audio bitrate": 160,
             "max video bitrate": 3500,

+ 1 - 5
plugins/rtmp-services/rtmp-common.c

@@ -234,11 +234,7 @@ static void apply_video_encoder_settings(obs_data_t *settings,
 		obs_data_set_int(settings, "keyint_sec", keyint);
 	}
 
-	item = json_object_get(recommended, "cbr");
-	if (item && json_is_boolean(item)) {
-		bool cbr = json_is_true(item);
-		obs_data_set_bool(settings, "cbr", cbr);
-	}
+	obs_data_set_bool(settings, "cbr", true);
 
 	item = json_object_get(recommended, "profile");
 	if (item && json_is_string(item)) {