Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge #3351 into ln from refs/changes/3351/head
Code review from 胡传军
* refs/changes/3351/head: (7 commits squashed)
- 关闭测试文件写入
- 修复因没有按照帧结构发送数据导致服务端有坏数据问题
- Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
- 适配极速模式下的文字返回
- 雷鸟音频卡顿优化
- Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
- 修改保底机制,防止首保过大
Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Merged-by: 薛文强 <accounts_67aaf52ad497cd558d73ac32@mail.teambition.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3351
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge branch 'ln' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into ln
Merge #3340 into ln from refs/changes/3340/head
关闭测试文件写入
* refs/changes/3340/head: (1 commits squashed)
- 关闭测试文件写入
Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <snickersun@163.com>
Merged-by: snickersun@163.com <snickersun@163.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3340
Merge #3345 into ln from refs/changes/3345/head
取消对话 文件记录
* refs/changes/3345/head: (1 commits squashed)
- 取消对话 文件记录
Signed-off-by: snickersun@163.com <snickersun@163.com>
Reviewed-by: snickersun@163.com <snickersun@163.com>
Merged-by: snickersun@163.com <snickersun@163.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3345
Merge branch 'ln' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into ln
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into LN
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge #3162 into ln from refs/changes/3162/head
Code review from 胡传军
* refs/changes/3162/head: (7 commits squashed)
- 增加mqtt相关服务,及opus解码
- Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into LN
- 优化opus解码问题
- Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into LN
- 同步雷鸟cat1修改
- 800ak,python修改
- 提交mqtt相关内容
Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Reviewed-by: snickersun@163.com <snickersun@163.com>
Merged-by: snickersun@163.com <snickersun@163.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3162
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into LN
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into LN
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge branch 'ln' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/FD230 into ln
Merge branch 'ln' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/FD230 into ln
Merge #3102 into ln from refs/changes/3102/head
Code review from snickersun@163.com
* refs/changes/3102/head: (2 commits squashed)
- 避免暂停时video申请buffer,造成黑脸
- 退出对话时保证资源销毁后重连websocket。减少死机风险。
Signed-off-by: snickersun@163.com <snickersun@163.com>
Reviewed-by: snickersun@163.com <snickersun@163.com>
Merged-by: snickersun@163.com <snickersun@163.com>
link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/3102
Revert "优化liteplayer初始化变量"
This reverts commit
131d100376a36bc88a4873994e268ae30d929364.