From f051179c60b08a25f3c4f6fb9d2fb35587e060e3 Mon Sep 17 00:00:00 2001 From: Robert Joly Date: Tue, 30 Sep 2008 04:09:25 +0000 Subject: [PATCH] Fixed not being able to set the video read/write codecs to NULL. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9758 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core_codec.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/switch_core_codec.c b/src/switch_core_codec.c index 661aad50d6..176d161377 100644 --- a/src/switch_core_codec.c +++ b/src/switch_core_codec.c @@ -183,6 +183,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_read_codec(switch_ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; + if (!codec || !codec->implementation) { + if (session->video_read_codec) { + session->video_read_codec = NULL; + return SWITCH_STATUS_SUCCESS; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); + return SWITCH_STATUS_FALSE; + } + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-video-read-codec-name", codec->implementation->iananame); @@ -210,7 +219,16 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_write_codec(switch switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; - if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { + if (!codec || !codec->implementation) { + if (session->video_write_codec) { + session->video_write_codec = NULL; + return SWITCH_STATUS_SUCCESS; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); + return SWITCH_STATUS_FALSE; + } + + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-video-write-codec-name", codec->implementation->iananame); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-video-write-codec-rate", "%d", codec->implementation->actual_samples_per_second);