kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-10094: [core,mod_av] Alpha video support #resolve

This commit is contained in:
Anthony Minessale 2017-03-16 10:00:33 -05:00
parent 90eb89dbd0
commit a7c4b22ac9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mod/applications/mod_av/avformat.c
View File

@ -1468,6 +1468,17 @@ static switch_status_t open_input_file(av_file_context_t *context, switch_file_h
if (!context->has_video) { if (!context->has_video) {
switch_clear_flag(handle, SWITCH_FILE_FLAG_VIDEO); switch_clear_flag(handle, SWITCH_FILE_FLAG_VIDEO);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "video pix_fmt: %d\n", context->video_st.st->codec->pix_fmt);
switch (context->video_st.st->codec->pix_fmt) {
case AV_PIX_FMT_YUVA420P:
case AV_PIX_FMT_RGBA:
case AV_PIX_FMT_ARGB:
case AV_PIX_FMT_BGRA:
context->handle->mm.fmt = SWITCH_IMG_FMT_ARGB;
default:
context->handle->mm.fmt = SWITCH_IMG_FMT_I420;
}
} }
return status; return status;
@ -1636,7 +1647,7 @@ again:
continue; continue;
} }
} }
context->handle->mm.fmt = fmt; context->handle->mm.fmt = fmt;
img = switch_img_alloc(NULL, fmt, vframe->width, vframe->height, 1); img = switch_img_alloc(NULL, fmt, vframe->width, vframe->height, 1);
@ -2125,7 +2136,7 @@ static switch_status_t av_file_close(switch_file_handle_t *handle)
if (context->file_read_thread_running) { if (context->file_read_thread_running) {
context->file_read_thread_running = 0; context->file_read_thread_running = 0;
} }
if (context->file_read_thread) { if (context->file_read_thread) {
switch_thread_join(&status, context->file_read_thread); switch_thread_join(&status, context->file_read_thread);
context->file_read_thread = NULL; context->file_read_thread = NULL;