Commit a4e50eed authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' of git://git.linphone.org/ortp

parents e1b6f4a8 38693cb5
......@@ -55,7 +55,7 @@ LOCAL_SRC_FILES := \
LOCAL_CFLAGS += \
-DORTP_INET6 \
-UHAVE_CONFIG_H \
-include $(LOCAL_PATH)/build/android/ortp_AndroidConfig.h
-include ortp_AndroidConfig.h
ifeq ($(BUILD_GPLV3_ZRTP), 1)
......@@ -80,7 +80,8 @@ endif #SRTP
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
$(LOCAL_PATH)/include
$(LOCAL_PATH)/include \
$(LOCAL_PATH)/build/android
LOCAL_LDLIBS += -lpthread
......
......@@ -47,6 +47,7 @@ extern "C"{
#define PAYLOAD_AUDIO_CONTINUOUS 0
#define PAYLOAD_AUDIO_PACKETIZED 1
#define PAYLOAD_VIDEO 2
#define PAYLOAD_TEXT 4
#define PAYLOAD_OTHER 3 /* ?? */
struct _PayloadType
......@@ -205,9 +206,12 @@ VAR_DECLSPEC PayloadType payload_type_x_snow;
VAR_DECLSPEC PayloadType payload_type_jpeg;
VAR_DECLSPEC PayloadType payload_type_vp8;
VAR_DECLSPEC PayloadType payload_type_t140;
VAR_DECLSPEC PayloadType payload_type_g722;
/* text */
VAR_DECLSPEC PayloadType payload_type_t140;
VAR_DECLSPEC PayloadType payload_type_t140_red;
/* non standard file transfer over UDP */
VAR_DECLSPEC PayloadType payload_type_x_udpftp;
......
......@@ -546,15 +546,25 @@ PayloadType payload_type_vp8={
};
PayloadType payload_type_t140={
PAYLOAD_AUDIO_PACKETIZED, /*type */
1000,
0,
NULL,
0,
0,
"t140",
0,
0
TYPE( PAYLOAD_TEXT),
CLOCK_RATE(1000),
BITS_PER_SAMPLE(0),
ZERO_PATTERN(NULL),
PATTERN_LENGTH(0),
NORMAL_BITRATE(0),
MIME_TYPE ("t140"),
CHANNELS(0)
};
PayloadType payload_type_t140_red={
TYPE(PAYLOAD_TEXT),
CLOCK_RATE(1000),
BITS_PER_SAMPLE(0),
ZERO_PATTERN(NULL),
PATTERN_LENGTH(0),
NORMAL_BITRATE(0),
MIME_TYPE("red"),
CHANNELS(0)
};
PayloadType payload_type_x_udpftp={
......
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