Skip to content

Commit 6635239

Browse files
kingsterkingster
authored
Add support for g729 on MacOS (#74)
Codecs now supported on Mac OS - OPUS - PCMA/PCMU/G711 - G729 - G722 - speex - iLBC
1 parent 2509b10 commit 6635239

3 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎tinyphone-osx/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ target 'Tinyphone' do
55
pod 'YbridOpus'
66
# pod 'libopus-static'
77
# pod 'pjsip', '~> 2.9.0.2'
8-
pod 'pjsip', :git => 'https://github.com/voiceip/cocoapod-pjsip' , :branch => 'no-libopus'
8+
pod 'pjsip', :git => 'https://github.com/voiceip/cocoapod-pjsip' , :branch => 'g729' #:path => '/Volumes/Workspace/code/voice/cocoapod-pjsip'
99
end
1010

‎tinyphone-osx/Podfile.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- pjsip (2.9.0.2)
2+
- pjsip (2.9.0.3)
33
- YbridOpus (0.8.0)
44

55
DEPENDENCIES:
6-
- pjsip (from `https://github.com/voiceip/cocoapod-pjsip`, branch `no-libopus`)
6+
- pjsip (from `https://github.com/voiceip/cocoapod-pjsip`, branch `g729`)
77
- YbridOpus
88

99
SPEC REPOS:
@@ -12,18 +12,18 @@ SPEC REPOS:
1212

1313
EXTERNAL SOURCES:
1414
pjsip:
15-
:branch: no-libopus
15+
:branch: g729
1616
:git: https://github.com/voiceip/cocoapod-pjsip
1717

1818
CHECKOUT OPTIONS:
1919
pjsip:
20-
:commit: 80a177661d3ec4bfe3aa6be2d2767c62871c4965
20+
:commit: 7eddcc25826333170bc69a3b2fc4a725c7209cec
2121
:git: https://github.com/voiceip/cocoapod-pjsip
2222

2323
SPEC CHECKSUMS:
24-
pjsip: d74b5ea51bd4181581049de2833a61b060dd5063
24+
pjsip: 00619cf90b5562f38a5e5ebc3e78aa7a0fb3416e
2525
YbridOpus: e9af373b9b38acff3702d9a3bd97cae3c232887c
2626

27-
PODFILE CHECKSUM: 33875e5fc3d98200609b13b063ae004b7b7b6c59
27+
PODFILE CHECKSUM: ec3de4fc2591ea7eda6382b5c1b373579bc62204
2828

2929
COCOAPODS: 1.11.3

‎tinyphone-osx/Tinyphone.xcodeproj/project.pbxproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
6B07F5E2BD9B3AE651158F53 /* Pods_Tinyphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */; };
1110
B3025C2025530D7E00C331CA /* Tinyphone-OC.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */; };
1211
B327CAF32551784A0092FDB7 /* call.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAD2255178480092FDB7 /* call.cpp */; };
1312
B327CAF52551784A0092FDB7 /* microtar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B327CAD8255178480092FDB7 /* microtar.cpp */; };
@@ -32,7 +31,7 @@
3231
B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645927E30DB000B011C9 /* libopencore-amrnb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3332
B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B36B645A27E30DB000B011C9 /* libopencore-amrwb.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3433
B3B92C3E2568152A0095EF2C /* mod_notify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3B92C3D2568152A0095EF2C /* mod_notify.cpp */; };
35-
B3C9365527E34ED300CE2CDB /* Pods_Tinyphone.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
34+
B3C9365527E34ED300CE2CDB /* BuildFile in Embed Frameworks */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3635
B3D53FC92551696600523D5F /* AccountsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3D53FC82551696600523D5F /* AccountsView.xib */; };
3736
B3D53FCC255169CF00523D5F /* AccountsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCB255169CF00523D5F /* AccountsView.swift */; };
3837
B3D53FCE25516A4200523D5F /* LoadableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D53FCD25516A4200523D5F /* LoadableView.swift */; };
@@ -41,6 +40,7 @@
4140
B3DDA56125515DF900D269C9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B3DDA56025515DF900D269C9 /* Assets.xcassets */; };
4241
B3DDA56425515DF900D269C9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B3DDA56225515DF900D269C9 /* Main.storyboard */; };
4342
B3F31832256EC23E00A3B272 /* baseapp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3F31831256EC23D00A3B272 /* baseapp.cpp */; };
43+
C145C4C50401915FBEE05B6D /* Pods_Tinyphone.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C5DA457C98267B6EC1DF7E93 /* Pods_Tinyphone.framework */; };
4444
/* End PBXBuildFile section */
4545

