Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Dev/4.2.2 #348

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

Merged
merged 45 commits into from
Jul 27, 2023
Merged

Dev/4.2.2 #348

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
310c136
add preload channel function
Jun 12, 2023
69a0d32
set remote video canvas background color
Jun 13, 2023
7d2305b
add preload channel function
Jun 13, 2023
759545e
[Android]adapt to 421 sdk, adjust case and fix some bug.
xgfd3 Jun 15, 2023
5a82d72
[Android][Audio]adapt to 421 sdk and adjust cases.
xgfd3 Jun 15, 2023
368d0c2
add multi camera function
Jun 15, 2023
d7a52b6
[Windows]Adapt to 421 sdk; adjust cases.
xgfd3 Jun 15, 2023
913e4ed
fix fu readme
Jun 16, 2023
e06e8f2
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
Jun 16, 2023
cbf5ff0
[Android]renew the include header files of agora-simple-filter
xgfd3 Jun 16, 2023
ec20a70
fix preload channel
Jun 16, 2023
3d69464
fix preload channel
Jun 16, 2023
69164da
[Android]add MultiEncodedVideoSourceTracks case.
xgfd3 Jun 19, 2023
7d4dd8e
add custom video encode capture
Jun 19, 2023
54cb70f
[Android]Incorporate MultiEncodedVideoSourceTracks examples into Mult…
xgfd3 Jun 19, 2023
3eea077
add custom video encode capture
Jun 20, 2023
bd39541
Merge remote-tracking branch 'origin/main' into dev/4.2.1
xgfd3 Jun 25, 2023
20853f8
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
Jun 25, 2023
4ef8e3a
[windows]add pushEncodedVideoImage case.
xgfd3 Jun 25, 2023
0a7b22a
[windows]update rtc sdk url.
xgfd3 Jun 25, 2023
3007bcb
fix custom capture encode publish stream bug
Jun 25, 2023
aa6f57d
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
Jun 26, 2023
5f047a8
[Android]fix profile value setting error for using enum ordinal value.
xgfd3 Jun 27, 2023
afe06e5
[Android]perfect live streaming case.
xgfd3 Jun 27, 2023
e8c4c76
[Android]perfect the error alert in channel encryption case.
xgfd3 Jun 27, 2023
de3dc53
[Android]fix multi video track bug(NMS-13863).
xgfd3 Jun 27, 2023
9a654f9
[Android]perfect MediaRecoder case.
xgfd3 Jun 27, 2023
1410a45
[Android][Audio]fix token fill bug.
xgfd3 Jun 27, 2023
6bcebcb
fix not display join2success state
Jun 27, 2023
7563696
fix mutil camera publish stream bug
Jun 28, 2023
ec9a0de
fix custom audio render bug
Jun 28, 2023
9646f68
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
Jun 28, 2023
7921b22
fix canvas background color bug
Jun 28, 2023
5f7eb64
[Android]1.perfect watermark config;2.perfect audio route display;3.s…
xgfd3 Jun 30, 2023
12dee61
[Android]update rtc version to 422.
xgfd3 Jun 30, 2023
3ac22e8
adapts beauty scene API
Jul 10, 2023
ddea633
add screen scenario type
Jul 12, 2023
a6b6c0d
[Android]Integrate beautyAPI.
xgfd3 Jul 12, 2023
1199179
[Android]update beauty config README.
xgfd3 Jul 12, 2023
238bd67
add swift screen share code
Jul 18, 2023
283e556
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
Jul 18, 2023
a0af25d
fix xcode 14.3.1 version error
Jul 19, 2023
0f3c187
[Android]update repositories config.
xgfd3 Jul 26, 2023
3890cb7
update sdk version to 4.2.2
Jul 27, 2023
c1ee2b5
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
Jul 27, 2023
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
Prev Previous commit
Next Next commit
update sdk version to 4.2.2
  • Loading branch information
zhaoyongqiang committed Jul 27, 2023
commit 3890cb7bef8e266482d90115dabc1cdd818e2155
2 changes: 1 addition & 1 deletion iOS/APIExample-Audio/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ target 'APIExample-Audio' do

pod 'Floaty', '~> 4.2.0'
pod 'AGEVideoLayout', '~> 1.0.2'
pod 'AgoraAudio_iOS', '4.2.1'
pod 'AgoraAudio_iOS', '4.2.2'
# pod 'sdk', :path => 'sdk.podspec'
end

