cc_armcc.h   cc_armcc.h 
/* $Id: cc_armcc.h 2407 2009-01-01 20:56:36Z bennylp $ */ /* $Id: cc_armcc.h 3046 2010-01-06 08:34:41Z bennylp $ */
/* /*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 33 skipping to change at line 33
/** /**
* @file cc_armcc.h * @file cc_armcc.h
* @brief Describes ARMCC compiler specifics. * @brief Describes ARMCC compiler specifics.
*/ */
#ifndef __ARMCC__ #ifndef __ARMCC__
# error "This file is only for armcc!" # error "This file is only for armcc!"
#endif #endif
#define PJ_CC_NAME "armcc" #define PJ_CC_NAME "armcc"
#define PJ_CC_VER_1 __ARMCC__ #define PJ_CC_VER_1 (__ARMCC_VERSION/100000)
#define PJ_CC_VER_2 __ARMCC_MINOR__ #define PJ_CC_VER_2 ((__ARMCC_VERSION%100000)/10000)
#define PJ_CC_VER_3 __ARMCC_PATCHLEVEL__ #define PJ_CC_VER_3 (__ARMCC_VERSION%10000)
#ifdef __cplusplus #ifdef __cplusplus
# define PJ_INLINE_SPECIFIER inline # define PJ_INLINE_SPECIFIER inline
#else #else
# define PJ_INLINE_SPECIFIER static __inline # define PJ_INLINE_SPECIFIER static __inline
#endif #endif
#define PJ_THREAD_FUNC #define PJ_THREAD_FUNC
#define PJ_NORETURN #define PJ_NORETURN
#define PJ_ATTR_NORETURN __attribute__ ((noreturn)) #define PJ_ATTR_NORETURN __attribute__ ((noreturn))
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 ice_strans.h   ice_strans.h 
/* $Id: ice_strans.h 2966 2009-10-25 09:02:07Z bennylp $ */ /* $Id: ice_strans.h 3028 2009-12-08 13:11:25Z bennylp $ */
/* /*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 607 skipping to change at line 607
* @return PJ_SUCCESS if the strings have been retrieved * @return PJ_SUCCESS if the strings have been retrieved
* successfully. * successfully.
*/ */
PJ_DECL(pj_status_t) pj_ice_strans_get_ufrag_pwd(pj_ice_strans *ice_st, PJ_DECL(pj_status_t) pj_ice_strans_get_ufrag_pwd(pj_ice_strans *ice_st,
pj_str_t *loc_ufrag, pj_str_t *loc_ufrag,
pj_str_t *loc_pwd, pj_str_t *loc_pwd,
pj_str_t *rem_ufrag, pj_str_t *rem_ufrag,
pj_str_t *rem_pwd); pj_str_t *rem_pwd);
/** /**
* Get the number of local candidates for the specified component ID.
*
* @param ice_st The ICE stream transport.
* @param comp_id Component ID.
*
* @return The number of candidates.
*/
PJ_DECL(unsigned) pj_ice_strans_get_cands_count(pj_ice_strans *ice_st,
unsigned comp_id);
/**
* Enumerate the local candidates for the specified component. * Enumerate the local candidates for the specified component.
* *
* @param ice_st The ICE stream transport. * @param ice_st The ICE stream transport.
* @param comp_id Component ID. * @param comp_id Component ID.
* @param count On input, it specifies the maximum number of * @param count On input, it specifies the maximum number of
* elements. On output, it will be filled with * elements. On output, it will be filled with
* the number of candidates copied to the * the number of candidates copied to the
* array. * array.
* @param cand Array of candidates. * @param cand Array of candidates.
* *
 End of changes. 2 change blocks. 
1 lines changed or deleted 12 lines changed or added


 pa_asio.h   pa_asio.h 
#ifndef PA_ASIO_H #ifndef PA_ASIO_H
#define PA_ASIO_H #define PA_ASIO_H
/* /*
* $Id: pa_asio.h 1337 2008-02-15 07:32:09Z rossb $ * $Id: pa_asio.h 1400 2009-01-21 10:20:42Z rossb $
* PortAudio Portable Real-Time Audio Library * PortAudio Portable Real-Time Audio Library
* ASIO specific extensions * ASIO specific extensions
* *
* Copyright (c) 1999-2000 Ross Bencina and Phil Burk * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files * a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction, * (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge, * including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software, * publish, distribute, sublicense, and/or sell copies of the Software,
skipping to change at line 94 skipping to change at line 94
const char** channelName ); const char** channelName );
/** Retrieve a pointer to a string containing the name of the specified /** Retrieve a pointer to a string containing the name of the specified
input channel. The string is valid until Pa_Terminate is called. input channel. The string is valid until Pa_Terminate is called.
The string will be no longer than 32 characters including the null termina tor. The string will be no longer than 32 characters including the null termina tor.
*/ */
PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex , PaError PaAsio_GetOutputChannelName( PaDeviceIndex device, int channelIndex ,
const char** channelName ); const char** channelName );
/** Set the sample rate of an open paASIO stream.
@param stream The stream to operate on.
@param sampleRate The new sample rate.
Note that this function may fail if the stream is alredy running and the
ASIO driver does not support switching the sample rate of a running stream
.
Returns paIncompatibleStreamHostApi if stream is not a paASIO stream.
*/
PaError PaAsio_SetStreamSampleRate( PaStream* stream, double sampleRate );
#define paAsioUseChannelSelectors (0x01) #define paAsioUseChannelSelectors (0x01)
typedef struct PaAsioStreamInfo{ typedef struct PaAsioStreamInfo{
unsigned long size; /**< sizeof(PaAsioStreamInfo) */ unsigned long size; /**< sizeof(PaAsioStreamInfo) */
PaHostApiTypeId hostApiType; /**< paASIO */ PaHostApiTypeId hostApiType; /**< paASIO */
unsigned long version; /**< 1 */ unsigned long version; /**< 1 */
unsigned long flags; unsigned long flags;
/* Support for opening only specific channels of an ASIO device. /* Support for opening only specific channels of an ASIO device.
 End of changes. 2 change blocks. 
1 lines changed or deleted 14 lines changed or added


 pa_linux_alsa.h   pa_linux_alsa.h 
#ifndef PA_LINUX_ALSA_H #ifndef PA_LINUX_ALSA_H
#define PA_LINUX_ALSA_H #define PA_LINUX_ALSA_H
/* /*
* $Id: pa_linux_alsa.h 1337 2008-02-15 07:32:09Z rossb $ * $Id: pa_linux_alsa.h 1414 2009-05-24 17:02:10Z aknudsen $
* PortAudio Portable Real-Time Audio Library * PortAudio Portable Real-Time Audio Library
* ALSA-specific extensions * ALSA-specific extensions
* *
* Copyright (c) 1999-2000 Ross Bencina and Phil Burk * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files * a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction, * (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge, * including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software, * publish, distribute, sublicense, and/or sell copies of the Software,
skipping to change at line 90 skipping to change at line 90
PaError PaAlsa_GetStreamOutputCard( PaStream *s, int *card ); PaError PaAlsa_GetStreamOutputCard( PaStream *s, int *card );
/** Set the number of periods (buffer fragments) to configure devices with. /** Set the number of periods (buffer fragments) to configure devices with.
* *
* By default the number of periods is 4, this is the lowest number of peri ods that works well on * By default the number of periods is 4, this is the lowest number of peri ods that works well on
* the author's soundcard. * the author's soundcard.
* @param numPeriods The number of periods. * @param numPeriods The number of periods.
*/ */
PaError PaAlsa_SetNumPeriods( int numPeriods ); PaError PaAlsa_SetNumPeriods( int numPeriods );
/** Set the maximum number of times to retry opening busy device (sleeping
for a
* short interval inbetween).
*/
PaError PaAlsa_SetRetriesBusy( int retries );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 7 lines changed or added


 pa_win_waveformat.h   pa_win_waveformat.h 
skipping to change at line 160 skipping to change at line 160
} Samples; } Samples;
DWORD dwChannelMask; DWORD dwChannelMask;
GUID SubFormat; GUID SubFormat;
*/ */
#define PAWIN_INDEXOF_WVALIDBITSPERSAMPLE (PAWIN_SIZEOF_WAVEFORMATEX+0 ) #define PAWIN_INDEXOF_WVALIDBITSPERSAMPLE (PAWIN_SIZEOF_WAVEFORMATEX+0 )
#define PAWIN_INDEXOF_DWCHANNELMASK (PAWIN_SIZEOF_WAVEFO RMATEX+2) #define PAWIN_INDEXOF_DWCHANNELMASK (PAWIN_SIZEOF_WAVEFO RMATEX+2)
#define PAWIN_INDEXOF_SUBFORMAT (PAWIN_SIZEO F_WAVEFORMATEX+6) #define PAWIN_INDEXOF_SUBFORMAT (PAWIN_SIZEO F_WAVEFORMATEX+6)
/* /*
Valid values to pass for the waveFormatTag PaWin_InitializeWaveFormatEx
and
PaWin_InitializeWaveFormatExtensible functions below. These must match
the standard Windows WAVE_FORMAT_* values.
*/
#define PAWIN_WAVE_FORMAT_PCM (1)
#define PAWIN_WAVE_FORMAT_IEEE_FLOAT (3)
#define PAWIN_WAVE_FORMAT_DOLBY_AC3_SPDIF (0x0092)
#define PAWIN_WAVE_FORMAT_WMA_SPDIF (0x0164)
/*
returns PAWIN_WAVE_FORMAT_PCM or PAWIN_WAVE_FORMAT_IEEE_FLOAT
depending on the sampleFormat parameter.
*/
int PaWin_SampleFormatToLinearWaveFormatTag( PaSampleFormat sampleFormat );
/*
Use the following two functions to initialize the waveformat structu re. Use the following two functions to initialize the waveformat structu re.
*/ */
void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat, void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat,
int numChannels, PaSampleFormat sampleFormat, double sampleR ate ); int numChannels, PaSampleFormat sampleFormat, int waveFormat Tag, double sampleRate );
void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat, void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat,
int numChannels, PaSampleFormat sampleFormat, double sampleR ate, int numChannels, PaSampleFormat sampleFormat, int waveFormat Tag, double sampleRate,
PaWinWaveFormatChannelMask channelMask ); PaWinWaveFormatChannelMask channelMask );
/* Map a channel count to a speaker channel mask */ /* Map a channel count to a speaker channel mask */
PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels ); PaWinWaveFormatChannelMask PaWin_DefaultChannelMask( int numChannels );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* PA_WIN_WAVEFORMAT_H */ #endif /* PA_WIN_WAVEFORMAT_H */
 End of changes. 3 change blocks. 
