Merge branch 'master' into dev/3.1.0

Android/README.md

@@ -31,7 +31,7 @@ Video frame data (stored in ByteBuffer) is extracted from .mp4 files using [Medi
 The decoded frames are rendered to an output Surface which is created from a pre-configured texture, then the texture can be used to draw local preview and be fed to SDK.
 
 
-#### <h2 id="switching"> Switching between different video inputs </h2>
+#### Switching between different video inputs
 
 Only one video input instance is created in charge of generating video frames, and the frames from one input can be switched to another at any time and SDK is not aware.
 
@@ -115,18 +115,16 @@ Copy from SDK|Copy to Project Folder
 **x86** folder|**/lib-component/src/main/jniLibs** folder
 **armeabi-v7a** folder|**/lib-component/src/main/jniLibs** folder
 
-
-
 ### Run the Application
 
 Open project with Android Studio, connect your Android device, build and run.
 
 Or use `Gradle` to build and run.
 
 
-## Contract Us
+## Contact Us
 
-- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
 - Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
 - Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
 - Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)

Android/README.zh.md

@@ -107,12 +107,13 @@ Demo 可以参考 [sample-push-video](https://github.com/AgoraIO/Advanced-Video/
 
 ## 联系我们
 
-- 如果你遇到了困难，可以先参阅[常见问题](https://docs.agora.io/cn/faq)
-- 如果你想了解更多官方示例，可以参考[官方SDK示例](https://github.com/AgoraIO)
-- 如果你想了解声网SDK在复杂场景下的应用，可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
-- 如果你想了解声网的一些社区开发者维护的项目，可以查看[社区](https://github.com/AgoraIO-Community)
+- 如果你遇到了困难，可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考 [官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考 [官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看 [社区](https://github.com/AgoraIO-Community)
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
 - 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Advanced-Video/issues)
 
 ## 代码许可

Android/sample-push-video/src/main/java/io/agora/advancedvideo/videopush/VideoPushActivity.java

@@ -43,7 +43,7 @@ public class VideoPushActivity extends BaseLiveActivity
     private boolean mMVPMatrixInit = false;
 
     private Camera mCamera;
-    private int mFacing = Camera.CameraInfo.CAMERA_FACING_FRONT;
+    private int mFacing = Camera.CameraInfo.CAMERA_FACING_BACK;
     private boolean mPreviewing = false;
     private int mSurfaceWidth;
     private int mSurfaceHeight;
@@ -232,6 +232,7 @@ private void openCamera() {
             // supported resolution that best fits the scenario.
             Camera.Parameters parameters = mCamera.getParameters();
             parameters.setPreviewSize(DEFAULT_CAPTURE_WIDTH, DEFAULT_CAPTURE_HEIGHT);
+            parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
             mCamera.setParameters(parameters);
             mCamera.setPreviewTexture(mPreviewSurfaceTexture);
 

LICENSE.md

@@ -0,0 +1,10 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 Agora Lab, Inc (http://www.agora.io/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

README.md

@@ -0,0 +1,30 @@
+# Advanced Video
+
+*English | [中文](README.zh.md)*
+
+Agora provides a set of sample applications demonstrating how to get advanced video features integrated into your application using the Agora Video SDK.
+
+Sample applications are provided for Android, iOS, macOS, Web, and Windows.
+
+## Platforms Supported
+
+Project Folder Name|Platform|Description
+---|---|---
+[Andorid](./Android)|Android|Android advanced features including custom video sources, switch video inputs, customized packet encryption, push interface
+[iOS&macOS](./iOS&macOS)|iOS & macOS|iOS & macOS advanced features including large group video chat, custom media device, raw data API, screen sharing, video source, AR kit.
+[Windows](./Windows)|Windows|Windows advanced features including media source, screen sharing, string account, large group video chat.
+[Web](./Web)|Web|Web advanced features including custom video source, screen sharing, large group video chat, remote control.
+
+## Contact Us
+
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
+- Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
+- Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
+- Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)
+- You can find full API documentation at [Document Center](https://docs.agora.io/en/)
+- If you encounter problems during integration, you can ask question in [Stack Overflow](https://stackoverflow.com/questions/tagged/agora.io)
+- You can file bugs about this sample at [issue](https://github.com/AgoraIO/Advanced-Video/issues)
+
+## License
+
+All sample applications are licensed under the MIT License (MIT). [View the license](LICENSE.md).

README.zh.md

@@ -0,0 +1,31 @@
+# Advanced Video
+
+*[English](README.md) | 中文*
+
+这个开源示例项目演示了如何集成 Agora 视频 SDK，并为你的应用加入各种高级特性。
+
+本开源示例项目包含 Android，iOS，macOS，Web, 以及 Windows 平台。
+
+## 支持的平台
+
+项目文件夹名称|平台|描述
+---|---|---
+[Andorid](./Android)|Android|Android 平台：自定义视频源、视频输入源切换、视频包自定义加密、Push接口等
+[iOS&macOS](./iOS&macOS)|iOS & macOS|iOS & macOS 平台：多人视频连麦直播，自定义视频采集和渲染，屏幕共享，AR连麦直播等
+[Windows](./Windows)|Windows|Windows 平台：使用裸数据功能，使用dshow进行视频采集，多人视频连麦，屏幕共享，string id使用
+[Web](./Web)|Web|Web 平台：多人视频连麦，视频音频自采集，屏幕共享，远程控制桌面
+
+## 联系我们
+
+- 如果你遇到了困难，可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考 [官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考 [官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看 [社区](https://github.com/AgoraIO-Community)
+- 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
+- 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
+- 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Advanced-Video/issues)
+
+## 代码许可
+
+MIT许可证 [查看许可](LICENSE.md)。

Web/17-Multistream/README.md

@@ -50,9 +50,9 @@ To build and run the sample application, get an App ID:
     **Note:** In some cases, you may need to open a browser and enter `http://localhost:8080` as the URL.
 
 
-## Contract Us
+## Contact Us
 
-- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
 - Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
 - Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
 - Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)

Web/17-Multistream/README.zh.md

@@ -43,14 +43,16 @@
 
 ## 联系我们
 
-- 如果你遇到了困难，可以先参阅[常见问题](https://docs.agora.io/cn/faq)
-- 如果你想了解更多官方示例，可以参考[官方SDK示例](https://github.com/AgoraIO)
-- 如果你想了解声网SDK在复杂场景下的应用，可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
-- 如果你想了解声网的一些社区开发者维护的项目，可以查看[社区](https://github.com/AgoraIO-Community)
+- 如果你遇到了困难，可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考 [官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考 [官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看 [社区](https://github.com/AgoraIO-Community)
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
 - 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Advanced-Video/issues)
 
+
 ## 代码许可
 
 The MIT License (MIT)

Web/Agora-Custom-VideoSource-Web-Webpack/README.md

@@ -50,9 +50,9 @@ To build and run the sample application, get an App ID:
 3. Your default browser should open and display the sample application, as shown here.
     **Note:** In some cases, you may need to open a browser and enter `http://localhost:8080` as the URL.
 
-## Contract Us
+## Contact Us
 
-- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
 - Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
 - Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
 - Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)

Web/Agora-Custom-VideoSource-Web-Webpack/README.zh.md

@@ -51,14 +51,16 @@
 
 ## 联系我们
 
-- 如果你遇到了困难，可以先参阅[常见问题](https://docs.agora.io/cn/faq)
-- 如果你想了解更多官方示例，可以参考[官方SDK示例](https://github.com/AgoraIO)
-- 如果你想了解声网SDK在复杂场景下的应用，可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
-- 如果你想了解声网的一些社区开发者维护的项目，可以查看[社区](https://github.com/AgoraIO-Community)
+- 如果你遇到了困难，可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考 [官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考 [官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看 [社区](https://github.com/AgoraIO-Community)
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
 - 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Advanced-Video/issues)
 
+
 ## 代码许可
 
 The MIT License (MIT)

Web/Agora-Screen-Sharing-Web-Webpack/README.md

@@ -49,9 +49,9 @@ To build and run the sample application, get an App ID:
 3. Your default browser should open and display the sample application, as shown here.
     **Note:** In some cases, you may need to open a browser and enter `http://localhost:8080` as the URL.
 
-## Contract Us
+## Contact Us
 
-- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
 - Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
 - Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
 - Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)

Web/Agora-Screen-Sharing-Web-Webpack/README.zh.md

@@ -50,14 +50,16 @@
 
 ## 联系我们
 
-- 如果你遇到了困难，可以先参阅[常见问题](https://docs.agora.io/cn/faq)
-- 如果你想了解更多官方示例，可以参考[官方SDK示例](https://github.com/AgoraIO)
-- 如果你想了解声网SDK在复杂场景下的应用，可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
-- 如果你想了解声网的一些社区开发者维护的项目，可以查看[社区](https://github.com/AgoraIO-Community)
+- 如果你遇到了困难，可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考 [官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考 [官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看 [社区](https://github.com/AgoraIO-Community)
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
 - 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Advanced-Video/issues)
 
+
 ## 代码许可
 
 The MIT License (MIT)

Web/LargeGroupVideoChat-Web-Webpack/README.md

@@ -50,9 +50,9 @@ To build and run the sample application, get an App ID:
 3. Your default browser should open and display the sample application, as shown here.
     **Note:** In some cases, you may need to open a browser and enter `http://localhost:8080` as the URL.
 
-## Contract Us
+## Contact Us
 
-- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
 - Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
 - Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
 - Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)

Web/LargeGroupVideoChat-Web-Webpack/README.zh.md

@@ -51,14 +51,16 @@
 
 ## 联系我们
 
-- 如果你遇到了困难，可以先参阅[常见问题](https://docs.agora.io/cn/faq)
-- 如果你想了解更多官方示例，可以参考[官方SDK示例](https://github.com/AgoraIO)
-- 如果你想了解声网SDK在复杂场景下的应用，可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
-- 如果你想了解声网的一些社区开发者维护的项目，可以查看[社区](https://github.com/AgoraIO-Community)
+- 如果你遇到了困难，可以先参阅 [常见问题](https://docs.agora.io/cn/faq)
+- 如果你想了解更多官方示例，可以参考 [官方SDK示例](https://github.com/AgoraIO)
+- 如果你想了解声网SDK在复杂场景下的应用，可以参考 [官方场景案例](https://github.com/AgoraIO-usecase)
+- 如果你想了解声网的一些社区开发者维护的项目，可以查看 [社区](https://github.com/AgoraIO-Community)
 - 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
 - 若遇到问题需要开发者帮助，你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
+- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
 - 如果发现了示例代码的 bug，欢迎提交 [issue](https://github.com/AgoraIO/Advanced-Video/issues)
 
+
 ## 代码许可
 
 The MIT License (MIT)

Web/README.md

@@ -0,0 +1,27 @@
+# Advanced Video Web
+
+*English | [中文](README.zh.md)*
+
+Agora provides a set of sample applications demonstrating how to get advanced video features integrated into your application using the Agora Video SDK on Web.
+
+Project Folder Name|Description
+---|---
+[17-Multistream](./17-Multistream)|How to quickly create a live app using Agora Web SDK, implement 17 person live
+[Agora-Custom-VideoSource-Web-Webpack](./Agora-Custom-VideoSource-Web-Webpack)|How to quickly create Custom Video Source 
+[Agora-Screen-Sharing-Web-Webpack](./Agora-Screen-Sharing-Web-Webpack)|How to quickly create ScreenSharing 
+[LargeGroupVideoChat-Web-Webpack](./LargeGroupVideoChat-Web-Webpack)|How to quickly create Custom Video Source using the Agora sample app
+[Remote-Control-Web](./Remote-Control-Web)|A web based remote control demo, built on AgoraRTCSDK and AgoraRTMSDK
+
+## Contact Us
+
+- For potential issues, take a look at our [FAQ](https://docs.agora.io/en/faq) first
+- Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
+- Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
+- Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)
+- You can find full API documentation at [Document Center](https://docs.agora.io/en/)
+- If you encounter problems during integration, you can ask question in [Stack Overflow](https://stackoverflow.com/questions/tagged/agora.io)
+- You can file bugs about this sample at [issue](https://github.com/AgoraIO/Advanced-Video/issues)
+
+## License
+
+All sample applications are licensed under the MIT License (MIT).