From ec20bc0b3790db7f0eafedd6eaacc340303c10aa Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 9 Oct 2012 12:28:19 -0500 Subject: [PATCH] FS-4700 FS-4701 --resolve --- src/switch_core_media_bug.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/switch_core_media_bug.c b/src/switch_core_media_bug.c index 370b22a5f7..19462b98b4 100644 --- a/src/switch_core_media_bug.c +++ b/src/switch_core_media_bug.c @@ -244,12 +244,18 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *b if (switch_core_session_get_partner(bug->session, &other_session) == SWITCH_STATUS_SUCCESS) { switch_core_session_get_read_impl(other_session, &other_read_impl); switch_core_session_rwunlock(other_session); - - if (read_impl.decoded_bytes_per_packet < other_read_impl.decoded_bytes_per_packet) { - frame_size = other_read_impl.decoded_bytes_per_packet; + + if (read_impl.actual_samples_per_second == other_read_impl.actual_samples_per_second) { + if (read_impl.decoded_bytes_per_packet < other_read_impl.decoded_bytes_per_packet) { + frame_size = other_read_impl.decoded_bytes_per_packet; + } + } else { + if (read_impl.decoded_bytes_per_packet > other_read_impl.decoded_bytes_per_packet) { + frame_size = other_read_impl.decoded_bytes_per_packet; + } } } - + bug->record_frame_size = frame_size; } }