ZLMediaKit

Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

branch_cumulative_commit

feature/async_write_file

feature/dynamic_codec

feature/hls_record_disk

feature/log_context

feature/test

feature/transcode

feature/transcode2

master

push_force_replace

#10

#1002

#1003

#1010

#1019

#1025

#1028

#1035

#104

#1040

#1041

#1052

#1053

#1059

#106

#1065

#1077

#1087

#1093

#1102

#1104

#1108

#1112

#1126

#1137

#1139

#1140

#1142

#1143

#115

#1154

#1156

#1158

#116

#1161

#1162

#1163

#1167

#1174

#1180

#1181

#1183

#1185

#1188

#1205

#1206

#1215

#1224

#1225

#1228

#1239

#124

#1262

#1273

#1274

#1275

#1278

#1281

#1286

#1287

#1289

#1292

#1293

#1317

#1320

#1322

#1323

#1324

#1330

#1336

#1341

#1346

#1349

#1361

#1362

#1364

#1368

#1369

#1372

#1386

#1391

#1401

#1404

#1405

#1409

#1411

#1419

#142

#1421

#1429

#1431

#1434

#1439

#1447

#1467

#1470

#1474

#1475

#1476

#1477

#1478

#1493

#15

#1505

#1508

#1518

#1525

#1528

#1536

#1537

#1539

#1541

#1542

#1543

#1545

#1551

#1552

#1553

#1554

#1571

#1572

#1574

#1578

#1582

#1584

#1595

#1607

#161

#1613

#1622

#1625

#1627

#1639

#1641

#1644

#1647

#1649

#1660

#1661

#1669

#167

#1676

#1677

#1678

#1682

#1695

#17

#1714

#1722

#1728

#1730

#1745

#1746

#1747

#1748

#1758

#1759

#1760

#1771

#1784

#1786

#1789

#1790

#1791

#1792

#1796

#18

#1803

#1805

#1809

#1814

#1822

#1825

#1829

#1835

#1836

#1837

#1841

#1842

#1846

#1851

#1852

#1853

#1854

#1856

#1858

#1871

#1880

#1893

#1894

#1906

#1908

#1920

#1929

#1930

#1931

#1936

#1937

#1938

#1940

#1942

#1945

#1947

#1948

#1950

#1952

#1958

#1959

#1966

#1969

#197

#1984

#199

#1992

#1993

#1994

#1999

#2032

#2048

#2061

#2063

#2075

#2092

#21

#2105

#2107

#2115

#2123

#2137

#215

#2166

#2183

#2187

#2190

#2223

#2232

#2233

#2234

#2246

#2258

#2259

#2266

#2270

#2272

#2279

#2293

#2297

#2301

#2302

#2303

#2305

#2322

#2323

#2327

#2332

#2340

#235

#2357

#2359

#2363

#2366

#2393

#2395

#2396

#2404

#2412

#2423

#2423

#2428

#2431

#2435

#2444

#2445

#2448

#2449

#2452

#2455

#2463

#2464

#2465

#2479

#2482

#2489

#2490

#2496

#2498

#2499

#2502

#2505

#2509

#2511

#2516

#2523

#2529

#2532

#2541

#2542

#2543

#2544

#2545

#2546

#2550

#2558

#2560

#2562

#2563

#2572

#2576

#2578

#2581

#2582

#2583

#2589

#2591

#2593

#2598

#2603

#2609

#2616

#262

#2620

#2627

#263

#2631

#2633

#2635

#2636

#2637

#2640

#2641

#2642

#2643

#2644

#2645

#2646

#265

#2659

#2659

#2660

#2664

#2674

#2676

#2677

#2678

#2680

#2688

#2689

#2690

#2691

#2692

#2693

#2694

#2701

#2708

#2710

#2712

#2713

#2714

#2715

#2716

#2717

#2718

#2719

#2721

#2722

#2723

#2739

#2740

#2741

#2742

#2743

#2751

#2757

#2758

#2759

#2760

#278

#2791

#2792

#2793

#2794

#2800

#2806

#2810

#2827

#285

#2858

#2859

#2884

#2885

#2894

#2895

#2895

#2896

#2898

#2899

#2900

#2910

#2915

#2924

#2928

#2933

#2935

#2936

#2941

#2951

#2954

#2958

#2958

#2959

#2960

#2963

#2966

#2967

#2970

#2974

#298

#2982

#2984

#2985

#2988

#2990

#2993

#2994

#2996

#3012

#3013

#3013

#3016

#3018

#3020

#3024

#3025

#3033

#3038

#3042

#3043

#3044

#3045