18 changes: 9 additions & 9 deletions iOS/APIExample/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ target 'APIExample' do
pod 'Floaty', '~> 4.2.0'
pod 'AGEVideoLayout', '~> 1.0.2'
pod 'CocoaAsyncSocket', '7.6.5'
pod 'AgoraRtcEngine_iOS', '4.2.1'
# pod 'sdk', :path => 'sdk.podspec'
# pod 'senseLib', :path => 'sense.podspec'
# pod 'bytedEffect', :path => 'bytedEffect.podspec'
# pod 'fuLib', :path => 'fu.podspec'
pod 'AgoraRtcEngine_iOS', '4.2.2'
# pod 'sdk', :path => 'sdk.podspec'
pod 'senseLib', :path => 'sense.podspec'
pod 'bytedEffect', :path => 'bytedEffect.podspec'
pod 'fuLib', :path => 'fu.podspec'
end

target 'Agora-ScreenShare-Extension' do
use_frameworks!
# pod 'sdk', :path => 'sdk.podspec'
pod 'AgoraRtcEngine_iOS', '4.2.1'
# pod 'sdk', :path => 'sdk.podspec'
pod 'AgoraRtcEngine_iOS', '4.2.2'
end

target 'SimpleFilter' do
use_frameworks!
# pod 'sdk', :path => 'sdk.podspec'
pod 'AgoraRtcEngine_iOS', '4.2.1'
# pod 'sdk', :path => 'sdk.podspec'
pod 'AgoraRtcEngine_iOS', '4.2.2'
end
2 changes: 1 addition & 1 deletion macOS/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*.a
*.xcworkspacedata
xcshareddata

*/libs
*.zip
agora_sdk
*.xcarchive
Expand Down
8 changes: 4 additions & 4 deletions macOS/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ target 'APIExample' do
use_frameworks!

pod 'AGEVideoLayout', '1.0.2'
# pod 'AgoraRtcEngine_macOS', '4.2.1'
pod 'sdk', :path => 'sdk.podspec'
pod 'AgoraRtcEngine_macOS', '4.2.2'
# pod 'sdk', :path => 'sdk.podspec'
end

target 'SimpleFilter' do
use_frameworks!
pod 'sdk', :path => 'sdk.podspec'
# pod 'AgoraRtcEngine_macOS', '4.2.1'
# pod 'sdk', :path => 'sdk.podspec'
pod 'AgoraRtcEngine_macOS', '4.2.2'
end


Expand Down
2 changes: 1 addition & 1 deletion macOS/libs/av1.xcframework/Info.plist → macOS/libs/AgoraCore.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>av1.framework</string>
<string>AgoraCore.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
Expand Down
26 changes: 26 additions & 0 deletions macOS/libs/AgoraFaceDetectionExtension.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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>AvailableLibraries</key>
<array>
<dict>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>AgoraFaceDetectionExtension.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
26 changes: 26 additions & 0 deletions macOS/libs/AgoraScreenCaptureExtension.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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>AvailableLibraries</key>
<array>
<dict>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>AgoraScreenCaptureExtension.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
26 changes: 26 additions & 0 deletions macOS/libs/AgoraVideoDecoderExtension.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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>AvailableLibraries</key>
<array>
<dict>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>AgoraVideoDecoderExtension.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
26 changes: 26 additions & 0 deletions macOS/libs/AgoraVideoEncoderExtension.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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>AvailableLibraries</key>
<array>
<dict>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>AgoraVideoEncoderExtension.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ...goraDav1dExtension.xcframework/Info.plist → macOS/libs/video_dec.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>AgoraDav1dExtension.framework</string>
<string>video_dec.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
Expand Down
26 changes: 26 additions & 0 deletions macOS/libs/video_enc.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?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>AvailableLibraries</key>
<array>
<dict>
<key>LibraryIdentifier</key>
<string>macos-arm64_x86_64</string>
<key>LibraryPath</key>
<string>video_enc.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>macos</string>
</dict>
</array>
<key>CFBundlePackageType</key>
<string>XFWK</string>
<key>XCFrameworkFormatVersion</key>
<string>1.0</string>
</dict>
</plist>