ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update v2.x

This commit is contained in:
bossiel 2011-04-20 07:58:10 +00:00
parent 8e0de0ad5c
commit bd7cf8cd92
10 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
branches/2.0/doubango/bindings/_common/AudioResampler.h
View File

@ -29,6 +29,7 @@
#define TINYWRAP_AUDIO_RESAMPLER_H
#include "tinyWRAP_config.h"
#include "tsk_common.h"
class AudioResampler
{
@ -37,7 +38,7 @@ public:
~AudioResampler();
public:
inline bool isValid(){ return (m_pWrappedResampler != NULL); }
inline bool isValid(){ return (m_pWrappedResampler != tsk_null); }
inline uint32_t getOutputRequiredSizeInShort(){ return (m_nOutFreq * m_nFrameDuration)/1000; }
inline uint32_t getInputRequiredSizeInShort(){ return (m_nInFreq * m_nFrameDuration)/1000; }
uint32_t process(const void* pInData, uint32_t nInSizeInBytes, void* pOutData, uint32_t nOutSizeInBytes);

2
branches/2.0/doubango/bindings/_common/SMSEncoder.cxx
View File

@ -356,7 +356,7 @@ SMSData* SMSEncoder::decode(const void* data, unsigned size, bool MobOrig)
}
case tsms_rpdu_type_smma_mo:
{
tsms_rpdu_smma_t* rp_smma = TSMS_RPDU_SMMA(rp_message);
// tsms_rpdu_smma_t* rp_smma = TSMS_RPDU_SMMA(rp_message);
// ...do whatever you want
decodedData = new SMSData(twrap_sms_type_smma, rp_message->mr, tsk_null, 0);
break;

1
branches/2.0/doubango/bindings/_common/Xcap.cxx
View File

@ -541,7 +541,6 @@ bool XcapStack::stop()
int stack_callback(const thttp_event_t *httpevent)
{
int ret = 0;
const XcapStack* stack = tsk_null;
XcapEvent* e = tsk_null;

2
branches/2.0/doubango/tinyDAV/src/audio/tdav_consumer_audio.c
View File

@ -49,8 +49,6 @@
#define TDAV_RATE_DEFAULT 8000
#define TDAV_PTIME_DEFAULT 20
int static size_of_short = sizeof(short);
/** Initialize audio consumer */
int tdav_consumer_audio_init(tdav_consumer_audio_t* self)
{

2
branches/2.0/doubango/tinyDAV/src/audio/tdav_speakup_jitterbuffer.c
View File

@ -33,6 +33,8 @@
#include "tsk_memory.h"
#include "tsk_debug.h"
#include <string.h>
#if TSK_UNDER_WINDOWS
# include <Winsock2.h> // timeval
#elif defined(__SYMBIAN32__)

2
branches/2.0/doubango/tinyMEDIA/src/content/tmedia_content.c
View File

@ -51,7 +51,7 @@ tmedia_content_plugin_entry_t __tmedia_content_plugin_entries[TMEDIA_CONTENT_MAX
int tmedia_content_plugin_register(const char* type, const tmedia_content_plugin_def_t* plugin)
{
tsk_size_t i;
int a = sizeof(__tmedia_content_plugin_entries);
//-- int a = sizeof(__tmedia_content_plugin_entries);
if(!plugin || !plugin){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;

5
branches/2.0/doubango/tinyRTP/include/tinyrtp/rtcp/trtp_rtcp_header.h
View File

@ -23,6 +23,7 @@
#define TINYRTP_RTCP_HEADER_H
#include "tinyrtp_config.h"
#include "tinyrtp/rtcp/trtp_rtcp_packet.h"
#include "tsk_buffer.h"
#include "tsk_list.h"
@ -39,7 +40,7 @@ typedef struct trtp_rtcp_header_s
unsigned version:2;
unsigned padding:1;
unsigned rc:5;
enum trtp_rtcp_packet_type_e type; /**< Packet Type on 8bits */
trtp_rtcp_packet_type_t type; /**< Packet Type on 8bits */
uint16_t length;
}
trtp_rtcp_header_t;
@ -48,7 +49,7 @@ trtp_rtcp_header_t;
typedef tsk_list_t trtp_rtcp_headers_L_t; /**< List of @ref trtp_rtcp_header_t elements */
TINYRTP_API trtp_rtcp_header_t* trtp_rtcp_header_create_null();
TINYRTP_API trtp_rtcp_header_t* trtp_rtcp_header_create(uint8_t version, uint8_t padding, uint8_t rc, enum trtp_rtcp_packet_type_e type, uint16_t length);
TINYRTP_API trtp_rtcp_header_t* trtp_rtcp_header_create(uint8_t version, uint8_t padding, uint8_t rc, trtp_rtcp_packet_type_t type, uint16_t length);
TINYRTP_API tsk_buffer_t* trtp_rtcp_header_serialize(const trtp_rtcp_header_t *self);
TINYRTP_API int trtp_rtcp_header_serialize_2(const trtp_rtcp_header_t *self, uint8_t output[TRTP_RTCP_HEADER_SIZE]);
TINYRTP_API trtp_rtcp_header_t* trtp_rtcp_header_deserialize(const void *data, tsk_size_t size);

4
branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_header.c
View File

@ -38,7 +38,7 @@ trtp_rtcp_header_t* trtp_rtcp_header_create_null()
return tsk_object_new(trtp_rtcp_header_def_t);
}
trtp_rtcp_header_t* trtp_rtcp_header_create(uint8_t version, uint8_t padding, uint8_t rc, enum trtp_rtcp_packet_type_e type, uint16_t length)
trtp_rtcp_header_t* trtp_rtcp_header_create(uint8_t version, uint8_t padding, uint8_t rc, trtp_rtcp_packet_type_t type, uint16_t length)
{
trtp_rtcp_header_t* header;
if((header = trtp_rtcp_header_create_null())){
@ -72,7 +72,7 @@ tsk_buffer_t* trtp_rtcp_header_serialize(const trtp_rtcp_header_t *self)
TSK_FREE(bytes);
return tsk_null;
}
tsk_buffer_takeownership(buffer, &bytes, TRTP_RTCP_HEADER_SIZE);
tsk_buffer_takeownership(buffer, (void**)&bytes, TRTP_RTCP_HEADER_SIZE);
}
else{
TSK_DEBUG_ERROR("Failed to allocate new buffer");

2
branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_report_sdes.c
View File

@ -51,7 +51,7 @@ trtp_rtcp_report_sdes_t* trtp_rtcp_report_sdes_create_null()
trtp_rtcp_report_sdes_t* trtp_rtcp_report_sdes_deserialize(const void* data, tsk_size_t size)
{
trtp_rtcp_report_sdes_t* packet = tsk_null;
const uint8_t* pdata = (const uint8_t*)data;
//-- const uint8_t* pdata = (const uint8_t*)data;
if(!data || !size){
TSK_DEBUG_ERROR("Invalid parameter");
return tsk_null;

1
branches/2.0/doubango/tinyRTP/src/rtcp/trtp_rtcp_sdes_item.c
View File

@ -20,6 +20,7 @@
*
*/
#include "tinyrtp/rtcp/trtp_rtcp_sdes_item.h"
#include "tinyrtp/rtcp/trtp_rtcp_packet.h"
#include "tnet_endianness.h"