#3049

#3059

#3063

#3064

#3065

#3066

#3067

#3070

#3071

#3072

#3073

#3074

#3075

#3088

#3089

#3093

#3096

#3098

#3099

#3100

#3104

#3118

#3126

#3127

#3132

#3141

#3141

#3142

#3148

#3149

#3151

#3154

#3158

#3171

#3175

#3182

#3189

#3189

#3190

#3222

#3223

#3224

#3226

#3229

#3231

#3235

#3237

#3246

#3249

#3250

#3251

#3262

#3265

#3282

#3301

#3305

#3323

#3325

#3328

#3334

#3335

#3336

#3337

#334

#3342

#3352

#3353

#3355

#3356

#3359

#3360

#3361

#3362

#3363

#3367

#3368

#3371

#3373

#3380

#3381

#3385

#3392

#3392

#3397

#3406

#3407

#3409

#3411

#3412

#3419

#3419

#3429

#3429

#3432

#3433

#3442

#3444

#3446

#3446

#3468

#3469

#3476

#3499

#3500

#3508

#3510

#3520

#3527

#3538

#3540

#3548

#3549

#3552

#3561

#3562

#3567

#3584

#3587

#3588

#3590

#3593

#3596

#3601

#3601

#3602

#3603

#3603

#3606

#3607

#3611

#3612

#3618

#3619

#3620

#3622

#3628

#363

#3642

#3643

#3647

#3653

#3658

#3659

#3669

#3670

#3671

#3672

#3677

#3689

#3691

#3691

#3692

#3693

#3694

#3699

#3707

#3713

#3714

#3715

#3716

#3716

#374

#375

#382

#383

#397

#4

#4

#413

#425

#445

#457

#468

#471

#474

#478

#479

#509

#514

#57

#599

#60

#607

#61

#62

#633

#635

#643

#651

#654

#655

#656

#661

#662

#706

#74

#75

#758

#767

#80

#85

#865

#916

#918

#921

#927

#928

#932

#933

#935

#936

#94

#940

#941

#945

#953

#964

#966

#974

#984

#985

#986

#99

#990

#991

#992

#993

#994

113b7842d9 http cookie 可以保存更丰富的信息 xiongziliang 2019-08-20 12:09:43 +0800
64350a5b10

Update README_CN.md 夏楚 2019-08-20 09:55:18 +0800
63caabf4f1

Update README.md 夏楚 2019-08-20 09:54:23 +0800
1fcb0f6284

Update README_CN.md 夏楚 2019-08-20 09:46:41 +0800
e89e7af5e7

Update README.md 夏楚 2019-08-20 09:45:21 +0800
ae2587103d 添加readme xiongziliang 2019-08-20 09:37:13 +0800
035a32ec24 修复rtp负载长度计算偏差 xiongziliang 2019-08-20 09:30:39 +0800
8ba4c97286 修复rtp padding flag可能导致的bug xiongziliang 2019-08-20 09:22:13 +0800
8453f822b0 修复 #66 xiongziliang 2019-08-19 23:08:41 +0800
8dfe2d158c 添加配置文件说明 xiongziliang 2019-08-19 17:32:43 +0800
2a252cfa6f 添加必备库 xiongziliang 2019-08-19 16:40:31 +0800
bb55c598f8 Merge remote-tracking branch 'origin/master' xiongziliang 2019-08-19 16:05:33 +0800
10c97ff8bc 更新mac版本二进制文件，启用openssl xiongziliang 2019-08-19 16:05:17 +0800
302b72b559 新增win32可执行程序 xiongziliang 2019-08-19 15:48:03 +0800
4b65d9de95 新增win32可执行程序 xiongziliang 2019-08-19 15:46:42 +0800
98da1e3ea2 新增linux二进制文件 xiongziliang 2019-08-19 15:14:08 +0800
fa60a3c1d8 添加mac版本二进制文件 xiongziliang 2019-08-19 14:59:56 +0800
5bcdb7fb53 更新ZLToolKit xiongziliang 2019-08-19 09:25:10 +0800
5f8773b3af 更新ZLToolKit xiongziliang 2019-08-18 23:24:15 +0800
2da3ab0c34 默认关闭hook功能 xiongziliang 2019-08-16 15:34:34 +0800
c4f364c487 直接代理时sdp清洗后再使用 xiongziliang 2019-08-15 19:13:31 +0800
453994f26b 减少内存拷贝,提高websocket服务器性能 xiongziliang 2019-08-13 12:00:21 +0800
0931d82a2a 修复windows下编译失败的问题 xiongziliang 2019-08-13 11:17:41 +0800
6e8df81326 Merge remote-tracking branch 'origin/master' into zqsong xiongziliang 2019-08-12 18:32:36 +0800
9f04062fc5 支持websocket(ssl)-flv 直播 xiongziliang 2019-08-12 18:32:22 +0800
1ad02785df

