Add Opus building instructions

Issue #234
64characters · Aug 26, 2016 · bc5d6f4 · bc5d6f4
1 parent 24ba90b
commit bc5d6f4
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,6 @@
 build/
 .idea/
 
+ThirdParty/Opus
 ThirdParty/LibreSSL
 ThirdParty/PJSIP
diff --git a/README.md b/README.md
@@ -6,6 +6,22 @@ internet connection.
 
 ## Building
 
+### Opus
+
+Opus codec is optional.
+
+Download:
+
+    $ ftp http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz
+    $ tar xzvf opus-1.1.3.tar.gz
+    $ cd opus-1.1.3
+
+Build and install:
+
+    $ ./configure --prefix=/path/to/Telephone/ThirdParty/Opus --disable-shared CFLAGS='-O2 -mmacosx-version-min=10.10'
+    $ make
+    $ make install
+
 ### PJSIP
 
 Download:
@@ -24,9 +40,9 @@ Create `pjlib/include/pj/config_site.h`:
     #define PJ_DNS_SRV_MAX_ADDR 32
     #define PJSIP_MAX_RESOLVED_ADDRESSES 32
 
-Build and install:
+Build and install (remove `--with-opus` option if you don’t need Opus):
 
-    $ ./configure --prefix=/path/to/Telephone/ThirdParty/PJSIP --host=x86_64-apple-darwin CFLAGS='-mmacosx-version-min=10.10'
+    $ ./configure --prefix=/path/to/Telephone/ThirdParty/PJSIP --with-opus=/path/to/Telephone/ThirdParty/Opus --host=x86_64-apple-darwin CFLAGS='-mmacosx-version-min=10.10'
     $ make lib
     $ make install
 

diff --git a/Telephone.xcodeproj/project.pbxproj b/Telephone.xcodeproj/project.pbxproj
@@ -3625,7 +3625,10 @@
 				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/ThirdParty/PJSIP/include\"";
 				INFOPLIST_FILE = Telephone/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/ThirdParty/PJSIP/lib\"";
+				LIBRARY_SEARCH_PATHS = (
+					"\"$(SRCROOT)/ThirdParty/PJSIP/lib\"",
+					"\"$(SRCROOT)/ThirdParty/Opus/lib\"",
+				);
 				OTHER_LDFLAGS = (
 					"-lpjsua-x86_64-apple-darwin",
 					"-lpjsip-ua-x86_64-apple-darwin",
@@ -3642,6 +3645,7 @@
 					"-lspeex-x86_64-apple-darwin",
 					"-lilbccodec-x86_64-apple-darwin",
 					"-lpj-x86_64-apple-darwin",
+					"-lopus",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.tlphn.Telephone;
 				PRODUCT_NAME = Telephone;
@@ -3659,7 +3663,10 @@
 				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/ThirdParty/PJSIP/include\"";
 				INFOPLIST_FILE = Telephone/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/ThirdParty/PJSIP/lib\"";
+				LIBRARY_SEARCH_PATHS = (
+					"\"$(SRCROOT)/ThirdParty/PJSIP/lib\"",
+					"\"$(SRCROOT)/ThirdParty/Opus/lib\"",
+				);
 				OTHER_LDFLAGS = (
 					"-lpjsua-x86_64-apple-darwin",
 					"-lpjsip-ua-x86_64-apple-darwin",
@@ -3676,6 +3683,7 @@
 					"-lspeex-x86_64-apple-darwin",
 					"-lilbccodec-x86_64-apple-darwin",
 					"-lpj-x86_64-apple-darwin",
+					"-lopus",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.tlphn.Telephone;
 				PRODUCT_NAME = Telephone;

diff --git a/Telephone/AKSIPUserAgent.m b/Telephone/AKSIPUserAgent.m
@@ -745,11 +745,12 @@ - (NSUInteger)priorityForCodec:(NSString *)identifier {
                        @"speex/16000/1": @(130),
                        @"speex/8000/1":  @(129),
                        @"speex/32000/1": @(128),
-                       @"iLBC/8000/1":   @(127),
-                       @"GSM/8000/1":    @(126),
-                       @"PCMU/8000/1":   @(125),
-                       @"PCMA/8000/1":   @(124),
-                       @"G722/16000/1":  @(123)
+                       @"opus/48000/2":  @(127),
+                       @"iLBC/8000/1":   @(126),
+                       @"GSM/8000/1":    @(125),
+                       @"PCMU/8000/1":   @(124),
+                       @"PCMA/8000/1":   @(123),
+                       @"G722/16000/1":  @(122)
                        };
     });