-
Notifications
You must be signed in to change notification settings - Fork 19
秀场直播二期新增文档 #3328
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.
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
Open
kelzr
wants to merge
61
commits into
master
Choose a base branch
from
release/showroom
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
秀场直播二期新增文档 #3328
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
2abc92f
[beauty] wip
kelzr 0fe9f06
[beauty] add input
kelzr 781c01f
[beauty] wip
kelzr 219e8dd
[beauty] wip
kelzr e964988
[beauty] wip
kelzr 36fc882
[beauty] wip
kelzr 14d0ead
[beauty] fix code
kelzr 3432dc7
[beauty] wip
kelzr dc77597
[chatroom] wip
kelzr d102350
[beauty] wip
kelzr 93d5384
[beauty] wip
kelzr 2eb9125
[beauty] wip
kelzr 6a3b966
[beauty] run android
kelzr e7ac49f
[beauty] integration android wip
kelzr 21e20b2
[beauty] integration android wip
kelzr 1908c1b
[beauty] integration android wip
kelzr 1f45018
[beauty] wip
kelzr 5fbb004
[beauty] wip
kelzr 93065b7
[beauty] wip
kelzr 3761451
[beauty] discuss
kelzr dee2cce
[beauty] update
kelzr 7760474
[beauty] wip
kelzr 4d3af1e
[beauty] wip
kelzr 8e3c820
[beauty] wip
kelzr 469313a
[beauty] wip
kelzr a395c67
[beauty] wip
kelzr 585452b
[beauty] wip
kelzr 4479158
[beauty] template
kelzr 4d6fcb5
[beauty] wip
kelzr c5be22e
[beauty] wip
kelzr d41e1c2
[beauty] wip
kelzr bfd3873
[beauty] wip
kelzr 4fb875a
[beauty] wip
kelzr d4b8903
[beauty] wip
kelzr 308df37
[beauty] wip
kelzr 4f1852d
[showroom] wip
kelzr 6cb0845
[beauty] wip
kelzr b982456
[beauty] wip
kelzr f53f085
[beauty] wip
kelzr 97edd52
[showroom] wip
kelzr 25028af
[showroom] wip
kelzr e48c48f
[beauty] wip
kelzr c0235f8
[beauty] wip
kelzr 9f76afa
[beauty] wip
kelzr cf2b570
[beauty] wip
kelzr 8ad411d
[showroom] wip
kelzr 4a6231e
[beauty] wip
kelzr 7afe5f9
[beauty] wip
kelzr 376925f
[beauty] wip
kelzr 814392e
Merge branch 'master' into release/showroom
kelzr 0789e06
Merge branch 'master' into release/beauty
kelzr 361e22e
[beauty] wip
kelzr 1ef5567
[beauty] wip
kelzr 70120b0
[beauty] wip
kelzr 8507a98
Merge branch 'release/beauty' into release/showroom
kelzr a637bbd
Merge branch 'master' into release/showroom
kelzr ff80b13
[beauty] wip
kelzr a0469c7
[beauty] update after review
kelzr 9a57bd6
[beauty] update after review
kelzr d154fa5
[beauty] update after review
kelzr 352867e
rename file
kelzr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
实时音视频互动中,美颜功能可以让用户展现更好的精神面貌,并提供有趣的贴纸特效。声网与第三方厂商合作,开发了声网美颜场景化 API,使开发者能够方便地集成美颜功能。声网美颜场景化 API,也称为 Beauty API,封装了声网 RTC SDK 和第三方美颜 SDK 的 API 调用逻辑,开发者只需几行代码就能在声网的实时音视频互动中使用第三方提供的丰富美颜功能。 | ||
|
||
## 获取资源 | ||
|
||
声网目前已与商汤美颜、字节火山美颜、相芯美颜合作,提供美颜场景化 API,开发者可以根据自己的需求选择不同厂商进行集成。集成过程中,你可以参考如下资源: | ||
|
||
|美颜厂商 | 美颜场景化 API 版本号 |GitHub 示例项目 | 参考文档 | | ||
|-----|-----------|---------------|------------| | ||
| 商汤 | 1.0.1.1| <li>[Android 项目](https://github.com/AgoraIO-Community/BeautyAPI/tree/1.0.1.1/Android)</li><li>[iOS 项目](https://github.com/AgoraIO-Community/BeautyAPI/tree/1.0.1.1/iOS)</li> | <li>[跑通项目 (Android)](./beauty_run_github_project_sensetime_android)</li><li>[跑通项目 (iOS)](./beauty_run_github_project_sensetime_ios)</li><li>[实现美颜 (Android)](./beauty_integration_sensetime_android)</li><li>[实现美颜 (iOS)](./beauty_integration_sensetime_android)</li> | | ||
| 字节火山 |1.0.2 或之后| <li>[Android 项目](https://github.com/AgoraIO-Community/BeautyAPI/tree/main/Android)</li><li>[iOS 项目](https://github.com/AgoraIO-Community/BeautyAPI/tree/main/iOS)</li> | <li>[跑通项目 (Android)](./beauty_run_github_project_bytedance_android)</li><li>[跑通项目 (iOS)](./beauty_run_github_project_bytedance_ios)</li><li>[实现美颜 (Android)](./beauty_integration_bytedance_android)</li><li>[实现美颜 (iOS)](./beauty_integration_bytedance_android)</li> | | ||
| 相芯 |1.0.2 或之后| <li>[Android 项目](https://github.com/AgoraIO-Community/BeautyAPI/tree/main/Android)</li><li>[iOS 项目](https://github.com/AgoraIO-Community/BeautyAPI/tree/main/iOS)</li> | <li>[跑通项目 (Android)](./beauty_run_github_project_faceunity_android)</li><li>[跑通项目 (iOS)](./beauty_run_github_project_faceunity_ios)</li><li>[实现美颜 (Android)](./beauty_integration_faceunity_android)</li><li>[实现美颜 (iOS)](./beauty_integration_faceunity_android)</li> | | ||
|
||
|
||
## 版本说明 | ||
|
||
本节说明秀场直播示例项目、场景化美颜示例项目、美颜 SDK 的版本信息。 | ||
|
||
### 秀场直播 | ||
|
||
|秀场直播版本号| GitHub 示例项目 | | ||
|-----|--------| | ||
| 3.0.0.1 | <li>[Android 项目](https://github.com/AgoraIO-Usecase/agora-ent-scenarios/tree/v3.0.0.1-all-Android/Android/scenes/show)</li><li>[iOS 项目](https://github.com/AgoraIO-Usecase/agora-ent-scenarios/tree/v3.0.0-all-iOS/iOS/AgoraEntScenarios/Scenes/Show)</li> | | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. iOS 链接里的版本号是 v3.0.0,不是 3.0.0.1,是 iOS 没有 3.0.0.1 版本吗? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 你发现的盲点。看起来是这样。agora-ent-scenarios 仓库的 tag 和版本都不太规范。 |
||
| 3.0.1 | <li>[Android 项目](https://github.com/AgoraIO-Usecase/agora-ent-scenarios/tree/feat/scene/all_android_3.0.1/Android/scenes/show)</li><li>[iOS 项目](https://github.com/AgoraIO-Usecase/agora-ent-scenarios/tree/feat/scene/all_ios_3.0.1/iOS/AgoraEntScenarios/Scenes/Show)</li> | | ||
|
||
<div class="alert note">声网已在 3.0.1 版(最新版)的秀场直播示例项目中集成 1.0.1.1 版场景化美颜(商汤)供你参考。</div> | ||
|
||
### 场景化美颜 | ||
|
||
各版本的场景化美颜示例项目代码可以在 `BeautyAPI` 仓库的 [Tags](https://github.com/AgoraIO-Community/BeautyAPI/tags) 中查看。 | ||
|
||
 | ||
|
||
### 美颜 SDK | ||
|
||
Beauty API 中封装的声网 RTC SDK 和第三方厂商美颜 SDK 版本请参考 [README](https://github.com/AgoraIO-Community/BeautyAPI/blob/main/README.zh)。 | ||
|
||
 |
Empty file.
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
@startuml | ||
autonumber | ||
title 美颜场景化 API (Beauty API) 时序图 | ||
participant "App" as app | ||
participant "声网 RTC SDK" as rtc | ||
participant "Beauty API" as api | ||
participant "商汤美颜 SDK" as beauty | ||
app -> app: 进入预览和直播间 | ||
== 初始化 RtcEngine == | ||
app -> rtc: RtcEngine.create \n创建并初始化 RtcEngine 对象 | ||
== 初始化美颜 SDK == | ||
app -> beauty: 创建并初始化 STRenderKit | ||
== 初始化 Beauty API == | ||
app -> api: createSenseTimeBeautyAPI \n创建 Beauty API 对象 | ||
alt #WhiteSmoke 使用声网模块采集视频 | ||
app -> api: initialize(captureMode.**Agora**) \n初始化 Beauty API 对象 | ||
end | ||
alt #AntiqueWhite 自定义视频采集 | ||
app -> api: initialize(captureMode.**Custom**) \n初始化 Beauty API 对象 | ||
end | ||
== 开启美颜 == | ||
app -> api: enable | ||
== 开启视频采集 == | ||
app -> rtc: enableVideo \n开启视频模块 | ||
alt #WhiteSmoke 使用声网模块采集视频 | ||
app -> rtc: setupLocalVideo \n设置本地视图 | ||
end | ||
alt #AntiqueWhite 开发者自定义视频采集 | ||
app -> rtc: registerVideoFrameObserver \n注册原始视频数据观测器 | ||
api -->> rtc: onFrame \n传递原始视频数据 | ||
rtc -->> app: onCaptureVideoFrame \n传递原始视频数据 | ||
end | ||
== 加入频道 == | ||
app -> rtc: joinChannel | ||
== 设置美颜效果 == | ||
app -> api: setBeautyPreset \n设置是否使用默认且推荐的美颜参数 | ||
app -> beauty: 如需更多美颜效果,例如贴纸、美妆风格,可直接调用美颜 SDK 的 API | ||
== 离开频道 == | ||
app -> rtc: leaveChannel | ||
== 销毁资源 == | ||
app -> api: release \n销毁 Beauty API 对象 | ||
app -> beauty: release \n销毁 STRenderKit | ||
app -> rtc: destroy \n销毁 RtcEngine 对象 | ||
app -> app: 退出预览和直播间 | ||
@enduml |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.