mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-16 06:48:25 +00:00
More 32->64 bit codec conversions.
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:
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user