Commit d5bd5ea2 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Merge remote-tracking branch 'origin/master' into dev_continuous_bw_measurement

parents 348022c8 baf804e4
......@@ -32,3 +32,4 @@ stamp-h1
*.vcxproj.*
compile
git-clang-format.diff
*.DS_Store
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>ortp</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundleIdentifier</key>
<string>${MACOSX_FRAMEWORK_IDENTIFIER}</string>
<key>LSMinimumSystemVersion</key>
<string>${MIN_OS}</string>
<key>MinimumOSVersion</key>
<string>${MIN_OS}</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>${ORTP_VERSION}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>${ORTP_VERSION}</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSHighResolutionCapable</key>
<string>True</string>
</dict>
</plist>
\ No newline at end of file
......@@ -99,9 +99,16 @@ endif()
if(ENABLE_SHARED)
add_library(ortp SHARED ${ORTP_HEADER_FILES} ${ORTP_SOURCE_FILES_C} ${ORTP_SOURCE_FILES_CXX})
if(IOS)
if(IOS)
set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET})
else()
set(MIN_OS ${CMAKE_OSX_DEPLOYMENT_TARGET})
endif()
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/osx/")
set_target_properties(ortp PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER com.belledonne-communications.ortp
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.ortp
MACOSX_FRAMEWORK_INFO_PLIST Info.plist.in
PUBLIC_HEADER "${ORTP_HEADER_FILES}"
)
endif()
......
......@@ -11,11 +11,11 @@
* Copyright (c) 2004-2008, Matthew Wilson and Synesis Software
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* - Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
......@@ -59,6 +59,8 @@
#include "ortp/port.h"
#include "ortp/b64.h"
#include <bctoolbox/defs.h>
#include <assert.h>
#include <string.h>
/* /////////////////////////////////////////////////////////////////////////////
......@@ -93,15 +95,15 @@
static const char b64_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static const signed char b64_indexes[] =
static const signed char b64_indexes[] =
{
/* 0 - 31 / 0x00 - 0x1f */
-1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
-1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
/* 32 - 63 / 0x20 - 0x3f */
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, 62, -1, -1, -1, 63 /* ... , '+', ... '/' */
, 52, 53, 54, 55, 56, 57, 58, 59 /* '0' - '7' */
, 60, 61, -1, -1, -1, -1, -1, -1 /* '8', '9', ... */
......@@ -116,25 +118,25 @@ static const signed char b64_indexes[] =
, 41, 42, 43, 44, 45, 46, 47, 48 /* 'p' - 'w' */
, 49, 50, 51, -1, -1, -1, -1, -1 /* 'x', 'y', 'z', ... */
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
, -1, -1, -1, -1, -1, -1, -1, -1
};
/* /////////////////////////////////////////////////////////////////////////////
......@@ -183,17 +185,17 @@ static size_t b64_encode_( unsigned char const *src
{
unsigned char characters[NUM_ENCODED_DATA_BYTES];
/*
*
/*
*
* | 0 | 1 | 2 |
*
* | | | |
* | | | | | | |
* | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | |
*
*
* | 0 | 1 | 2 | 3 |
*
*
*/
/* characters[0] is the 6 left-most bits of src[0] */
......@@ -274,7 +276,7 @@ static size_t b64_encode_( unsigned char const *src
}
}
/** This function reads in a character string in 4-character chunks, and writes
/** This function reads in a character string in 4-character chunks, and writes
* out the converted form in 3-byte chunks to the destination.
*/
static size_t b64_decode_( char const *src
......@@ -313,7 +315,7 @@ static size_t b64_decode_( char const *src
/* Now we iterate through the src, collecting together four characters
* at a time from the Base-64 alphabet, until the end-point is reached.
*
*
*
*/
char const *begin = src;
......@@ -343,9 +345,9 @@ static size_t b64_decode_( char const *src
{
switch(ch)
{
case ' ':
case '\t':
case '\b':
case ' ':BCTBX_NO_BREAK; /*intentionally no break*/
case '\t':BCTBX_NO_BREAK; /*intentionally no break*/
case '\b':BCTBX_NO_BREAK; /*intentionally no break*/
case '\v':
if(B64_F_STOP_ON_UNEXPECTED_WS & flags)
{
......@@ -355,9 +357,9 @@ static size_t b64_decode_( char const *src
}
else
{
/* Fall through */
BCTBX_NO_BREAK; /* Fall through */
}
case '\r':
case '\r':BCTBX_NO_BREAK; /*intentionally no break*/
case '\n':
continue;
default:
......@@ -454,7 +456,7 @@ size_t b64_encode2( void const *src
{
break;
}
/* Fall through to 64 */
BCTBX_NO_BREAK; /* Fall through to 64 */
case B64_F_LINE_LEN_64:
lineLen = 64;
break;
......@@ -581,7 +583,7 @@ static char const *b64_LookupErrorStringA_(int error, size_t *len)
SEVERITY_STR_DECL(B64_RC_TRUNCATED_INPUT , "The input did not represent a fully formed stream of octet couplings" );
SEVERITY_STR_DECL(B64_RC_DATA_ERROR , "Invalid data" );
static const b64ErrorString_t_ *s_strings[] =
static const b64ErrorString_t_ *s_strings[] =
{
SEVERITY_STR_ENTRY(B64_RC_OK),
SEVERITY_STR_ENTRY(B64_RC_INSUFFICIENT_BUFFER),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment