jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtmp-services: Add encoder settings callback

Browse Source 
Swaps out the old initialize callback code that applied encoder settings
to the new apply_encoder_settings callback
This commit is contained in:
jp9000 2015-02-10 19:27:37 -08:00
parent 4eacb5f3e9
commit 5a4a9befd2
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/rtmp-services/rtmp-common.c
View File

@ -277,11 +277,9 @@ static void apply_audio_encoder_settings(obs_encoder_t *encoder,
obs_data_release(settings); obs_data_release(settings);
} }
static void initialize_output(struct rtmp_common *service, obs_output_t *output, static void initialize_output(struct rtmp_common *service, json_t *root,
json_t *root) obs_encoder_t *video_encoder, obs_encoder_t *audio_encoder)
{ {
obs_encoder_t *video_encoder = obs_output_get_video_encoder(output);
obs_encoder_t *audio_encoder = obs_output_get_audio_encoder(output, 0);
json_t *json_service = find_service(root, service->service); json_t *json_service = find_service(root, service->service);
json_t *recommended; json_t *recommended;
@ -302,7 +300,8 @@ static void initialize_output(struct rtmp_common *service, obs_output_t *output,
apply_audio_encoder_settings(audio_encoder, recommended); apply_audio_encoder_settings(audio_encoder, recommended);
} }
static bool rtmp_common_initialize(void *data, obs_output_t *output) static void rtmp_common_apply_settings(void *data,
obs_encoder_t *video_encoder, obs_encoder_t *audio_encoder)
{ {
struct rtmp_common *service = data; struct rtmp_common *service = data;
char *file; char *file;
@ -311,13 +310,12 @@ static bool rtmp_common_initialize(void *data, obs_output_t *output)
if (file) { if (file) {
json_t *root = open_json_file(file); json_t *root = open_json_file(file);
if (root) { if (root) {
initialize_output(service, output, root); initialize_output(service, root, video_encoder,
audio_encoder);
json_decref(root); json_decref(root);
} }
bfree(file); bfree(file);
} }
return true;
} }
static const char *rtmp_common_url(void *data) static const char *rtmp_common_url(void *data)
@ -338,8 +336,8 @@ struct obs_service_info rtmp_common_service = {
.create = rtmp_common_create, .create = rtmp_common_create,
.destroy = rtmp_common_destroy, .destroy = rtmp_common_destroy,
.update = rtmp_common_update, .update = rtmp_common_update,
.initialize = rtmp_common_initialize,
.get_properties = rtmp_common_properties, .get_properties = rtmp_common_properties,
.get_url = rtmp_common_url, .get_url = rtmp_common_url,
.get_key = rtmp_common_key .get_key = rtmp_common_key,
.apply_encoder_settings = rtmp_common_apply_settings,
}; };