kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "app_echo: forward and generate VIDUPDATE frames" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-03-29 12:46:38 -05:00
committed by Gerrit Code Review
parent 3528a9a42e 6a9c18fb59
commit e0a916d6f5
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/app_echo.c
View File

@@ -58,6 +58,7 @@ static const char app[] = "Echo";
static int echo_exec(struct ast_channel *chan, const char *data) static int echo_exec(struct ast_channel *chan, const char *data)
{ {
int res = -1; int res = -1;
int fir_sent = 0;
while (ast_waitfor(chan, -1) > -1) { while (ast_waitfor(chan, -1) > -1) {
struct ast_frame *f = ast_read(chan); struct ast_frame *f = ast_read(chan);
@@ -66,6 +67,22 @@ static int echo_exec(struct ast_channel *chan, const char *data)
} }
f->delivery.tv_sec = 0; f->delivery.tv_sec = 0;
f->delivery.tv_usec = 0; f->delivery.tv_usec = 0;
if (f->frametype == AST_FRAME_CONTROL
&& f->subclass.integer == AST_CONTROL_VIDUPDATE) {
if (ast_write(chan, f) < 0) {
ast_frfree(f);
goto end;
}
fir_sent = 1;
}
if (!fir_sent && f->frametype == AST_FRAME_VIDEO) {
struct ast_frame frame = {
.frametype = AST_FRAME_CONTROL,
.subclass.integer = AST_CONTROL_VIDUPDATE,
};
ast_write(chan, &frame);
fir_sent = 1;
}
if (f->frametype != AST_FRAME_CONTROL if (f->frametype != AST_FRAME_CONTROL
&& f->frametype != AST_FRAME_MODEM && f->frametype != AST_FRAME_MODEM
&& f->frametype != AST_FRAME_NULL && f->frametype != AST_FRAME_NULL