Update README_CN.md 夏楚 2019-08-12 18:26:28 +0800
18e326f598

Update README.md 夏楚 2019-08-12 18:25:46 +0800
d3a4fc1f4a

Merge pull request #4 from zlmediakit/master baiyfcu 2019-08-12 18:25:04 +0800
8e17300a17 初步支持websocket-flv直播 xiongziliang 2019-08-12 18:14:51 +0800
7c7b9e560e 统一添加bom xiongziliang 2019-08-08 19:01:45 +0800
ef61c56cc2 优化hls生成 xiongziliang 2019-08-07 18:24:08 +0800
4480dad36f 修正错误 xiongziliang 2019-08-06 22:56:09 +0800
b70d6cd2c2 支持修正时间戳 xiongziliang 2019-08-06 22:54:37 +0800
749fb98439 更新ZLToolKit（日志分天以及清理） xiongziliang 2019-08-06 22:52:19 +0800
0007734bbb 支持日志分天以及自动清理 xiongziliang 2019-08-06 22:51:40 +0800
2020e23437 兼容某些不规范的sdp xiongziliang 2019-08-06 16:23:20 +0800
008df0ab85 去除继承 xiongziliang 2019-08-04 23:58:54 +0800
462eac9aea 更新ZLToolKit(优化windows下线程切换) xiongziliang 2019-08-04 23:16:05 +0800
f9426c2cfb 尝试修复时间戳回环或乱序导致的问题 xiongziliang 2019-08-02 18:06:37 +0800
6a9eb8d54b 尝试修复时间戳回环或乱序导致的问题 xiongziliang 2019-08-02 17:33:31 +0800
36803ccedc Merge remote-tracking branch 'origin/master' into zqsong xiongziliang 2019-08-02 13:51:34 +0800
36ed78ba1f 规范函数命名 xiongziliang 2019-08-02 13:51:24 +0800
dd80d6a6bb Merge branch 'dev' of https://github.com/zqsong/ZLMediaKit into zqsong xiongziliang 2019-08-02 13:40:15 +0800
892734bfd8 完善 xiongziliang 2019-08-02 11:54:05 +0800
a400b39fab 修复可能丢帧的bug xiongziliang 2019-08-02 11:09:17 +0800
35c324b6b4 修复首帧不是I帧导致花屏的问题 xiongziliang 2019-08-02 10:53:00 +0800
0d57664fac 完善H265 sps解析,统一命名风格 #62 zqsong 2019-08-02 10:46:16 +0800
0980bde12d mp4录制支持h265 xiongziliang 2019-08-01 22:32:04 +0800
d3d7fe1bd1

mp4录制支持H265 夏楚 2019-08-01 22:28:47 +0800
4d215a8e2b 还原代码 xiongziliang 2019-08-01 22:21:55 +0800
1f89019818 写mp4文件缓存可配置 xiongziliang 2019-08-01 22:13:26 +0800
13a6d3ac16 完善写mp4文件 xiongziliang 2019-08-01 22:07:40 +0800
6c0d89f417 修复生成mp4相关bug xiongziliang 2019-08-01 21:59:26 +0800
6d8db7d232 修复bug xiongziliang 2019-08-01 19:09:14 +0800
383a14a76d 重新mp4录制 xiongziliang 2019-08-01 18:49:04 +0800
12e1068a39 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong xiongziliang 2019-08-01 14:53:59 +0800
e13ae419ae 精简H264Frame对象，删除多余字段 xiongziliang 2019-08-01 14:39:09 +0800
69098612bc Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into zqsong xiongziliang 2019-08-01 14:06:34 +0800
ad83b39b0f

