tweak

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10497 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 90a652d7de3b6e7c26ce51a94e02a349a71e3266..bb922bd8a4b9e0520789553052eb82ac6f315ade 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -702,9 +702,13 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                                                *frame = NULL;
                                                return SWITCH_STATUS_GENERR;
                                        }
+                                       
+                                       if (tech_pvt->check_frames++ < MAX_CODEC_CHECK_FRAMES) {
+                                               if (!tech_pvt->read_codec.implementation->encoded_bytes_per_packet) {
+                                                       tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
+                                                       goto skip;
+                                               }
 
-
-                                       if (tech_pvt->check_frames < MAX_CODEC_CHECK_FRAMES) {
                                                if (tech_pvt->last_ts && tech_pvt->read_frame.datalen != tech_pvt->read_codec.implementation->encoded_bytes_per_packet) {
                                                        if (++tech_pvt->mismatch_count >= MAX_MISMATCH_FRAMES) {
                                                                switch_size_t codec_ms = (int)(tech_pvt->read_frame.timestamp - 
@@ -712,6 +716,7 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                                                                
                                                                if ((codec_ms % 10) != 0) {
                                                                        tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
+                                                                       goto skip;
                                                                } else {
                                                                        if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) {
                                                                                const char *val;
@@ -770,13 +775,13 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
                                                                        }
                                                        
                                                                }
-                                                               tech_pvt->check_frames++;
                                                        }
                                                } else {
                                                        tech_pvt->mismatch_count = 0;
                                                }
                                                tech_pvt->last_ts = tech_pvt->read_frame.timestamp;
                                        }
+                               skip:
                                        
                                        if ((bytes = tech_pvt->read_codec.implementation->encoded_bytes_per_packet)) {
                                                frames = (tech_pvt->read_frame.datalen / bytes);

diff --git a/src/switch_core_io.c b/src/switch_core_io.c
index 1573b174d2b6e41285160f8f317b6b1faa47a147..96d5ecabdf9f738dae4231a6d7b66d98d9a84d1d 100644 (file)
--- a/src/switch_core_io.c
+++ b/src/switch_core_io.c
@@ -155,6 +155,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
        }
 
        if (session->endpoint_interface->io_routines->read_frame) {
+               switch_mutex_unlock(session->read_codec->mutex);
+               switch_mutex_unlock(session->codec_read_mutex);
                if ((status = session->endpoint_interface->io_routines->read_frame(session, frame, flags, stream_id)) == SWITCH_STATUS_SUCCESS) {
                        for (ptr = session->event_hooks.read_frame; ptr; ptr = ptr->next) {
                                if ((status = ptr->read_frame(session, frame, flags, stream_id)) != SWITCH_STATUS_SUCCESS) {
@@ -162,6 +164,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
                                }
                        }
                }
+               
+               if (!session->read_codec) {
+                       *frame = NULL;
+                       return SWITCH_STATUS_FALSE;
+               }
+               
+               switch_mutex_lock(session->codec_read_mutex);
+               switch_mutex_lock(session->read_codec->mutex);
        }
 
        if (status != SWITCH_STATUS_SUCCESS) {