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

avoiding deadlock 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10045 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-10-16 16:34:52 +00:00
parent 853ecf075b
commit b83dce5c1d
3 changed files with 86 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/include/private/switch_core_pvt.h
View File

@ -111,6 +111,11 @@ struct switch_core_session {
switch_codec_t *video_read_codec; switch_codec_t *video_read_codec;
switch_codec_t *video_write_codec; switch_codec_t *video_write_codec;
switch_codec_implementation_t read_impl;
switch_codec_implementation_t write_impl;
switch_codec_implementation_t video_read_impl;
switch_codec_implementation_t video_write_impl;
switch_audio_resampler_t *read_resampler; switch_audio_resampler_t *read_resampler;
switch_audio_resampler_t *write_resampler; switch_audio_resampler_t *write_resampler;

7
src/include/switch_core.h
View File

@ -1134,6 +1134,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(_In_ switch_c
SWITCH_DECLARE(void) switch_core_session_unset_read_codec(_In_ switch_core_session_t *session); SWITCH_DECLARE(void) switch_core_session_unset_read_codec(_In_ switch_core_session_t *session);
SWITCH_DECLARE(void) switch_core_session_unset_write_codec(_In_ switch_core_session_t *session); SWITCH_DECLARE(void) switch_core_session_unset_write_codec(_In_ switch_core_session_t *session);
SWITCH_DECLARE(switch_status_t) switch_core_session_get_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp);
SWITCH_DECLARE(switch_status_t) switch_core_session_get_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp);
SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp);
SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp);
/*! /*!
\brief Retrieve the read codec from a given session \brief Retrieve the read codec from a given session
\param session session to retrieve from \param session session to retrieve from

131
src/switch_core_codec.c
View File

@ -46,14 +46,11 @@ SWITCH_DECLARE(void) switch_core_session_unset_read_codec(switch_core_session_t
{ {
switch_mutex_lock(session->resample_mutex); switch_mutex_lock(session->resample_mutex);
session->real_read_codec = session->read_codec = NULL; session->real_read_codec = session->read_codec = NULL;
switch_mutex_unlock(session->resample_mutex);
} }
SWITCH_DECLARE(void) switch_core_session_unset_write_codec(switch_core_session_t *session) SWITCH_DECLARE(void) switch_core_session_unset_write_codec(switch_core_session_t *session)
{ {
switch_mutex_lock(session->resample_mutex);
session->real_write_codec = session->write_codec = NULL; session->real_write_codec = session->write_codec = NULL;
switch_mutex_unlock(session->resample_mutex);
} }
@ -64,8 +61,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
char tmp[30]; char tmp[30];
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_mutex_lock(session->resample_mutex);
if (codec && !codec->implementation) { if (codec && !codec->implementation) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set UNINITIALIZED codec!\n");
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
@ -77,6 +72,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
if (session->real_read_codec) { if (session->real_read_codec) {
if (session->real_read_codec->implementation) { if (session->real_read_codec->implementation) {
session->read_codec = session->real_read_codec; session->read_codec = session->real_read_codec;
session->read_impl = *session->real_read_codec->implementation;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "resetting to uninitilized codec, setting to NULL\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "resetting to uninitilized codec, setting to NULL\n");
session->read_codec = session->real_read_codec = NULL; session->read_codec = session->real_read_codec = NULL;
@ -96,25 +92,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
} }
session->read_codec = codec; session->read_codec = codec;
session->read_impl = *codec->implementation;
if (!session->real_read_codec) { if (!session->real_read_codec) {
session->real_read_codec = session->read_codec; session->real_read_codec = session->read_codec;
} }
} }
if (session->read_codec && session->read_codec->implementation) { if (session->read_codec && codec && session->read_impl.bytes_per_frame) {
if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) {
switch_channel_event_set_data(session->channel, event); switch_channel_event_set_data(session->channel, event);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", session->read_codec->implementation->iananame); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", session->read_impl.iananame);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_codec->implementation->actual_samples_per_second); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_impl.actual_samples_per_second);
if (session->read_codec->implementation->actual_samples_per_second != session->read_codec->implementation->samples_per_second) { if (session->read_impl.actual_samples_per_second != session->read_impl.samples_per_second) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_codec->implementation->samples_per_second); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_impl.samples_per_second);
} }
switch_event_fire(&event); switch_event_fire(&event);
} }
switch_channel_set_variable(channel, "read_codec", session->read_codec->implementation->iananame); switch_channel_set_variable(channel, "read_codec", session->read_impl.iananame);
switch_snprintf(tmp, sizeof(tmp), "%d", session->read_codec->implementation->actual_samples_per_second); switch_snprintf(tmp, sizeof(tmp), "%d", session->read_impl.actual_samples_per_second);
switch_channel_set_variable(channel, "read_rate", tmp); switch_channel_set_variable(channel, "read_rate", tmp);
@ -125,7 +122,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
} }
end: end:
switch_mutex_unlock(session->resample_mutex);
return status; return status;
@ -133,22 +129,57 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_read_codec(switch_core_s
SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_read_codec(switch_core_session_t *session) SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_read_codec(switch_core_session_t *session)
{ {
switch_codec_t *codec; switch_codec_t *codec; codec = session->read_codec;
switch_mutex_lock(session->resample_mutex);
codec = session->read_codec;
switch_mutex_unlock(session->resample_mutex);
return codec; return codec;
} }
SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(switch_core_session_t *session) SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(switch_core_session_t *session)
{ {
switch_codec_t *codec; switch_codec_t *codec; codec = session->real_read_codec ? session->real_read_codec : session->read_codec;
switch_mutex_lock(session->resample_mutex);
codec = session->real_read_codec ? session->real_read_codec : session->read_codec;
switch_mutex_unlock(session->resample_mutex);
return codec; return codec;
} }
SWITCH_DECLARE(switch_status_t) switch_core_session_get_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp)
{
if (session->read_impl.bytes_per_frame) {
*impp = session->read_impl;
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_FALSE;
}
SWITCH_DECLARE(switch_status_t) switch_core_session_get_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp)
{
if (session->write_impl.bytes_per_frame) {
*impp = session->write_impl;
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_FALSE;
}
SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_read_impl(switch_core_session_t *session, switch_codec_implementation_t *impp)
{
if (session->video_read_impl.bytes_per_frame) {
*impp = session->video_read_impl;
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_FALSE;
}
SWITCH_DECLARE(switch_status_t) switch_core_session_get_video_write_impl(switch_core_session_t *session, switch_codec_implementation_t *impp)
{
if (session->video_write_impl.bytes_per_frame) {
*impp = session->video_write_impl;
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_FALSE;
}
SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_session_t *session, switch_codec_t *codec) SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_session_t *session, switch_codec_t *codec)
{ {
switch_event_t *event; switch_event_t *event;
@ -156,11 +187,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_
char tmp[30]; char tmp[30];
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_mutex_lock(session->resample_mutex);
if (!codec || !codec->implementation) { if (!codec || !codec->implementation) {
if (session->real_write_codec) { if (session->real_write_codec) {
session->write_codec = session->real_write_codec; session->write_codec = session->real_write_codec;
session->write_impl = *session->real_write_codec->implementation;
session->real_write_codec = NULL; session->real_write_codec = NULL;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
@ -171,6 +201,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_
if (session->real_write_codec) { if (session->real_write_codec) {
if (codec == session->real_write_codec) { if (codec == session->real_write_codec) {
session->write_codec = codec; session->write_codec = codec;
session->write_impl = *codec->implementation;
session->real_write_codec = NULL; session->real_write_codec = NULL;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n");
@ -180,29 +211,32 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_
} else { } else {
session->real_write_codec = session->write_codec; session->real_write_codec = session->write_codec;
session->write_codec = codec; session->write_codec = codec;
session->write_impl = *codec->implementation;
} }
} else { } else {
session->write_codec = codec; session->write_codec = codec;
session->write_impl = *codec->implementation;
} }
if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { if (session->write_codec && codec && session->write_impl.bytes_per_frame) {
switch_channel_event_set_data(session->channel, event); if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", session->write_codec->implementation->iananame); switch_channel_event_set_data(session->channel, event);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", session->write_codec->implementation->actual_samples_per_second); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", session->write_impl.iananame);
if (session->write_codec->implementation->actual_samples_per_second != session->write_codec->implementation->samples_per_second) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", session->write_impl.actual_samples_per_second);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-write-codec-rate", "%d", if (session->write_impl.actual_samples_per_second != session->write_impl.samples_per_second) {
session->write_codec->implementation->actual_samples_per_second); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-write-codec-rate", "%d",
session->write_impl.actual_samples_per_second);
}
switch_event_fire(&event);
} }
switch_event_fire(&event);
}
switch_channel_set_variable(channel, "write_codec", session->write_codec->implementation->iananame); switch_channel_set_variable(channel, "write_codec", session->write_impl.iananame);
switch_snprintf(tmp, sizeof(tmp), "%d", session->write_codec->implementation->actual_samples_per_second); switch_snprintf(tmp, sizeof(tmp), "%d", session->write_impl.actual_samples_per_second);
switch_channel_set_variable(channel, "write_rate", tmp); switch_channel_set_variable(channel, "write_rate", tmp);
}
end: end:
switch_mutex_unlock(session->resample_mutex);
return status; return status;
} }
@ -210,10 +244,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_
SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_write_codec(switch_core_session_t *session) SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_write_codec(switch_core_session_t *session)
{ {
switch_codec_t *codec; switch_codec_t *codec;
switch_mutex_lock(session->resample_mutex);
codec = session->write_codec; codec = session->write_codec;
switch_mutex_unlock(session->resample_mutex);
return codec; return codec;
} }
@ -221,10 +252,7 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_write_codec(s
SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core_session_t *session) SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core_session_t *session)
{ {
switch_codec_t *codec; switch_codec_t *codec;
switch_mutex_lock(session->resample_mutex);
codec = session->real_write_codec ? session->real_write_codec : session->write_codec; codec = session->real_write_codec ? session->real_write_codec : session->write_codec;
switch_mutex_unlock(session->resample_mutex);
return codec; return codec;
} }
@ -238,8 +266,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_read_codec(switch_
char tmp[30]; char tmp[30];
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
switch_mutex_lock(session->resample_mutex);
if (!codec || !codec->implementation) { if (!codec || !codec->implementation) {
if (session->video_read_codec) { if (session->video_read_codec) {
session->video_read_codec = NULL; session->video_read_codec = NULL;
@ -263,20 +289,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_read_codec(switch_
switch_channel_set_variable(channel, "video_read_rate", tmp); switch_channel_set_variable(channel, "video_read_rate", tmp);
session->video_read_codec = codec; session->video_read_codec = codec;
session->video_read_impl = *codec->implementation;
end: end:
switch_mutex_unlock(session->resample_mutex);
return status; return status;
} }
SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_read_codec(switch_core_session_t *session) SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_read_codec(switch_core_session_t *session)
{ {
switch_codec_t *codec; switch_codec_t *codec;
switch_mutex_lock(session->resample_mutex);
codec = session->video_read_codec; codec = session->video_read_codec;
switch_mutex_unlock(session->resample_mutex);
return codec; return codec;
@ -288,9 +310,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_write_codec(switch
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
char tmp[30]; char tmp[30];
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
if (!codec || !codec->implementation) {
switch_mutex_lock(session->resample_mutex);
if (!codec || !codec->implementation) {
if (session->video_write_codec) { if (session->video_write_codec) {
session->video_write_codec = NULL; session->video_write_codec = NULL;
status = SWITCH_STATUS_SUCCESS; status = SWITCH_STATUS_SUCCESS;
@ -313,20 +333,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_write_codec(switch
switch_channel_set_variable(channel, "video_write_rate", tmp); switch_channel_set_variable(channel, "video_write_rate", tmp);
session->video_write_codec = codec; session->video_write_codec = codec;
session->video_write_impl = *codec->implementation;
end: end:
switch_mutex_unlock(session->resample_mutex);
return status; return status;
} }
SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_write_codec(switch_core_session_t *session) SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_write_codec(switch_core_session_t *session)
{ {
switch_codec_t *codec; switch_codec_t *codec;
switch_mutex_lock(session->resample_mutex);
codec = session->video_write_codec; codec = session->video_write_codec;
switch_mutex_unlock(session->resample_mutex);
return codec; return codec;