kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-15 05:08:26 +00:00
Code Issues Projects Releases Wiki Activity

FS-11189 add vpx codec specific and debug controls

Browse Source
This commit is contained in:
Seven Du 2018-06-14 10:49:33 +08:00 committed by Muteesa Fred
parent c58da50f44
commit 1eacc9f418
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/switch_vpx.c
View File

@ -306,6 +306,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_vpx_load);
SWITCH_MODULE_DEFINITION(CORE_VPX_MODULE, mod_vpx_load, NULL, NULL); SWITCH_MODULE_DEFINITION(CORE_VPX_MODULE, mod_vpx_load, NULL, NULL);
struct vpx_context { struct vpx_context {
int debug;
switch_codec_t *codec; switch_codec_t *codec;
int is_vp9; int is_vp9;
vp9_info_t vp9; vp9_info_t vp9;
@ -840,11 +841,10 @@ static switch_status_t buffer_vp8_packets(vpx_context_t *context, switch_frame_t
uint8_t DES; uint8_t DES;
// uint8_t PID; // uint8_t PID;
int len; int len;
#if 0
int key = 0;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, if (context->debug > 0) {
"VIDEO VPX: seq: %d ts: %u len: %ld %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x mark: %d\n", switch_log_printf(SWITCH_CHANNEL_LOG, context->debug,
"VIDEO VPX: seq: %d ts: %u len: %u %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x mark: %d\n",
frame->seq, frame->timestamp, frame->datalen, frame->seq, frame->timestamp, frame->datalen,
*((uint8_t *)data), *((uint8_t *)data + 1), *((uint8_t *)data), *((uint8_t *)data + 1),
*((uint8_t *)data + 2), *((uint8_t *)data + 3), *((uint8_t *)data + 2), *((uint8_t *)data + 3),
@ -852,8 +852,7 @@ static switch_status_t buffer_vp8_packets(vpx_context_t *context, switch_frame_t
*((uint8_t *)data + 6), *((uint8_t *)data + 7), *((uint8_t *)data + 6), *((uint8_t *)data + 7),
*((uint8_t *)data + 8), *((uint8_t *)data + 9), *((uint8_t *)data + 8), *((uint8_t *)data + 9),
*((uint8_t *)data + 10), frame->m); *((uint8_t *)data + 10), frame->m);
#endif }
DES = *data; DES = *data;
data++; data++;
@ -931,8 +930,8 @@ static switch_status_t buffer_vp9_packets(vpx_context_t *context, switch_frame_t
vp9_payload_descriptor_t *desc = (vp9_payload_descriptor_t *)vp9; vp9_payload_descriptor_t *desc = (vp9_payload_descriptor_t *)vp9;
int len = 0; int len = 0;
#ifdef DEBUG_VP9 if (context->debug > 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, frame->m ? SWITCH_LOG_ERROR : SWITCH_LOG_INFO, switch_log_printf(SWITCH_CHANNEL_LOG, frame->m ? SWITCH_LOG_ERROR : SWITCH_LOG_INFO,
"[%02x %02x %02x %02x] m=%d len=%4d seq=%d ts=%u ssrc=%u " "[%02x %02x %02x %02x] m=%d len=%4d seq=%d ts=%u ssrc=%u "
"have_pid=%d " "have_pid=%d "
"have_p_layer=%d " "have_p_layer=%d "
@ -951,7 +950,7 @@ static switch_status_t buffer_vp9_packets(vpx_context_t *context, switch_frame_t
desc->end, desc->end,
desc->have_ss, desc->have_ss,
desc->zero); desc->zero);
#endif }
vp9++; vp9++;
@ -1066,12 +1065,12 @@ static switch_status_t switch_vpx_decode(switch_codec_t *codec, switch_frame_t *
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
int is_start = 0, is_keyframe = 0, get_refresh = 0; int is_start = 0, is_keyframe = 0, get_refresh = 0;
#if 0 if (context->debug > 0 && context->debug < 4) {
vp9_payload_descriptor_t *desc = (vp9_payload_descriptor_t *)frame->data; vp9_payload_descriptor_t *desc = (vp9_payload_descriptor_t *)frame->data;
uint8_t *data = frame->data; uint8_t *data = frame->data;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%02x %02x %02x %02x m=%d start=%d end=%d m=%d len=%d\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%02x %02x %02x %02x m=%d start=%d end=%d m=%d len=%d\n",
*data, *(data+1), *(data+2), *(data+3), frame->m, desc->start, desc->end, frame->m, frame->datalen); *data, *(data+1), *(data+2), *(data+3), frame->m, desc->start, desc->end, frame->m, frame->datalen);
#endif }
if (context->is_vp9) { if (context->is_vp9) {
is_keyframe = IS_VP9_KEY_FRAME(*(unsigned char *)frame->data); is_keyframe = IS_VP9_KEY_FRAME(*(unsigned char *)frame->data);
@ -1090,10 +1089,6 @@ static switch_status_t switch_vpx_decode(switch_codec_t *codec, switch_frame_t *
} else { // vp8 } else { // vp8
is_start = (*(unsigned char *)frame->data & 0x10); is_start = (*(unsigned char *)frame->data & 0x10);
is_keyframe = IS_VP8_KEY_FRAME((uint8_t *)frame->data); is_keyframe = IS_VP8_KEY_FRAME((uint8_t *)frame->data);
#ifdef DEBUG_VP9
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "VP8\n");
#endif
} }
if (!is_keyframe && context->got_key_frame <= 0) { if (!is_keyframe && context->got_key_frame <= 0) {
@ -1106,7 +1101,9 @@ static switch_status_t switch_vpx_decode(switch_codec_t *codec, switch_frame_t *
} }
} }
// if (is_keyframe) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "got key %d\n", context->got_key_frame); if (context->debug > 0 && is_keyframe) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "GOT KEY FRAME %d\n", context->got_key_frame);
}
if (context->need_decoder_reset != 0) { if (context->need_decoder_reset != 0) {
vpx_codec_destroy(&context->decoder); vpx_codec_destroy(&context->decoder);
@ -1294,6 +1291,29 @@ static switch_status_t switch_vpx_control(switch_codec_t *codec,
} }
} }
break; break;
case SCC_CODEC_SPECIFIC:
{
const char *command = (const char *)cmd_data;
if (ctype == SCCT_INT) {
} else if (ctype == SCCT_STRING && !zstr(command)) {
if (!strcasecmp(command, "VP8E_SET_CPUUSED")) {
vpx_codec_control(&context->encoder, VP8E_SET_CPUUSED, *(int *)cmd_arg);
} else if (!strcasecmp(command, "VP8E_SET_TOKEN_PARTITIONS")) {
vpx_codec_control(&context->encoder, VP8E_SET_TOKEN_PARTITIONS, *(int *)cmd_arg);
} else if (!strcasecmp(command, "VP8E_SET_NOISE_SENSITIVITY")) {
vpx_codec_control(&context->encoder, VP8E_SET_NOISE_SENSITIVITY, *(int *)cmd_arg);
}
}
}
break;
case SCC_DEBUG:
{
int32_t level = *((uint32_t *) cmd_data);
context->debug = level;
}
break;
default: default:
break; break;
} }