Merge pull request #3 from zlmediakit/master baiyfcu 2019-08-01 13:27:56 +0800
2e95c3b2fa 修改Rtmp播放结果回调事件触发机制，防止秒开失败以及获取Track失败 xiongziliang 2019-08-01 13:12:24 +0800
fcdcf12af9 更新ZLToolKit 修好GOP缓存不够导致秒开失败的bug xiongziliang 2019-08-01 13:06:54 +0800
776dd4c085 恢复CMakeLists.txt #61 zqsong 2019-08-01 11:47:30 +0800
124cce34b6 mp4录制全部替换mp4v2为media-server zqsong 2019-08-01 11:44:16 +0800
45b5da0977 恢复日志 xiongziliang 2019-07-31 17:51:53 +0800
7e92a0b738 MP4录制添加H265支持 zqsong 2019-07-30 21:29:31 +0800
360eba2c68 MP4录制添加H265支持 #60 zqsong 2019-07-30 19:26:38 +0800
fbf0469ef2 完善跨域支持 xiongziliang 2019-07-30 16:07:51 +0800
2068c873a5 完善跨域支持 xiongziliang 2019-07-30 16:07:00 +0800
d01fc3a383 Merge remote-tracking branch 'origin/master' xiongziliang 2019-07-30 13:54:31 +0800
99ab975065 h265支持输入复合帧拆帧代码复用 xiongziliang 2019-07-30 13:54:19 +0800
744999100d 1, 根据配置, 而不是根据输入源类型来确定输出流类型 #445 chenlei 2019-07-30 13:06:59 +0800
c9d913929e 1, 增加一下日志输出 chenlei 2019-07-30 12:21:53 +0800
16db003434

Merge pull request #2 from zlmediakit/master baiyfcu 2019-07-30 09:52:08 +0800
3efea46c5e 使用CMAKE_CURRENT_SOURCE_DIR代替CMAKE_SOURCE_DIR,方便嵌入其它cmake工程 baiyfcu 2019-07-30 09:49:29 +0800
1e3591becc

Update README_CN.md 夏楚 2019-07-29 23:58:13 +0800
5457d73ecc

Update README.md 夏楚 2019-07-29 23:57:30 +0800
d507220869 Merge remote-tracking branch 'origin/master' xiongziliang 2019-07-29 23:54:49 +0800
5985ff4567 新增logo xiongziliang 2019-07-29 23:54:30 +0800
722bf96634 1,修复 post api在传递了secret参数还是出现secret缺失提示的问题 2,修复 zlmedia在 docker 的默认config.ini的错误路径问题(错误 "linux_bin" 正确: "bin") chenlei 2019-07-29 19:08:23 +0800
e55108de4f

Update README_CN.md 夏楚 2019-07-29 14:04:55 +0800
e27e7bed4d 合并#57 xiongziliang 2019-07-28 20:55:37 +0800
20ca0f76cd 修复test_player windows编译错误 #57 baiyfcu 2019-07-26 22:56:17 +0800
2d16e39445

Merge pull request #1 from zlmediakit/master baiyfcu 2019-07-26 13:36:30 +0800
45a1c9f6e7 1, UI使用1.0.3的发布版 chenlei 2019-07-26 13:09:51 +0800
3369c01724 1, 更新 readme chenlei 2019-07-26 12:40:06 +0800
38e585284d 1, 更新 readme chenlei 2019-07-26 12:38:30 +0800
e367815b47 1, 在dockerfile构建中更新git submodule chenlei 2019-07-26 11:01:54 +0800
c7a31e17c5 1, 合并 zlmediakit/ZLMediaKit 最新代码 2, 修复一个 Dockfile 的COPY 错误文件夹的问题 chenlei 2019-07-26 10:48:59 +0800
e79f8f8a51 1, 调整.gitignore chenlei 2019-07-26 10:15:35 +0800
58a49d5f97 1, 整理二次开发代码, 大部分变更部分增加了以 //chenxiaolei 开头的注释 chenlei 2019-07-26 09:58:56 +0800
66dc9c43be 修复windows下编译问题 xiongziliang 2019-07-26 09:10:27 +0800
9640d8e33d 回复代码，防止兼容性问题 xiongziliang 2019-07-25 12:18:17 +0800
6922d82c65 rtmp解复用支持无内存拷贝 hls生成支持输入无0x 00 00 01的H264/H265数据 xiongziliang 2019-07-25 12:09:36 +0800
d2a889b463 优化类命名以及添加注释 xiongziliang 2019-07-25 09:38:16 +0800
7baa35e594 修复hls由于缓存导致花屏的问题 xiongziliang 2019-07-24 18:40:18 +0800
f50eaf8648 Frame添加cacheAbel接口 xiongziliang 2019-07-24 18:02:55 +0800
2d460ff83d 更新ZLToolKit(防止错误获取WorkThread中的线程) xiongziliang 2019-07-24 14:14:46 +0800
91747947b9 优化变量名 xiongziliang 2019-07-22 18:40:04 +0800
cf4482983b 统一使用MultiMediaSourceMuxer转协议 xiongziliang 2019-07-22 18:37:32 +0800
46f5a853ac 适配最新代码 xiongziliang 2019-07-22 11:39:51 +0800