4646
/* Begin PBXCopyFilesBuildPhase section */
@@ -50,7 +50,7 @@
5050
dstPath = "";
5151
dstSubfolderSpec = 10;
5252
files = (
53-
B3C9365527E34ED300CE2CDB /* Pods_Tinyphone.framework in Embed Frameworks */,
53+
B3C9365527E34ED300CE2CDB /* BuildFile in Embed Frameworks */,
5454
B3AD62CB27E327C600F6A499 /* libopencore-amrnb.0.dylib in Embed Frameworks */,
5555
B3AD62CC27E327C600F6A499 /* libopencore-amrwb.0.dylib in Embed Frameworks */,
5656
B392C7B9255412560068492F /* libcryptopp.dylib in Embed Frameworks */,
@@ -61,9 +61,8 @@
6161
/* End PBXCopyFilesBuildPhase section */
6262

6363
/* Begin PBXFileReference section */
64-
4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.release.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.release.xcconfig"; sourceTree = "<group>"; };
65-
59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tinyphone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
66-
99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.debug.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.debug.xcconfig"; sourceTree = "<group>"; };
64+
16D8BC54D525754431110FF1 /* Pods-Tinyphone.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.release.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.release.xcconfig"; sourceTree = "<group>"; };
65+
3D7A979CDB9519776336DB6B /* Pods-Tinyphone.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tinyphone.debug.xcconfig"; path = "Target Support Files/Pods-Tinyphone/Pods-Tinyphone.debug.xcconfig"; sourceTree = "<group>"; };
6766
B3025C1E25530D7E00C331CA /* Tinyphone-OC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Tinyphone-OC.mm"; sourceTree = "<group>"; };
6867
B3025C1F25530D7E00C331CA /* Tinyphone-OC.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = "Tinyphone-OC.hpp"; sourceTree = "<group>"; };
6968
B327CAD0255178470092FDB7 /* Tinyphone-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tinyphone-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -124,6 +123,7 @@
124123
B3F3182F256EC23100A3B272 /* osxapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = osxapp.h; sourceTree = "<group>"; };
125124
B3F31831256EC23D00A3B272 /* baseapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = baseapp.cpp; path = ../../tinyphone/baseapp.cpp; sourceTree = "<group>"; };
126125
B3F31833256EC2E100A3B272 /* app.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = app.hpp; path = ../../tinyphone/app.hpp; sourceTree = "<group>"; };
126+
C5DA457C98267B6EC1DF7E93 /* Pods_Tinyphone.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tinyphone.framework; sourceTree = BUILT_PRODUCTS_DIR; };
127127
/* End PBXFileReference section */
128128

129129
/* Begin PBXFrameworksBuildPhase section */
@@ -140,7 +140,7 @@
140140
B3AD62C827E3174300F6A499 /* boost.xcframework in Frameworks */,
141141
B327CB502551A2940092FDB7 /* CoreAudio.framework in Frameworks */,
142142
B327CB032551973A0092FDB7 /* libstatsd_static.a in Frameworks */,
143-
6B07F5E2BD9B3AE651158F53 /* Pods_Tinyphone.framework in Frameworks */,
143+
C145C4C50401915FBEE05B6D /* Pods_Tinyphone.framework in Frameworks */,
144144
);
145145
runOnlyForDeploymentPostprocessing = 0;
146146
};
@@ -150,8 +150,8 @@
150150
9EDB4E7B95299CB02F683BF7 /* Pods */ = {
151151
isa = PBXGroup;
152152
children = (
153-
99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */,
154-
4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */,
153+
3D7A979CDB9519776336DB6B /* Pods-Tinyphone.debug.xcconfig */,
154+
16D8BC54D525754431110FF1 /* Pods-Tinyphone.release.xcconfig */,
155155
);
156156
path = Pods;
157157
sourceTree = "<group>";
@@ -212,7 +212,7 @@
212212
B327CB4C2551A2940092FDB7 /* CoreAudioKit.framework */,
213213
B327CB4B2551A2940092FDB7 /* CoreAudioTypes.framework */,
214214
B327CB01255195BD0092FDB7 /* libstatsd_static.a */,
215-
59720BC22BD39E9D5F820B31 /* Pods_Tinyphone.framework */,
215+
C5DA457C98267B6EC1DF7E93 /* Pods_Tinyphone.framework */,
216216
);
217217
name = Frameworks;
218218
sourceTree = "<group>";
@@ -271,13 +271,13 @@
271271
isa = PBXNativeTarget;
272272
buildConfigurationList = B3DDA56925515DF900D269C9 /* Build configuration list for PBXNativeTarget "Tinyphone" */;
273273
buildPhases = (
274-
023F5C8B0DBB33BA59EBED3F /* [CP] Check Pods Manifest.lock */,
274+
29A7D52E371764FBB29D1F23 /* [CP] Check Pods Manifest.lock */,
275275
B3DDA55525515DF700D269C9 /* Sources */,
276276
B3DDA55625515DF700D269C9 /* Frameworks */,
277277
B3DDA55725515DF700D269C9 /* Resources */,
278278
B327CB0825519E550092FDB7 /* Embed Frameworks */,
279279
B392C7A52554035D0068492F /* Run Script */,
280-
627FED5B7A017D9C4A84B04C /* [CP] Embed Pods Frameworks */,
280+
896443F6A4B218BA6302E72F /* [CP] Embed Pods Frameworks */,
281281
);
282282
buildRules = (
283283
);
@@ -337,7 +337,7 @@
337337
/* End PBXResourcesBuildPhase section */
338338

