kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-06 04:45:30 +00:00
Code Issues Projects Releases Wiki Activity

FS-7508: timing update

Browse Source
This commit is contained in:
Anthony Minessale 2015-03-13 10:41:47 -05:00 committed by Michael Jerris
parent 8d4686aee2
commit fc1ff9209e
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod/codecs/mod_vpx/mod_vpx.c
View File

@ -72,6 +72,7 @@ struct vpx_context {
const vpx_codec_cx_pkt_t *pkt; const vpx_codec_cx_pkt_t *pkt;
vpx_codec_iter_t iter; vpx_codec_iter_t iter;
uint32_t last_ts; uint32_t last_ts;
switch_time_t last_ms;
vpx_codec_ctx_t decoder; vpx_codec_ctx_t decoder;
uint8_t decoder_init; uint8_t decoder_init;
switch_buffer_t *vpx_packet_buffer; switch_buffer_t *vpx_packet_buffer;
@ -531,6 +532,8 @@ static void reset_codec_encoder(switch_codec_t *codec)
if (context->encoder_init) { if (context->encoder_init) {
vpx_codec_destroy(&context->encoder); vpx_codec_destroy(&context->encoder);
} }
context->last_ts = 0;
context->last_ms = 0;
context->framecount = 0; context->framecount = 0;
context->encoder_init = 0; context->encoder_init = 0;
context->pkt = NULL; context->pkt = NULL;
@ -542,7 +545,10 @@ static switch_status_t switch_vpx_encode(switch_codec_t *codec, switch_frame_t *
vpx_context_t *context = (vpx_context_t *)codec->private_info; vpx_context_t *context = (vpx_context_t *)codec->private_info;
int width = 0; int width = 0;
int height = 0; int height = 0;
uint32_t dur;
int64_t pts;
vpx_enc_frame_flags_t vpx_flags = 0; vpx_enc_frame_flags_t vpx_flags = 0;
switch_time_t now;
if (frame->flags & SFF_SAME_IMAGE) { if (frame->flags & SFF_SAME_IMAGE) {
return consume_partition(context, frame); return consume_partition(context, frame);
@ -580,9 +586,10 @@ static switch_status_t switch_vpx_encode(switch_codec_t *codec, switch_frame_t *
init_encoder(codec); init_encoder(codec);
} }
now = switch_time_now();
if (context->need_key_frame != 0) { if (context->need_key_frame != 0) {
// force generate a key frame // force generate a key frame
switch_time_t now = switch_micro_time_now();
if (!context->last_key_frame || (now - context->last_key_frame) > KEY_FRAME_MIN_FREQ) { if (!context->last_key_frame || (now - context->last_key_frame) > KEY_FRAME_MIN_FREQ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "VPX KEYFRAME GENERATED\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "VPX KEYFRAME GENERATED\n");
@ -594,11 +601,14 @@ static switch_status_t switch_vpx_encode(switch_codec_t *codec, switch_frame_t *
context->framecount++; context->framecount++;
pts = (now - context->start_time) / 1000;
dur = context->last_ms ? (now - context->last_ms) / 1000 : pts;
if (vpx_codec_encode(&context->encoder, if (vpx_codec_encode(&context->encoder,
(vpx_image_t *) frame->img, (vpx_image_t *) frame->img,
switch_micro_time_now() - context->start_time, pts,
1, dur,
vpx_flags, vpx_flags,
VPX_DL_REALTIME) != VPX_CODEC_OK) { VPX_DL_REALTIME) != VPX_CODEC_OK) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VPX encode error %d:%s\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VPX encode error %d:%s\n",
@ -610,7 +620,7 @@ static switch_status_t switch_vpx_encode(switch_codec_t *codec, switch_frame_t *
context->iter = NULL; context->iter = NULL;
context->last_ts = frame->timestamp; context->last_ts = frame->timestamp;
context->last_ms = now;
return consume_partition(context, frame); return consume_partition(context, frame);
} }

2
src/switch_time.c
View File

@ -380,7 +380,7 @@ SWITCH_DECLARE(void) switch_time_set_cond_yield(switch_bool_t enable)
static switch_status_t timer_generic_sync(switch_timer_t *timer) static switch_status_t timer_generic_sync(switch_timer_t *timer)
{ {
switch_time_t now = switch_micro_time_now(); switch_time_t now = switch_time_now();
int64_t elapsed = (now - timer->start); int64_t elapsed = (now - timer->start);
timer->tick = (elapsed / timer->interval) / 1000; timer->tick = (elapsed / timer->interval) / 1000;