-
Notifications
You must be signed in to change notification settings - Fork 7
/
pjproject-2.5.diff
executable file
·75 lines (57 loc) · 2.62 KB
/
pjproject-2.5.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
A --> Before patch
B --> After patch
****************************************************************************
diff A/pjproject-2.5/build.mak.in B/pjproject-2.5/build.mak.in
--- A/pjproject-2.5/build.mak.in
+++ B/pjproject-2.5/build.mak.in
APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFIX)
endif
endif
+
+APP_THIRD_PARTY_LIBS += -lg729codec-$(TARGET_NAME)
+APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg729codec-$(LIB_SUFFIX)
+
ifneq (@ac_no_gsm_codec@,1)
ifeq (@ac_external_gsm@,1)
# External GSM library
****************************************************************************
diff A/pjproject-2.5/pjmedia/build/Makefile B/pjproject-2.5/pjmedia/build/Makefile
--- A/pjproject-2.5/pjmedia/build/Makefile
+++ B/pjproject-2.5/pjmedia/build/Makefile
h263_packetizer.o h264_packetizer.o \
$(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
ipp_codecs.o $(CODEC_OBJS) \
- g7221_sdp_match.o amr_sdp_match.o
+ g7221_sdp_match.o amr_sdp_match.o g729.o
export PJMEDIA_CODEC_CFLAGS += $(_CFLAGS) $(GSM_CFLAGS) $(SPEEX_CFLAGS) \
$(ILBC_CFLAGS) $(IPP_CFLAGS) $(G7221_CFLAGS)
****************************************************************************
diff A/pjproject-2.5/pjmedia/include/pjmedia-codec.h B/pjproject-2.5/pjmedia/include/pjmedia-codec.h
--- A/pjproject-2.5/pjmedia/include/pjmedia-codec.h
+++ B/pjproject-2.5/pjmedia/include/pjmedia-codec.h
#include <pjmedia-codec/l16.h>
#include <pjmedia-codec/ffmpeg_vid_codecs.h>
+#include <pjmedia-codec/g729.h>
#include <pjmedia-codec/gsm.h>
#include <pjmedia-codec/speex.h>
#include <pjmedia-codec/ilbc.h>
****************************************************************************
diff A/pjproject-2.5/pjmedia/src/pjmedia-codec/audio_codecs.c B/pjproject-2.5/pjmedia/src/pjmedia-codec/audio_codecs.c
--- A/pjproject-2.5/pjmedia/src/pjmedia-codec/audio_codecs.c
+++ B/pjproject-2.5/pjmedia/src/pjmedia-codec/audio_codecs.c
#endif /* PJMEDIA_HAS_ILBC_CODEC */
+ status = pjmedia_codec_g729_init(endpt);
+ if (status != PJ_SUCCESS)
+ return status;
+
#if PJMEDIA_HAS_GSM_CODEC
/* Register GSM */
status = pjmedia_codec_gsm_init(endpt);
****************************************************************************
diff A/pjproject-2.5/third_party/build/Makefile B/pjproject-2.5/third_party/build/Makefile
--- A/pjproject-2.5/third_party/build/Makefile
+++ B/pjproject-2.5/third_party/build/Makefile
-DIRS =
+DIRS = bcg729
include ../../build.mak
include $(PJDIR)/build/common.mak