339339
/* Begin PBXShellScriptBuildPhase section */
340-
023F5C8B0DBB33BA59EBED3F /* [CP] Check Pods Manifest.lock */ = {
340+
29A7D52E371764FBB29D1F23 /* [CP] Check Pods Manifest.lock */ = {
341341
isa = PBXShellScriptBuildPhase;
342342
buildActionMask = 2147483647;
343343
files = (
@@ -359,7 +359,7 @@
359359
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
360360
showEnvVarsInLog = 0;
361361
};
362-
627FED5B7A017D9C4A84B04C /* [CP] Embed Pods Frameworks */ = {
362+
896443F6A4B218BA6302E72F /* [CP] Embed Pods Frameworks */ = {
363363
isa = PBXShellScriptBuildPhase;
364364
buildActionMask = 2147483647;
365365
files = (
@@ -600,7 +600,7 @@
600600
};
601601
B3DDA56A25515DF900D269C9 /* Debug */ = {
602602
isa = XCBuildConfiguration;
603-
baseConfigurationReference = 99885DBDCF2EAFE3FAA8AF7C /* Pods-Tinyphone.debug.xcconfig */;
603+
baseConfigurationReference = 3D7A979CDB9519776336DB6B /* Pods-Tinyphone.debug.xcconfig */;
604604
buildSettings = {
605605
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
606606
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
@@ -628,7 +628,7 @@
628628
/usr/local/lib,
629629
);
630630
MACOSX_DEPLOYMENT_TARGET = 10.15;
631-
MARKETING_VERSION = 36.0.0.83;
631+
MARKETING_VERSION = "36.0.0.84";
632632
OTHER_CPLUSPLUSFLAGS = (
633633
"$(OTHER_CFLAGS)",
634634
"-DBOOST_SYSTEM_DYN_LINK",
@@ -651,7 +651,7 @@
651651
};
652652
B3DDA56B25515DF900D269C9 /* Release */ = {
653653
isa = XCBuildConfiguration;
654-
baseConfigurationReference = 4E450987E9E5A20FE837795B /* Pods-Tinyphone.release.xcconfig */;
654+
baseConfigurationReference = 16D8BC54D525754431110FF1 /* Pods-Tinyphone.release.xcconfig */;
655655
buildSettings = {
656656
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
657657
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
@@ -678,7 +678,7 @@
678678
/usr/local/lib,
679679
);
680680
MACOSX_DEPLOYMENT_TARGET = 10.15;
681-
MARKETING_VERSION = 36.0.0.83;
681+
MARKETING_VERSION = "36.0.0.84";
682682
OTHER_CPLUSPLUSFLAGS = (
683683
"$(OTHER_CFLAGS)",
684684
"-DBOOST_SYSTEM_DYN_LINK",

0 commit comments

Comments
 (0)