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.

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

新增ffmpeg核心 #307

Merged
merged 46 commits into from
Feb 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6938844
新增ffmpeg核心
lifegpc Feb 1, 2022
0824b15
修复部分 MKV 文件音频为设置channel_layout导致的BUG
lifegpc Feb 2, 2022
cbebd18
输出与SDL声道布局一致的数据
lifegpc Feb 2, 2022
196fff1
修复MingW编译时错误和警告
lifegpc Feb 2, 2022
b8f6aed
支持获取常用的标签
lifegpc Feb 2, 2022
efdce87
支持调节声音大小
lifegpc Feb 2, 2022
37fd1e4
将ffmpeg的输出重定向到VS的output面板
lifegpc Feb 3, 2022
a44dabf
支持调节速度
lifegpc Feb 3, 2022
e4befa6
尝试添加频谱分析
lifegpc Feb 4, 2022
9dea655
Fix merge conflict
lifegpc Feb 4, 2022
2ecfb3d
增加缓存设置
lifegpc Feb 6, 2022
7848cde
如果流比特率不可用,返回整个文件的比特率
lifegpc Feb 6, 2022
e953ba9
增加错误处理
lifegpc Feb 6, 2022
efb8fd1
修复flac文件解码完之后,继续调用解码器会导致报错的BUG
lifegpc Feb 7, 2022
2fb4dde
增加更多的错误日志输出
lifegpc Feb 8, 2022
7215ac5
Fix merge confict
lifegpc Feb 13, 2022
e58425f
支持CDA文件
lifegpc Feb 15, 2022
f8354b6
修复MingW编译警告
lifegpc Feb 15, 2022
f4d61de
发生解码/IO错误时尝试重新打开文件
lifegpc Feb 16, 2022
37114eb
增加最大重试次数和重试间隔设置
lifegpc Feb 16, 2022
fac2f6a
为较复杂的filters引入一个单独的缓冲区以解决变速时出现噪音的问题
lifegpc Feb 17, 2022
ef04146
使用单独变量来计算buffer中已塞入filters的量
lifegpc Feb 17, 2022
c12e501
修复使用复杂filters的情况下,播放不会停止的BUG
lifegpc Feb 17, 2022
086d0ae
减少filter线程对SDL播放线程的影响
lifegpc Feb 17, 2022
4eee5f2
支持均衡器
lifegpc Feb 17, 2022
0c20187
修复死锁问题
lifegpc Feb 17, 2022
1618743
修复死锁问题
lifegpc Feb 17, 2022
0ca4b17
确保核心可以动态加载和卸载,新增空指针检查
lifegpc Feb 17, 2022
eac56d0
支持选择音频设备
lifegpc Feb 18, 2022
cfdc6f2
完善UI提示 新增空指针检查 增加版本函数
lifegpc Feb 18, 2022
f80063b
为ffmpeg核心添加README文档
lifegpc Feb 18, 2022
47c75fd
支持install
lifegpc Feb 19, 2022
626c385
增加需要的filters
lifegpc Feb 19, 2022
4747269
修复merge冲突
lifegpc Feb 19, 2022
c4a0e57
修复free等内存分配函数不一致导致的crash
lifegpc Feb 19, 2022
4a2f982
修复MingW编译错误
lifegpc Feb 19, 2022
12b0eb9
修复CD最后卡住的问题
lifegpc Feb 19, 2022
a597dce
修复merge冲突
lifegpc Feb 20, 2022
c697938
Minor fix
lifegpc Feb 22, 2022
8225452
Fix bug in decode
lifegpc Feb 22, 2022
7f37c3f
Minor fix
lifegpc Feb 22, 2022
bfa17b4
Merge branch 'master' of https://github.com/zhongyang219/MusicPlayer2…
lifegpc Feb 22, 2022
de6d727
修复ape文件定位时的BUG
lifegpc Feb 22, 2022
e316ad0
添加.cue到支持的列表
lifegpc Feb 22, 2022
4e96319
修复定位导致有一部分播放不到的BUG
lifegpc Feb 23, 2022
bb8bec5
移除ffmepg_core
lifegpc Feb 23, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions MusicPlayer2/CommonData.h
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,14 @@ struct PlaySettingData
int fade_time{ 500 }; //淡入淡出时间(毫秒)

bool use_mci{ false }; //是否使用MCI内核
/// 是否使用ffmpeg内核
bool use_ffmpeg{ false };
/// ffmpeg内核缓存时长(单位:s)
int ffmpeg_core_cache_length { 15 };
/// ffmpeg内核最大重试次数
int ffmpeg_core_max_retry_count { 3 };
/// ffmpeg内核非本地文件重试间隔时间(单位s)
int ffmpeg_core_url_retry_interval { 5 };
};

struct GlobalHotKeySettingData
Expand Down
Loading