kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-02 19:29:31 +00:00
Code Issues Projects Releases Wiki Activity

FS-7519: set encoder zerolatency

Browse Source
This commit is contained in:
Seven Du 2014-11-26 09:14:10 +08:00 committed by Michael Jerris
parent 45898cfad7
commit 978748ed09
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/applications/mod_av/mod_av.c
View File

@ -122,10 +122,11 @@ static switch_status_t init_x264(h264_codec_context_t *context, uint32_t width,
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
x264_param_default(xp); // x264_param_default(xp);
x264_param_default_preset(xp, "veryfast", "zerolatency");
// xp->i_level_idc = 31; // baseline // xp->i_level_idc = 31; // baseline
// CPU Flags // CPU Flags
xp->i_threads = 1;//X264_SYNC_LOOKAHEAD_AUTO; // xp->i_threads = 1;//X264_SYNC_LOOKAHEAD_AUTO;
// xp->i_lookahead_threads = X264_SYNC_LOOKAHEAD_AUTO; // xp->i_lookahead_threads = X264_SYNC_LOOKAHEAD_AUTO;
// Video Properties // Video Properties
xp->i_width = width; xp->i_width = width;
@ -134,10 +135,10 @@ static switch_status_t init_x264(h264_codec_context_t *context, uint32_t width,
xp->i_keyint_max = FPS * 10; xp->i_keyint_max = FPS * 10;
// Bitstream parameters // Bitstream parameters
xp->i_bframe = 0; xp->i_bframe = 0;
xp->i_frame_reference = 0; // xp->i_frame_reference = 0;
// xp->b_open_gop = 0; // xp->b_open_gop = 0;
// xp->i_bframe_pyramid = 0; // xp->i_bframe_pyramid = 0;
// xp->i_bframe_adaptive = X264_B_ADAPT_TRELLIS; // xp->i_bframe_adaptive = X264_B_ADAPT_NONE;
//xp->vui.i_sar_width = 1080; //xp->vui.i_sar_width = 1080;
//xp->vui.i_sar_height = 720; //xp->vui.i_sar_height = 720;
@ -571,7 +572,7 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec,
height = img->d_h; height = img->d_h;
if (context->x264_params.i_width != width || context->x264_params.i_height != height) { if (context->x264_params.i_width != width || context->x264_params.i_height != height) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "picture size changed from %dx%d to %dx%d, reinitializing encoder", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "picture size changed from %dx%d to %dx%d, reinitializing encoder\n",
context->x264_params.i_width, context->x264_params.i_width, width, height); context->x264_params.i_width, context->x264_params.i_width, width, height);
init_x264(context, width, height); init_x264(context, width, height);
} }
@ -609,12 +610,13 @@ static switch_status_t switch_h264_encode(switch_codec_t *codec,
if (0) { //debug if (0) { //debug
int i; int i;
x264_nal_t *nals = context->x264_nals; x264_nal_t *nals = context->x264_nals;
for (i = 0; i < context->x264_nal_count; i++) { for (i = 0; i < context->x264_nal_count; i++) {
// int start_code_len = 3 + nals[i].b_long_startcode; // int start_code_len = 3 + nals[i].b_long_startcode;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "encoded: %d %d %d %d| %d %d %d %x %x %x %x %x %x\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "encoded: %d %d %d %d| %d %d %d %x %x %x %x %x %x\n",
nals[i].i_type, nals[i].i_ref_idc, nals[i].i_payload, nals[i].b_long_startcode, *(nals[i].p_payload), *(nals[i].p_payload + 1), *(nals[i].p_payload + 2), *(nals[i].p_payload+3), *(nals[i].p_payload + 4), *(nals[i].p_payload + 5), *(nals[i].p_payload + 6), *(nals[i].p_payload + 7), *(nals[i].p_payload + 8)); nals[i].i_type, nals[i].i_ref_idc, nals[i].i_payload, nals[i].b_long_startcode, *(nals[i].p_payload), *(nals[i].p_payload + 1), *(nals[i].p_payload + 2), *(nals[i].p_payload+3), *(nals[i].p_payload + 4), *(nals[i].p_payload + 5), *(nals[i].p_payload + 6), *(nals[i].p_payload + 7), *(nals[i].p_payload + 8));
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "encoder output dts:%ld\n", (long)pic_out.i_dts); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Got ACL count : %d, Encoder output dts:%ld\n", context->x264_nal_count, (long)pic_out.i_dts);
} }
context->cur_nalu_index = 0; context->cur_nalu_index = 0;