kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-13 12:40:17 +00:00
Code Issues Projects Releases Wiki Activity

FS-11425 use specified config name

Browse Source
This commit is contained in:
Seven Du 2018-10-01 21:39:35 +08:00 committed by Andrey Volk
parent b591f691bb
commit bd34650fff
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/applications/mod_av/avcodec.c
View File

@ -409,7 +409,7 @@ static uint8_t ff_input_buffer_padding[AV_INPUT_BUFFER_PADDING_SIZE] = { 0 };
#define MAX_PROFILES 100 #define MAX_PROFILES 100
typedef struct avcodec_profile_s { typedef struct avcodec_profile_s {
char name[20]; char name[64];
int decoder_thread_count; int decoder_thread_count;
AVCodecContext ctx; AVCodecContext ctx;
switch_event_t *options; switch_event_t *options;
@ -1211,10 +1211,18 @@ static switch_status_t open_encoder(h264_codec_context_t *context, uint32_t widt
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
profile = find_profile(get_profile_name(context->av_codec_id), SWITCH_FALSE); if (!zstr(context->codec_settings.video.config_profile_name)) {
profile = find_profile(context->codec_settings.video.config_profile_name, SWITCH_FALSE);
}
if (!profile) {
profile = find_profile(get_profile_name(context->av_codec_id), SWITCH_FALSE);
}
if (!profile) return SWITCH_STATUS_FALSE; if (!profile) return SWITCH_STATUS_FALSE;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Using config profile: [%s]\n", profile->name);
if (context->encoder_ctx) { if (context->encoder_ctx) {
if (avcodec_is_open(context->encoder_ctx)) { if (avcodec_is_open(context->encoder_ctx)) {
avcodec_close(context->encoder_ctx); avcodec_close(context->encoder_ctx);