diff --git a/.gitignore b/.gitignore index 783ec8f..b9168c0 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ _ReSharper*/ ipch/ *.opensdf *.264 +*.VC.db diff --git a/Android/EasyRTMP/app/src/main/AndroidManifest.xml b/Android/EasyRTMP/app/src/main/AndroidManifest.xml index 744b4f5..27785f2 100644 --- a/Android/EasyRTMP/app/src/main/AndroidManifest.xml +++ b/Android/EasyRTMP/app/src/main/AndroidManifest.xml @@ -44,6 +44,12 @@ package="org.easydarwin.easyrtmp"> + + + + + + diff --git a/EasyRTMP_Demo/Lib/libeasyrtmp.dll b/EasyRTMP_Demo/Lib/libeasyrtmp.dll index a2253c9..159e4e8 100644 Binary files a/EasyRTMP_Demo/Lib/libeasyrtmp.dll and b/EasyRTMP_Demo/Lib/libeasyrtmp.dll differ diff --git a/EasyRTMP_Demo/Lib/libeasyrtmp.lib b/EasyRTMP_Demo/Lib/libeasyrtmp.lib index 0281161..10dd190 100644 Binary files a/EasyRTMP_Demo/Lib/libeasyrtmp.lib and b/EasyRTMP_Demo/Lib/libeasyrtmp.lib differ diff --git a/EasyRTMP_Demo/Lib/x64/libeasyrtmp.dll b/EasyRTMP_Demo/Lib/x64/libeasyrtmp.dll new file mode 100644 index 0000000..d539ac8 Binary files /dev/null and b/EasyRTMP_Demo/Lib/x64/libeasyrtmp.dll differ diff --git a/EasyRTMP_Demo/Lib/x64/libeasyrtmp.lib b/EasyRTMP_Demo/Lib/x64/libeasyrtmp.lib new file mode 100644 index 0000000..4ed05c8 Binary files /dev/null and b/EasyRTMP_Demo/Lib/x64/libeasyrtmp.lib differ diff --git a/README.md b/README.md index ac74f1f..0351eaa 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ EasyRTMP是EasyDarwin团队开发的一套RTMP直播推送功能组件,内部集成了包括:基本RTMP协议、断线重连、异步推送、环形缓冲区、推送网络拥塞自动丢帧、缓冲区关键帧检索、事件回调(断线、音视频数据回调),通过EasyRTMP我们就可以避免接触到稍显复杂的RTMP推送或者客户端流程,只需要调用EasyRTMP的几个API接口,就能轻松、稳定地进行流媒体音视频数据的推送,支持市面上绝大部分的RTMP流媒体服务器,包括Red5、Ngnix_rtmp、crtmpserver等主流RTMP服务器,全平台支持:Windows、Linux、ARM(各种交叉编译工具链)、Android、iOS; +- **我们同时提供Windows、Linux、ARM、Android、IOS版本的EasyRTMP库**:EasyRTMP SDK商业使用需要经过授权才能永久使用,商业授权方案细节: [http://www.easydss.com/EasyRTMP.html](http://www.easydss.com/EasyRTMP.html "EasyRTMP授权");个人及非商业用途可通过[https://github.com/EasyDarwin/Tools](https://github.com/EasyDarwin/Tools "EasyDarwin Tools")中的**EasyDarwin SDK License生成工具**生成临时License使用,或者可以邮件发送至[support@easydarwin.org](mailto:support@easydarwin.org "EasyDarwin support mail")进行更深入的合作咨询,注意ARM版本需要附上交叉编译工具链,我们会帮您具体编译; + ### 调用方法 ###