mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-23 20:51:58 +00:00
numerous fixes from regression testing
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11104 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -330,7 +330,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock_hangup(_In
|
||||
\return success if it is safe to read from the session
|
||||
*/
|
||||
#ifdef SWITCH_DEBUG_RWLOCKS
|
||||
#define switch_core_session_read_lock(session) switch_core_session_perform_read_lock_hangup(session, __FILE__, __SWITCH_FUNC__, __LINE__)
|
||||
#define switch_core_session_read_lock_hangup(session) switch_core_session_perform_read_lock_hangup(session, __FILE__, __SWITCH_FUNC__, __LINE__)
|
||||
#else
|
||||
SWITCH_DECLARE(switch_status_t) switch_core_session_read_lock_hangup(_In_ switch_core_session_t *session);
|
||||
#endif
|
||||
@@ -901,7 +901,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(_In_ switc
|
||||
\param session the session to reset
|
||||
\param flush_dtmf flush all queued dtmf events too
|
||||
*/
|
||||
SWITCH_DECLARE(void) switch_core_session_reset(_In_ switch_core_session_t *session, switch_bool_t flush_dtmf);
|
||||
SWITCH_DECLARE(void) switch_core_session_reset(_In_ switch_core_session_t *session, switch_bool_t flush_dtmf, switch_bool_t reset_read_codec);
|
||||
|
||||
/*!
|
||||
\brief Write a frame to a session
|
||||
|
||||
@@ -320,6 +320,9 @@ struct switch_file_handle {
|
||||
switch_buffer_t *buffer;
|
||||
switch_byte_t *dbuf;
|
||||
switch_size_t dbuflen;
|
||||
switch_buffer_t *pre_buffer;
|
||||
unsigned char *pre_buffer_data;
|
||||
switch_size_t pre_buffer_datalen;
|
||||
const char *file;
|
||||
const char *func;
|
||||
int line;
|
||||
|
||||
@@ -166,7 +166,9 @@ SWITCH_BEGIN_EXTERN_C
|
||||
#define SWITCH_SPEECH_KEY "speech"
|
||||
#define SWITCH_UUID_BRIDGE "uuid_bridge"
|
||||
#define SWITCH_BITS_PER_BYTE 8
|
||||
typedef uint8_t switch_byte_t;
|
||||
#define SWITCH_DEFAULT_FILE_BUFFER_LEN 65536
|
||||
|
||||
typedef uint8_t switch_byte_t;
|
||||
|
||||
typedef struct {
|
||||
char digit;
|
||||
@@ -1061,7 +1063,9 @@ typedef enum {
|
||||
SWITCH_FILE_NATIVE = (1 << 9),
|
||||
SWITCH_FILE_SEEK = (1 << 10),
|
||||
SWITCH_FILE_OPEN = (1 << 11),
|
||||
SWITCH_FILE_CALLBACK = (1 << 12)
|
||||
SWITCH_FILE_CALLBACK = (1 << 12),
|
||||
SWITCH_FILE_DONE = (1 << 13),
|
||||
SWITCH_FILE_BUFFER_DONE = (1 << 14)
|
||||
} switch_file_flag_enum_t;
|
||||
typedef uint32_t switch_file_flag_t;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user