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

FS-7500: fix and use 32bit timestamp, frame->timestamp is defined as switch_size_t and not always 32bit

This commit is contained in:
Seven Du 2014-09-27 17:06:55 +08:00 committed by Michael Jerris
parent 055de41484
commit 3466a2e468
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/applications/mod_fsv/mod_fsv.c
View File

@ -577,6 +577,7 @@ SWITCH_STANDARD_APP(play_yuv_function)
switch_image_t *img = NULL; switch_image_t *img = NULL;
switch_byte_t *yuv = NULL; switch_byte_t *yuv = NULL;
switch_time_t last_video_ts = 0; switch_time_t last_video_ts = 0;
uint32_t timestamp = 0;
int argc; int argc;
char *argv[3] = { 0 }; char *argv[3] = { 0 };
char *mydata = switch_core_session_strdup(session, data); char *mydata = switch_core_session_strdup(session, data);
@ -679,14 +680,16 @@ SWITCH_STANDARD_APP(play_yuv_function)
char ts_str[33]; char ts_str[33];
long delta; long delta;
if (last_video_ts == 0) last_video_ts = now;
delta = now - last_video_ts; delta = now - last_video_ts;
if (delta > 0) { if (delta > 0) {
frame->timestamp += delta * 90; timestamp += delta * 90;
last_video_ts = now; last_video_ts = now;
} }
sprintf(ts_str, "%u", (uint32_t)frame->timestamp); sprintf(ts_str, "%u", timestamp);
text(img->planes[SWITCH_PLANE_PACKED], width, 20, 20, ts_str); text(img->planes[SWITCH_PLANE_PACKED], width, 20, 20, ts_str);
switch_core_codec_encode_video(codec, img, vid_frame.data, &encoded_data_len, &flag); switch_core_codec_encode_video(codec, img, vid_frame.data, &encoded_data_len, &flag);
@ -696,6 +699,7 @@ SWITCH_STANDARD_APP(play_yuv_function)
frame->datalen = encoded_data_len; frame->datalen = encoded_data_len;
frame->packetlen = frame->datalen + 12; frame->packetlen = frame->datalen + 12;
frame->m = flag & SFF_MARKER ? 1 : 0; frame->m = flag & SFF_MARKER ? 1 : 0;
frame->timestamp = timestamp;
if (1) { // we can remove this when ts and marker full passed in core if (1) { // we can remove this when ts and marker full passed in core
/* set correct mark and ts */ /* set correct mark and ts */
@ -704,7 +708,7 @@ SWITCH_STANDARD_APP(play_yuv_function)
memset(rtp, 0, 12); memset(rtp, 0, 12);
rtp->version = 2; rtp->version = 2;
rtp->m = frame->m; rtp->m = frame->m;
rtp->ts = htonl(frame->timestamp); rtp->ts = htonl(timestamp);
rtp->ssrc = (uint32_t) ((intptr_t) rtp + (uint32_t) switch_epoch_time_now(NULL)); rtp->ssrc = (uint32_t) ((intptr_t) rtp + (uint32_t) switch_epoch_time_now(NULL));
// rtp->ssrc = 0x11223344; // rtp->ssrc = 0x11223344;
} }