2 lines changed or deleted 19 lines changed or added


 pa_win_wmme.h   pa_win_wmme.h 
#ifndef PA_WIN_WMME_H #ifndef PA_WIN_WMME_H
#define PA_WIN_WMME_H #define PA_WIN_WMME_H
/* /*
* $Id: pa_win_wmme.h 1337 2008-02-15 07:32:09Z rossb $ * $Id: pa_win_wmme.h 1405 2009-03-08 08:10:55Z rossb $
* PortAudio Portable Real-Time Audio Library * PortAudio Portable Real-Time Audio Library
* MME specific extensions * MME specific extensions
* *
* Copyright (c) 1999-2000 Ross Bencina and Phil Burk * Copyright (c) 1999-2000 Ross Bencina and Phil Burk
* *
* Permission is hereby granted, free of charge, to any person obtaining * Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files * a copy of this software and associated documentation files
* (the "Software"), to deal in the Software without restriction, * (the "Software"), to deal in the Software without restriction,
* including without limitation the rights to use, copy, modify, merge, * including without limitation the rights to use, copy, modify, merge,
* publish, distribute, sublicense, and/or sell copies of the Software, * publish, distribute, sublicense, and/or sell copies of the Software,
skipping to change at line 54 skipping to change at line 54
*/ */
#include "portaudio.h" #include "portaudio.h"
#include "pa_win_waveformat.h" #include "pa_win_waveformat.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
{ {
#endif /* __cplusplus */ #endif /* __cplusplus */
/* The following are flags which can be set in
PaWinMmeStreamInfo's flags field.
*/
#define paWinMmeUseLowLevelLatencyParameters (0x01) #define paWinMmeUseLowLevelLatencyParameters (0x01)
#define paWinMmeUseMultipleDevices (0x02) /* use mme specific multiple device feature */ #define paWinMmeUseMultipleDevices (0x02) /* use mme specific multiple device feature */
#define paWinMmeUseChannelMask (0x04) #define paWinMmeUseChannelMask (0x04)
/* By default, the mme implementation drops the processing thread's priorit y /* By default, the mme implementation drops the processing thread's priorit y
to THREAD_PRIORITY_NORMAL and sleeps the thread if the CPU load exceeds 100% to THREAD_PRIORITY_NORMAL and sleeps the thread if the CPU load exceeds 100%
This flag disables any priority throttling. The processing thread will always This flag disables any priority throttling. The processing thread will always
run at THREAD_PRIORITY_TIME_CRITICAL. run at THREAD_PRIORITY_TIME_CRITICAL.
*/ */
#define paWinMmeDontThrottleOverloadedProcessingThread (0x08) #define paWinMmeDontThrottleOverloadedProcessingThread (0x08)
/* Flags for non-PCM spdif passthrough.
*/
#define paWinMmeWaveFormatDolbyAc3Spdif (0x10)
#define paWinMmeWaveFormatWmaSpdif (0x20)
typedef struct PaWinMmeDeviceAndChannelCount{ typedef struct PaWinMmeDeviceAndChannelCount{
PaDeviceIndex device; PaDeviceIndex device;
int channelCount; int channelCount;
}PaWinMmeDeviceAndChannelCount; }PaWinMmeDeviceAndChannelCount;
typedef struct PaWinMmeStreamInfo{ typedef struct PaWinMmeStreamInfo{
unsigned long size; /**< sizeof(PaWinMmeStreamInfo) */ unsigned long size; /**< sizeof(PaWinMmeStreamInfo) */
PaHostApiTypeId hostApiType; /**< paMME */ PaHostApiTypeId hostApiType; /**< paMME */
unsigned long version; /**< 1 */ unsigned long version; /**< 1 */
 End of changes. 3 change blocks. 
1 lines changed or deleted 10 lines changed or added


 timer.h   timer.h 
/* $Id: timer.h 2512 2009-03-13 15:49:06Z bennylp $ */ /* $Id: timer.h 3034 2009-12-16 13:30:34Z bennylp $ */
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
skipping to change at line 66 skipping to change at line 66
* \section pj_timer_examples_sec Examples * \section pj_timer_examples_sec Examples
* *
* For some examples on how to use the timer heap, please see the link belo w. * For some examples on how to use the timer heap, please see the link belo w.
* *
* - \ref page_pjlib_timer_test * - \ref page_pjlib_timer_test
*/ */
/** /**
* The type for internal timer ID. * The type for internal timer ID.
*/ */
#if defined(PJ_SYMBIAN) && PJ_SYMBIAN!=0
typedef void *pj_timer_id_t;
#else
typedef int pj_timer_id_t; typedef int pj_timer_id_t;
#endif
/** /**
* Forward declaration for pj_timer_entry. * Forward declaration for pj_timer_entry.
*/ */
struct pj_timer_entry; struct pj_timer_entry;
/** /**
* The type of callback function to be called by timer scheduler when a tim er * The type of callback function to be called by timer scheduler when a tim er
* has expired. * has expired.
* *
 End of changes. 3 change blocks. 
5 lines changed or deleted 1 lines changed or added


 turn_session.h   turn_session.h 
/* $Id: turn_session.h 2642 2009-04-22 17:20:24Z bennylp $ */ /* $Id: turn_session.h 3028 2009-12-08 13:11:25Z bennylp $ */
/* /*
* Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 444 skipping to change at line 444
* or the appropriate error code on failure. * or the appropriate error code on failure.
*/ */
PJ_DECL(pj_status_t) pj_turn_session_shutdown(pj_turn_session *sess); PJ_DECL(pj_status_t) pj_turn_session_shutdown(pj_turn_session *sess);
/** /**
* Forcefully destroy the TURN session. This will destroy the session * Forcefully destroy the TURN session. This will destroy the session
* immediately. If there is an active allocation, the server will not * immediately. If there is an active allocation, the server will not
* be notified about the client destruction. * be notified about the client destruction.
* *
* @param sess The TURN client session. * @param sess The TURN client session.
* @param last_err Optional error code to be set to the session,
* which would be returned back in the \a info
* parameter of #pj_turn_session_get_info(). If
* this argument value is PJ_SUCCESS, the error
* code will not be set. If the session already
* has an error code set, this function will not
* overwrite that error code either.
* *
* @return PJ_SUCCESS if the operation has been successful, * @return PJ_SUCCESS if the operation has been successful,
* or the appropriate error code on failure. * or the appropriate error code on failure.
*/ */
PJ_DECL(pj_status_t) pj_turn_session_destroy(pj_turn_session *sess); PJ_DECL(pj_status_t) pj_turn_session_destroy(pj_turn_session *sess,
pj_status_t last_err);
/** /**
* Get the information about this TURN session and the allocation, if * Get the information about this TURN session and the allocation, if
* any. * any.
* *
* @param sess The TURN client session. * @param sess The TURN client session.
* @param info The structure to be initialized with the TURN * @param info The structure to be initialized with the TURN
* session info. * session info.
* *
* @return PJ_SUCCESS if the operation has been successful, * @return PJ_SUCCESS if the operation has been successful,
 End of changes. 3 change blocks. 
2 lines changed or deleted 10 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/