Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added metaData, streamName to HandshakeMessage package. #27

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open

added metaData, streamName to HandshakeMessage package. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
88a148d
Enhanced Peer Handling, Package Updates, and Refactored Publishing Me…
MuhammadjonTohirov Aug 26, 2023
e0ae3d6
Config update
MuhammadjonTohirov Sep 19, 2023
4ecaedb
Before pulling
MuhammadjonTohirov Sep 19, 2023
a1f6e0a
Merge remote-tracking branch 'refs/remotes/origin/master'
MuhammadjonTohirov Sep 19, 2023
8af954d
Merged with ant-ios
MuhammadjonTohirov Sep 19, 2023
fc361ec
Merge branch 'master' into master
MuhammadjonTohirov Sep 19, 2023
ef385f2
Before merge
MuhammadjonTohirov Sep 19, 2023
48448d7
Merge remote-tracking branch 'refs/remotes/upstream/master'
MuhammadjonTohirov Sep 19, 2023
7efe419
send current status in onpacket mic, cam, pin, screenshare
MuhammadjonTohirov Oct 3, 2023
d079b6e
Merge pull request #3 from MuhammadjonTohirov/feature-streamname-meta…
MuhammadjonTohirov Oct 3, 2023
56a7c96
sendData WebRTCClient now checking for iceConnectionState
MuhammadjonTohirov Oct 6, 2023
27a6783
Merge pull request #4 from MuhammadjonTohirov/feature-streamname-meta…
MuhammadjonTohirov Oct 6, 2023
b917edf
Starscream version 4.0.4
MuhammadjonTohirov Oct 6, 2023
679b0bb
-
MuhammadjonTohirov Oct 6, 2023
f539903
Enhance warnings
MuhammadjonTohirov Oct 6, 2023
47ee23d
Fix
MuhammadjonTohirov Oct 6, 2023
6c3af6f
send data to mainTrackId
MuhammadjonTohirov Oct 6, 2023
72c7f41
Do not use mainTrackId to send data through data channel
MuhammadjonTohirov Oct 6, 2023
b435587
Added audio level event type
MuhammadjonTohirov Oct 9, 2023
b28fa6a
Send audio level method implemented
MuhammadjonTohirov Oct 9, 2023
29fa008
Fix
MuhammadjonTohirov Oct 9, 2023
b5edade
UPDATE_AUDIO_LEVEL_FROM_SERVER
MuhammadjonTohirov Nov 25, 2023
4a01147
Data channel log
MuhammadjonTohirov Nov 25, 2023
fdafe53
datachannel log fix
MuhammadjonTohirov Dec 5, 2023
efee7b0
AudioOutput port change handler
MuhammadjonTohirov Dec 13, 2023
eb5f816
Speaker on/off fix
MuhammadjonTohirov Dec 13, 2023
49f1b8e
Speaker on/off fix
MuhammadjonTohirov Dec 13, 2023
d179896
Speaker on/off fix
MuhammadjonTohirov Dec 13, 2023
1900f26
Speaker on/off fix
MuhammadjonTohirov Dec 13, 2023
b1419a8
Speaker on/off fix
MuhammadjonTohirov Dec 13, 2023
3b355f9
Event fix
MuhammadjonTohirov Dec 14, 2023
ef091e5
Deleted method sendAudioVideoStatusNotification
MuhammadjonTohirov Dec 18, 2023
9caf61e
Before pulling from antclient ios
MuhammadjonTohirov Dec 18, 2023
52f49da
Merged with original antmedia
MuhammadjonTohirov Dec 18, 2023
6124e9e
before switching to master
MuhammadjonTohirov Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ScreenShare/ScreenShare.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.antmedia.ios.sdk</string>
</array>
<array/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion WebRTC-Sample-App/ConferenceViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ open class ConferenceViewController: UIViewController , AVCaptureVideoDataOutput

var conferenceClient: AntMediaClient?;
var playing = false

func initRenderer(view: UIView)
{
#if arch(arm64)
Expand Down
4 changes: 1 addition & 3 deletions WebRTC-Sample-App/WebRTC-Sample-App.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<plist version="1.0">
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.antmedia.ios.sdk</string>
</array>
<array/>
</dict>
</plist>
43 changes: 22 additions & 21 deletions WebRTCiOSSDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,7 @@
CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ScreenShare/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
Expand All @@ -767,7 +767,7 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-App.ScreenShare";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app.ScreenShare";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -782,7 +782,7 @@
CODE_SIGN_ENTITLEMENTS = ScreenShare/ScreenShare.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ScreenShare/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ScreenShare;
Expand All @@ -794,7 +794,7 @@
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-App.ScreenShare";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app.ScreenShare";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -929,7 +929,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -961,7 +961,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -993,7 +993,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDKTests;
Expand All @@ -1010,7 +1010,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = io.antmedia.ios.WebRTCiOSSDKTests;
Expand All @@ -1030,7 +1030,7 @@
CODE_SIGN_ENTITLEMENTS = "WebRTC-Sample-App/WebRTC-Sample-App.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
Expand All @@ -1047,7 +1047,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-App";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -1067,7 +1067,7 @@
CODE_SIGN_ENTITLEMENTS = "WebRTC-Sample-App/WebRTC-Sample-App.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "WebRTC-Sample-App/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "WebRTC Sample";
Expand All @@ -1084,7 +1084,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-App";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -1102,11 +1102,11 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-AppTests";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app-AppTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
Expand All @@ -1122,11 +1122,11 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-AppTests";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app-AppTests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
Expand All @@ -1141,11 +1141,11 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-AppUITests";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app-AppUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
Expand All @@ -1160,11 +1160,11 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = 2YK9J8G25K;
DEVELOPMENT_TEAM = DW8P53EU8U;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTC-Sample-AppUITests";
PRODUCT_BUNDLE_IDENTIFIER = "io.antmedia.ios.WebRTCiOSSDK-app-AppUITests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1246,7 +1246,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/daltoniam/Starscream";
requirement = {
kind = upToNextMajorVersion;
kind = versionRange;
maximumVersion = 4.0.5;
minimumVersion = 4.0.0;
};
};
Expand Down
14 changes: 14 additions & 0 deletions WebRTCiOSSDK.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"pins" : [
{
"identity" : "starscream",
"kind" : "remoteSourceControl",
"location" : "https://github.com/daltoniam/Starscream",
"state" : {
"revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21",
"version" : "4.0.4"
}
}
],
"version" : 2
}
5 changes: 5 additions & 0 deletions ...codeproj/project.xcworkspace/xcuserdata/applebro.xcuserdatad/IDEFindNavigatorScopes.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array/>
</plist>
Binary file added ...deproj/project.xcworkspace/xcuserdata/applebro.xcuserdatad/UserInterfaceState.xcuserstate
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "129F0A17-1F18-444A-ACE4-F7BE528F7746"
type = "1"
version = "2.0">
</Bucket>
24 changes: 24 additions & 0 deletions WebRTCiOSSDK.xcodeproj/xcuserdata/applebro.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>ScreenShare.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>WebRTC-Sample-App.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>WebRTCiOSSDK.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
</dict>
</dict>
</plist>
Loading