diff --git a/main/autoservice.c b/main/autoservice.c index d1a0156ab46ef59d692fca72e0d525372c40632e..cd7388b7ddab6d6f380885733e011b1e7dfbbf05 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -58,6 +58,7 @@ struct asent { * it gets stopped for the last time. */ unsigned int use_count; unsigned int orig_end_dtmf_flag:1; + unsigned int video_update:1; unsigned int ignore_frame_types; /*! Frames go on at the head of deferred_frames, so we have the frames * from newest to oldest. As we put them at the head of the readq, we'll @@ -161,6 +162,17 @@ static void *autoservice_run(void *ign) AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list); } } else { + if (defer_frame->frametype == AST_FRAME_CONTROL && + defer_frame->subclass.integer == AST_CONTROL_VIDUPDATE) { + + /* If a video update is already queued don't needlessly queue another */ + if (ents[i]->video_update) { + ast_frfree(defer_frame); + break; + } + + ents[i]->video_update = 1; + } if ((dup_f = ast_frisolate(defer_frame))) { AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list); } diff --git a/main/core_unreal.c b/main/core_unreal.c index 3db6a4dbdd81be41e1f7460f43acb836423a3402..763be4f0ca3d9defb7cde91864bbd61d57223e3b 100644 --- a/main/core_unreal.c +++ b/main/core_unreal.c @@ -330,7 +330,8 @@ int ast_unreal_write(struct ast_channel *ast, struct ast_frame *f) if (!ast_channel_get_default_stream(ast, AST_MEDIA_TYPE_AUDIO)) { return 0; } - } else if (f->frametype == AST_FRAME_VIDEO) { + } else if (f->frametype == AST_FRAME_VIDEO || + (f->frametype == AST_FRAME_CONTROL && f->subclass.integer == AST_CONTROL_VIDUPDATE)) { if (!ast_channel_get_default_stream(ast, AST_MEDIA_TYPE_VIDEO)) { return 0; }