From 61d86d938a8a60eb26b6953c2ba2b43bb50d72ca Mon Sep 17 00:00:00 2001 From: jp9000 Date: Fri, 14 Aug 2015 14:10:23 -0700 Subject: [PATCH] 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. --- plugins/rtmp-services/data/services.json | 4 ---- plugins/rtmp-services/rtmp-common.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/plugins/rtmp-services/data/services.json b/plugins/rtmp-services/data/services.json index b926a82e2..140403d23 100644 --- a/plugins/rtmp-services/data/services.json +++ b/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, diff --git a/plugins/rtmp-services/rtmp-common.c b/plugins/rtmp-services/rtmp-common.c index f62984307..d36cae4a9 100644 --- a/plugins/rtmp-services/rtmp-common.c +++ b/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)) {