kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 04:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

More 32->64 bit codec conversions.

Browse Source 
In the process of swapping ULAW to a place in the extended codec space, we
found several unhandled cases, where a 32-bit integer was still being used to
handle a codec field.  Most of these have been fixed with this commit, although
there is at least one case (codec_dahdi) which depends upon outside headers to
be altered before a conversion can be made.
(Fixes AST-278, SWP-459)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@231850 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-12-01 20:27:37 +00:00
parent b2d115bce9
commit f59fe83c56
16 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
addons/chan_ooh323.c
View File

@@ -169,9 +169,9 @@ static struct ooh323_pvt {
char callee_url[AST_MAX_EXTENSION];
int port;
int readformat; /* negotiated read format */
int writeformat; /* negotiated write format */
int capability;
format_t readformat; /* negotiated read format */
format_t writeformat; /* negotiated write format */
format_t capability;
struct ast_codec_pref prefs;
int dtmfmode;
int dtmfcodec;
@@ -3673,7 +3673,7 @@ int ooh323_update_capPrefsOrderForCall
}
int ooh323_convertAsteriskCapToH323Cap(int cap)
int ooh323_convertAsteriskCapToH323Cap(format_t cap)
{
char formats[FORMAT_STRING_SIZE];
switch (cap) {
@@ -3744,7 +3744,8 @@ int configure_local_rtp(struct ooh323_pvt *p, ooCallData *call)
{
struct sockaddr_in us;
ooMediaInfo mediaInfo;
int x, format = 0;
int x;
format_t format = 0;
if (gH323Debug)
ast_verbose("--- configure_local_rtp\n");

4
addons/chan_ooh323.h
View File

@@ -60,7 +60,7 @@
#include <asterisk/manager.h>
#include <asterisk/dsp.h>
#include <asterisk/stringfields.h>
#include <asterisk/frame_defs.h>
#include <asterisk/udptl.h>
#include "ootypes.h"
@@ -104,7 +104,7 @@ void ooh323_set_read_format(ooCallData *call, int fmt);
int ooh323_update_capPrefsOrderForCall
(ooCallData *call, struct ast_codec_pref *prefs);
int ooh323_convertAsteriskCapToH323Cap(int cap);
int ooh323_convertAsteriskCapToH323Cap(format_t cap);
int ooh323_convert_hangupcause_asteriskToH323(int cause);
int ooh323_convert_hangupcause_h323ToAsterisk(int cause);

6
addons/ooh323cDriver.c
View File

@@ -594,7 +594,7 @@ int ooh323c_set_aliases(ooAliases * aliases)
int ooh323c_start_receive_channel(ooCallData *call, ooLogicalChannel *pChannel)
{
int fmt=-1;
format_t fmt=-1;
fmt = convertH323CapToAsteriskCap(pChannel->chanCap->cap);
if(fmt>0) {
/* ooh323_set_read_format(call, fmt); */
@@ -608,7 +608,7 @@ int ooh323c_start_receive_channel(ooCallData *call, ooLogicalChannel *pChannel)
int ooh323c_start_transmit_channel(ooCallData *call, ooLogicalChannel *pChannel)
{
int fmt=-1;
format_t fmt;
fmt = convertH323CapToAsteriskCap(pChannel->chanCap->cap);
if(fmt>0) {
switch (fmt) {
@@ -665,7 +665,7 @@ int ooh323c_stop_transmit_datachannel(ooCallData *call, ooLogicalChannel *pChann
return 1;
}
int convertH323CapToAsteriskCap(int cap)
format_t convertH323CapToAsteriskCap(int cap)
{
switch(cap)

3
addons/ooh323cDriver.h
View File

@@ -22,6 +22,7 @@
#include "ooCalls.h"
#include "ooCapability.h"
#include "ooStackCmds.h"
#include <asterisk/frame_defs.h>
#define H323_DTMF_RFC2833 (1 << 0)
#define H323_DTMF_Q931 (1 << 1)
#define H323_DTMF_H245ALPHANUMERIC (1 << 2)
@@ -37,7 +38,7 @@ int ooh323c_start_call_thread(ooCallData *call);
int ooh323c_stop_call_thread(ooCallData *call);
int ooh323c_set_capability
(struct ast_codec_pref *prefs, int capability, int dtmf, int dtmfcodec);
int convertH323CapToAsteriskCap(int cap);
format_t convertH323CapToAsteriskCap(int cap);
int ooh323c_set_capability_for_call
(ooCallData *call, struct ast_codec_pref *prefs, int capability, int dtmf, int dtmfcodec,
int t38support);