return 0;
//Due to explicit setting of flags we know exactly what we are getting
- PStringArray fields(6);
- static PRegularExpression logRE("^([0-9]+)\t *([^(]+)\\(([0-9]+)\\)\t(.*)", PRegularExpression::Extended);
+ #define THREAD_ID_INDEX 2
+ #define FILE_NAME_INDEX 3
+ #define FILE_LINE_INDEX 4
+#if PTLIB_CHECK_VERSION(2,11,1)
+ #define CONTEXT_ID_REGEX "([0-9]+|- - - - - - -)\t"
+ #define LOG_PRINTF_FORMAT "{%s,%s} %s"
+ #define FULL_TEXT_INDEX 6
+#else
+ #define CONTEXT_ID_REGEX
+ #define LOG_PRINTF_FORMAT "{%s} %s"
+ #define FULL_TEXT_INDEX 5
+#endif
+ PStringArray fields(7);
+ static PRegularExpression logRE("^([0-9]+)\t *(.+)\t *([^(]+)\\(([0-9]+)\\)\t"CONTEXT_ID_REGEX"(.*)",
+ PRegularExpression::Extended);
if (!logRE.Execute(s.c_str(), fields)) {
fields[1] = "4";
- fields[2] = __FILE__;
- fields[3] = __LINE__;
- fields[4] = s;
+ fields[THREAD_ID_INDEX] = "unknown";
+ fields[FILE_NAME_INDEX] = __FILE__;
+ fields[FILE_LINE_INDEX] = __LINE__;
+ fields[FULL_TEXT_INDEX] = s;
}
switch_log_level_t level;
}
fields[4].Replace("\t", " ", true);
+#if PTLIB_CHECK_VERSION(2,11,1)
+ fields[5].Replace("- - - - - - -", "-"),
+#endif
switch_log_printf(SWITCH_CHANNEL_ID_LOG,
- fields[2],
+ fields[FILE_NAME_INDEX],
"PTLib-OPAL",
- fields[3].AsUnsigned(),
+ fields[FILE_LINE_INDEX].AsUnsigned(),
NULL,
level,
- "%s", fields[4].GetPointer());
+ LOG_PRINTF_FORMAT,
+ fields[THREAD_ID_INDEX].GetPointer(),
+#if PTLIB_CHECK_VERSION(2,11,1)
+ fields[5].GetPointer(),
+#endif
+ fields[FULL_TEXT_INDEX].GetPointer());
// Reset string
str(std::string());
m_dialplan = val;
} else if (var == "codec-prefs") {
m_codecPrefs = val;
+ } else if (var == "disable-transcoding") {
+ m_disableTranscoding = switch_true(val);
} else if (var == "jitter-size") {
SetAudioJitterDelay(val.AsUnsigned(), val.Mid(val.Find(',')+1).AsUnsigned()); // In milliseconds
} else if (var == "gk-address") {
PTrace::SetLevel(level);
PTrace::ClearOptions(0xffffffff); // Everything off
PTrace::SetOptions( // Except these
- PTrace::TraceLevel|PTrace::FileAndLine
+ PTrace::TraceLevel|PTrace::FileAndLine|PTrace::Thread
#if PTLIB_CHECK_VERSION(2,11,1)
|PTrace::ContextIdentifier
#endif
switch_channel_set_caller_profile(m_fsChannel, caller_profile);
SetLocalPartyName(caller_profile->caller_id_number);
SetDisplayName(caller_profile->caller_id_name);
+
*params->new_session = m_fsSession;
}
PString codec_string = switch_channel_get_variable(m_fsChannel, "absolute_codec_string");
if (codec_string.IsEmpty()) {
codec_string = switch_channel_get_variable(m_fsChannel, "codec_string");
- const char *orig_codec = switch_channel_get_variable(m_fsChannel, SWITCH_ORIGINATOR_CODEC_VARIABLE);
- if (orig_codec) {
- codec_string.Splice(orig_codec, 0);
+ if (codec_string.IsEmpty()) {
+ codec_string = m_endpoint.GetManager().GetCodecPrefs();
+ if (codec_string.IsEmpty()) {
+ numCodecs = switch_loadable_module_get_codecs(codecs, sizeof(codecs) / sizeof(codecs[0]));
+ for (int i = 0; i < numCodecs; i++) {
+ if (i > 0)
+ codec_string += ',';
+ codec_string += codecs[i]->iananame;
+ }
+ PTRACE(4, "mod_opal\tDefault to all loaded codecs=" << codec_string);
+ }
+ else {
+ PTRACE(4, "mod_opal\tSettings codec-prefs=" << codec_string);
+ }
+ }
+ else {
+ PTRACE(4, "mod_opal\tChannel codec_string=" << codec_string);
}
- }
- if (codec_string.IsEmpty()) {
- codec_string = m_endpoint.GetManager().GetCodecPrefs();
+ PString orig_codec = switch_channel_get_variable(m_fsChannel, SWITCH_ORIGINATOR_CODEC_VARIABLE);
+ if (!orig_codec.IsEmpty()) {
+ if (m_endpoint.GetManager().GetDisableTranscoding()) {
+ codec_string = orig_codec;
+ PTRACE(4, "mod_opal\tNo transcoding, forced to originator codec=" << orig_codec);
+ }
+ else {
+ codec_string.Splice(orig_codec+',', 0);
+ PTRACE(4, "mod_opal\tSetting preference to originator codec=" << orig_codec);
+ }
+ }
+ }
+ else {
+ PTRACE(4, "mod_opal\tChannel absolute_codec_string=" << codec_string);
}
- if (codec_string.IsEmpty()) {
- numCodecs = switch_loadable_module_get_codecs(codecs, sizeof(codecs) / sizeof(codecs[0]));
- } else {
+ if (!codec_string.IsEmpty()) {
char *codec_order[SWITCH_MAX_CODECS];
int codec_order_last = switch_separate_string((char *)codec_string.GetPointer(), ',', codec_order, SWITCH_MAX_CODECS);
numCodecs = switch_loadable_module_get_codecs_sorted(codecs, SWITCH_MAX_CODECS, codec_order, codec_order_last);
// See if we have a match by name alone
switchFormat = codec->iananame;
if (!switchFormat.IsValid()) {
- PTRACE(2, "mod_opal\tCould not match FS codec " << codec->iananame << " to OPAL media format.");
+ PTRACE(2, "mod_opal\tCould not match FS codec "
+ << codec->iananame << '@' << codec->samples_per_second
+ << " (pt=" << codec->ianacode << ")"
+ " to an OPAL media format.");
continue;
}
}
- // Did we match or create a new media format?
- if (switchFormat.IsValid() && codec->codec_type == SWITCH_CODEC_TYPE_AUDIO) {
- PTRACE(3, "mod_opal\tMatched FS codec " << codec->iananame << " to OPAL media format " << switchFormat);
+ PTRACE(4, "mod_opal\tMatched FS codec " << codec->iananame << " to OPAL media format " << switchFormat);
#if IMPLEMENT_MULTI_FAME_AUDIO
+ // Did we match or create a new media format?
+ if (switchFormat.IsValid() && codec->codec_type == SWITCH_CODEC_TYPE_AUDIO) {
// Calculate frames per packet, do not use codec->codec_frames_per_packet as that field
// has slightly different semantics when used in streamed codecs such as G.711
int fpp = codec->samples_per_packet/switchFormat.GetFrameTime();
if (fpp > switchFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption())) {
switchFormat.SetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption(), fpp);
}
-#endif // IMPLEMENT_MULTI_FAME_AUDIO
}
+#endif // IMPLEMENT_MULTI_FAME_AUDIO
m_switchMediaFormats += switchFormat;
}
} else if (mediaFormat.GetMediaType() == OpalMediaType::Video()) {
isAudio = false;
} else {
- return OpalMediaStream::Open();
+ return false;
}
int ptime = mediaFormat.GetOptionInteger(OpalAudioFormat::TxFramesPerPacketOption()) * mediaFormat.GetFrameTime() / mediaFormat.GetTimeUnits();
}
}
- if (!m_switchTimer) {
- PTRACE(2, "mod_opal\tread_frame: no timer!");
- return SWITCH_STATUS_FALSE;
+ if (m_switchTimer != NULL) {
+ switch_core_timer_next(m_switchTimer);
}
- switch_core_timer_next(m_switchTimer);
- if (!switch_core_codec_ready(m_switchCodec)) {
- PTRACE(2, "mod_opal\tread_frame: codec not ready!");
- return SWITCH_STATUS_FALSE;
+ if (m_switchCodec != NULL) {
+ if (!switch_core_codec_ready(m_switchCodec)) {
+ PTRACE(2, "mod_opal\tread_frame: codec not ready!");
+ return SWITCH_STATUS_FALSE;
+ }
}
+ m_readFrame.packet = m_readRTP.GetPointer();
+ m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen;
+
#if IMPLEMENT_MULTI_FAME_AUDIO
// Repackage frames in incoming packet to agree with what FS expects.
// Not implmented yet!!!!!!!!!
m_readFrame.buflen = m_readRTP.GetSize();
m_readFrame.data = m_readRTP.GetPayloadPtr();
m_readFrame.datalen = m_readRTP.GetPayloadSize();
- m_readFrame.packet = m_readRTP.GetPointer();
- m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen;
m_readFrame.timestamp = m_readRTP.GetTimestamp();
m_readFrame.seq = m_readRTP.GetSequenceNumber();
m_readFrame.ssrc = m_readRTP.GetSyncSource();
#undef strcasecmp
#undef strncasecmp
+
+#if _MSC_VER < 1600
+/*The following insanity is because libteletone_generate.h defines int8_t in
+ a slightly different manner to most other cases (SDL, PCAP, Java V8, stdint.h
+ etc) and does not provide a mechanism to prevent it's inclusion. Then, to
+ cap it off, VS2008 barfs on the difference. VS2010 seems OK with it.
+
+ Sigh.
+ */
+#pragma include_alias(<libteletone.h>, <../../libs/libteletone/src/libteletone.h>)
+#pragma include_alias(<libteletone_generate.h>, <../../libs/libteletone/src/libteletone_generate.h>)
+#pragma include_alias(<libteletone_detect.h>, <../../libs/libteletone/src/libteletone_detect.h>)
+#define int8_t signed int8_t
+#include <libteletone_generate.h>
+#undef int8_t
+#endif // End of insanity
+
+
#define HAVE_APR
+#define uint32_t uint32_t // Avoid conflict in stdint definitions
#include <switch.h>
+#undef uint32_t
+
#include <switch_version.h>
const PString & GetContext() const { return m_context; }
const PString & GetDialPlan() const { return m_dialplan; }
const PString & GetCodecPrefs() const { return m_codecPrefs; }
+ bool GetDisableTranscoding() const { return m_disableTranscoding; }
private:
switch_endpoint_interface_t *m_FreeSwitch;
PString m_context;
PString m_dialplan;
PString m_codecPrefs;
+ bool m_disableTranscoding;
PString m_gkAddress;
PString m_gkIdentifer;
PString m_gkInterface;
virtual OpalMediaFormatList GetMediaFormats() const;
virtual PBoolean SendUserInputTone(char tone, unsigned duration);
- void SetCodecs();
- bool WaitForMedia();
-
DECLARE_CALLBACK0(on_init);
DECLARE_CALLBACK0(on_destroy);
DECLARE_CALLBACK0(on_routing);
DECLARE_CALLBACK3(read_video_frame, switch_frame_t **, frame, switch_io_flag_t, flag, int, stream_id);
DECLARE_CALLBACK3(write_video_frame, switch_frame_t *, frame, switch_io_flag_t, flag, int, stream_id);
- switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags);
- switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags);
-
__inline switch_core_session_t *GetSession() const
{
return m_fsSession;
return true;
}
+ protected:
+ void SetCodecs();
+ bool WaitForMedia();
+
+ switch_status_t read_frame(const OpalMediaType & mediaType, switch_frame_t **frame, switch_io_flag_t flags);
+ switch_status_t write_frame(const OpalMediaType & mediaType, const switch_frame_t *frame, switch_io_flag_t flags);
+
private:
FSEndPoint &m_endpoint;
switch_core_session_t *m_fsSession;
projects / thirdparty / freeswitch.git / commitdiff
