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

Jump to bottom

Dev/4.2.2 #348

Merged
merged 45 commits into from
Jul 27, 2023
Merged

Dev/4.2.2 #348

merged 45 commits into from
Jul 27, 2023

Conversation

xgfd3
Copy link
Contributor

@xgfd3 xgfd3 commented Jun 15, 2023

No description provided.

zhaoyongqiang and others added 28 commits June 12, 2023 17:08
add preload channel function
310c136
set remote video canvas background color
69a0d32
add preload channel function
7d2305b
@xgfd3
[Android]adapt to 421 sdk, adjust case and fix some bug.
759545e
@xgfd3
[Android][Audio]adapt to 421 sdk and adjust cases.
5a82d72
add multi camera function
368d0c2
@xgfd3
[Windows]Adapt to 421 sdk; adjust cases.
d7a52b6
fix fu readme
913e4ed
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
e06e8f2 
…4.2.1
@xgfd3
[Android]renew the include header files of agora-simple-filter
cbf5ff0
fix preload channel
ec20a70
fix preload channel
3d69464
@xgfd3
[Android]add MultiEncodedVideoSourceTracks case.
69164da
add custom video encode capture
7d4dd8e
@xgfd3
[Android]Incorporate MultiEncodedVideoSourceTracks examples into Mult…
54cb70f 
…iVideoSourceTracks examples.
add custom video encode capture
3eea077
@xgfd3
Merge remote-tracking branch 'origin/main' into dev/4.2.1
bd39541 
# Conflicts:
#	Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraBase.h
#	iOS/APIExample/APIExample.xcodeproj/project.pbxproj
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
20853f8 
…4.2.1
@xgfd3
[windows]add pushEncodedVideoImage case.
4ef8e3a
@xgfd3
[windows]update rtc sdk url.
0a7b22a
fix custom capture encode publish stream bug
3007bcb
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
aa6f57d 
…4.2.1
@xgfd3
[Android]fix profile value setting error for using enum ordinal value.
5f047a8
@xgfd3
[Android]perfect live streaming case.
afe06e5
@xgfd3
[Android]perfect the error alert in channel encryption case.
e8c4c76
@xgfd3
[Android]fix multi video track bug(NMS-13863).
de3dc53
@xgfd3
[Android]perfect MediaRecoder case.
9a654f9
@xgfd3
[Android][Audio]fix token fill bug.
1410a45
@xgfd3 xgfd3 changed the title Dev/4.2.1 Dev/4.2.2 Jun 27, 2023
zhaoyongqiang and others added 16 commits June 28, 2023 16:11
fix mutil camera publish stream bug
7563696
fix custom audio render bug
ec9a0de
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
9646f68 
…4.2.1
fix canvas background color bug
7921b22
@xgfd3
[Android]1.perfect watermark config;2.perfect audio route display;3.s…
5f7eb64 
…implify audio token case.
@xgfd3
[Android]update rtc version to 422.
12dee61
adapts beauty scene API
3ac22e8
add screen scenario type
ddea633
@xgfd3
[Android]Integrate beautyAPI.
a6b6c0d
@xgfd3
[Android]update beauty config README.
1199179
add swift screen share code
238bd67
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
283e556 
…4.2.1
fix xcode 14.3.1 version error
a0af25d
@xgfd3
[Android]update repositories config.
0f3c187
update sdk version to 4.2.2
3890cb7
Merge branch 'dev/4.2.1' of github.com:AgoraIO/API-Examples into dev/…
c1ee2b5 
…4.2.1
@xgfd3 xgfd3 requested a review from zhangtao1104 July 27, 2023 07:15
@zhangtao1104 zhangtao1104 merged commit 18515f2 into main Jul 27, 2023
6 checks passed
@xgfd3 xgfd3 deleted the dev/4.2.1 branch August 3, 2023 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhangtao1104 zhangtao1104 zhangtao1104 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xgfd3 @zhangtao1104