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

11820db3e4 检查、等待ffmpeg截图完成在返回请求结果 #334 Lawrence 2020-06-07 12:43:47 +0800
fff0345462 修正ffmpep进程关闭错误 Lawrence 2020-06-07 12:41:37 +0800
8ef8c91f2e 更新第三方库,解决rtp丢包导致无法解析的问题 xiongziliang 2020-06-04 16:17:41 +0800
09995a7ed8 完善websocket c api xiongziliang 2020-06-04 16:17:03 +0800
fe095a4117 优化日志重定向代码 xiongziliang 2020-06-01 11:17:50 +0800
974260156e 防止误报警告日志 xiongziliang 2020-05-30 18:33:28 +0800
b7049b1407 精简代码 xiongziliang 2020-05-30 14:43:08 +0800
aeb2f910c1 release编译时修复assert宏相关警告 xiongziliang 2020-05-30 13:52:09 +0800
932da46c3a 更新第三方库 xiongziliang 2020-05-30 12:01:44 +0800
31ad2caa6b 使用抛异常替代asset，提高代码稳定性 xiongziliang 2020-05-30 11:49:36 +0800
fb4435fca9 rtp推流解析出frame才刷新保活计时器 xiongziliang 2020-05-30 10:16:15 +0800
de96a4f0c8 优化代码 xiongziliang 2020-05-28 18:19:39 +0800
406c5477e0 无metadata且不能获取Track的rtmp确保能注册 xiongziliang 2020-05-28 18:01:03 +0800
41509800bc 完善对无metadata的rtmp流的兼容性 xiongziliang 2020-05-28 17:03:12 +0800
e7f263b046 Merge remote-tracking branch 'origin/master' xiongziliang 2020-05-28 12:44:39 +0800
ebc1ee2c6e 代码优化 xiongziliang 2020-05-28 12:44:25 +0800
2050ed9db6

Update README.md 夏楚 2020-05-27 14:59:49 +0800
57fce29482

Update README.md 夏楚 2020-05-27 14:52:48 +0800
0548256c30 合并写缓存优化对rtp的支持 xiongziliang 2020-05-27 11:25:56 +0800
dea36cfc84 优化合并写逻辑，确保GOP缓存第一帧为关键帧并确保音视频数据的交织性 xiongziliang 2020-05-27 11:09:02 +0800
a7bcfd566b 平滑动播放hls xiongziliang 2020-05-26 23:19:13 +0800
53ca43fb7d 提高性能 xiongziliang 2020-05-26 21:04:53 +0800
7b90daab24 修复h264/h265 prefixSize计算错误的bug xiongziliang 2020-05-26 17:00:51 +0800
7d8dbb2a4b 修复websocket客户端相关bug:#311 xiongziliang 2020-05-26 12:11:44 +0800
876111698e 优化时间戳相关代码 xiongziliang 2020-05-26 10:30:39 +0800
ff7914e441 修改MediaSource相关接口 xiongziliang 2020-05-26 10:11:58 +0800
eddb5adcb2 修复配置文件错误注释 xiongziliang 2020-05-26 09:18:34 +0800
e063cb3a00 兼容一些不规范的rtsp流 xiongziliang 2020-05-25 21:54:43 +0800
0626f9a2bf 修复拼写错误 xiongziliang 2020-05-25 18:33:42 +0800
8d1801339c 优化rtsp鉴权事件 xiongziliang 2020-05-25 18:22:21 +0800
20d3757986 http-flv/ws-flv先触发on_play再触发on_stream_not_found xiongziliang 2020-05-25 17:38:36 +0800
68d910e229 限制rtsp/rtmp推流url合法性 xiongziliang 2020-05-25 16:40:41 +0800
5ae887a279 websocket客户端销毁时主动发送close信令: #311 xiongziliang 2020-05-25 14:36:58 +0800
07089ea4e2 websocket协议支持随机掩码 xiongziliang 2020-05-25 14:36:07 +0800
c20a1337a5 完善rtp丢包日志 xiongziliang 2020-05-25 14:28:02 +0800
893564d0be 修复拼写错误 xiongziliang 2020-05-25 13:51:00 +0800
06d61cf195 添加全局时间戳覆盖逻辑 xiongziliang 2020-05-25 12:07:38 +0800
4130910574 优化头文件包含 xiongziliang 2020-05-21 18:01:57 +0800
51a86f502f 完善h264帧split逻辑 xiongziliang 2020-05-21 14:10:55 +0800
c02438f9c8 hls播放器兼容带参数的url xiongziliang 2020-05-21 14:10:27 +0800
c6064406eb Merge remote-tracking branch 'origin/master' xiongziliang 2020-05-21 11:45:15 +0800
3c1e0531de 修复循环引用的问题 xiongziliang 2020-05-21 11:44:57 +0800
425c74e730

Update README_en.md 夏楚 2020-05-19 16:03:22 +0800
5cc4258ba2 兼容OPTIONS命令返回401、302等命令 xiongziliang 2020-05-19 10:47:46 +0800
cca9b1758a 更新ZLToolKit xiongziliang 2020-05-18 15:34:44 +0800
477475a60f 批量添加bom头、批量替换tab字符 xiongziliang 2020-05-18 15:31:49 +0800
7bc7d95249 hls支持https xiongziliang 2020-05-18 09:24:51 +0800
0c1bb482dd

Update README.md 夏楚 2020-05-18 09:17:15 +0800
4315a7e037

Update README.md 夏楚 2020-05-18 09:10:35 +0800
0e26161574 修复hls播放失败不回调的bug xiongziliang 2020-05-17 19:10:08 +0800
bab11b426e hls播放器通过测试 xiongziliang 2020-05-17 19:06:14 +0800
a4aa34e4ae 初步添加hls播放器 xiongziliang 2020-05-17 18:00:37 +0800
198f223d63 进一步抽象ts/ps解析代码 xiongziliang 2020-05-17 18:00:23 +0800
cf599167c1 修复指针转换偏移量导致的bug xiongziliang 2020-05-15 21:48:29 +0800
be9e31bba2 修复指针转换偏移量导致的bug xiongziliang 2020-05-15 21:39:06 +0800
f71a9bfadf 修复rtsp播放器时间戳紊乱的bug xiongziliang 2020-05-15 20:15:43 +0800
cded823b65 ps rtp推流优化音视频时间戳同步问题 xiongziliang 2020-05-15 18:21:28 +0800
1970f6014e 优化音视频同步 xiongziliang 2020-05-15 18:08:54 +0800
0779a4bee6 完善rtsp 信令心跳包相关逻辑 xiongziliang 2020-05-15 09:53:17 +0800
0e9d8df2d0 精简代码 xiongziliang 2020-05-14 10:23:12 +0800
b2724b7f9d

api explicit define event callback func #298 syklev 2020-05-13 10:28:09 +0800
d27a8117e1 mp4录制支持opus xiongziliang 2020-05-12 11:48:15 +0800
7102b85d67 确保rtp/rtcp端口偶奇约定:#292 xiongziliang 2020-05-12 10:37:23 +0800
8c46688886 确保rtp/rtcp端口号为偶奇数 xiongziliang 2020-05-12 10:22:21 +0800
f303ab3222 确保rtp端口为偶数 xiongziliang 2020-05-12 09:26:02 +0800
4ab270ca10 精简代码 xiongziliang 2020-05-11 23:43:28 +0800
6356ffcb4f 隐藏细节代码 xiongziliang 2020-05-11 23:34:57 +0800
70e9a20352 精简aac相关代码 xiongziliang 2020-05-11 23:25:12 +0800
625d7e30c0 整理和精简代码 xiongziliang 2020-05-11 22:33:10 +0800
41f1df3acf 可自定义codec xiongziliang 2020-05-11 12:06:15 +0800
7acc2bbbc5 Merge remote-tracking branch 'origin/master' xiongziliang 2020-05-09 14:04:26 +0800
91080e507c 发送GET_PARAMETER命令兼容一些rtsp服务器:#284 xiongziliang 2020-05-09 14:04:08 +0800
f68885777e

Update README.md 夏楚 2020-05-09 10:10:36 +0800
e545946e53

Update README.md 夏楚 2020-05-09 09:59:40 +0800
abe1698601 防止重复创建截图 xiongziliang 2020-05-09 09:39:36 +0800
5b4d4dab96 优化截图生成逻辑 xiongziliang 2020-05-09 09:29:45 +0800
76bece0217 实现实时生成和获取截图的http api xiongziliang 2020-05-09 00:06:36 +0800
d8e5dbb5b8 崩溃捕获信息打印函数名 xiongziliang 2020-05-08 21:59:49 +0800
3252f131ad 修复某些rtp包不兼容的bug xiongziliang 2020-05-08 21:57:56 +0800
683c8eef15 添加获取线程的方法 xiongziliang 2020-05-08 09:52:05 +0800
a4d7b3463e rtmp播放时，取相对时间戳逻辑确保时间戳同步 xiongziliang 2020-05-06 18:54:28 +0800
920f06a996 AAC sdp添加通道数 xiongziliang 2020-04-30 13:35:38 +0800
3ad1fe4924 支持265解码 xiongziliang 2020-04-30 12:52:13 +0800
787081eb0c 修复websocket服务器可能存在的bug xiongziliang 2020-04-30 10:31:32 +0800
c64d1a3ad8 完善 xiongziliang 2020-04-30 10:02:27 +0800
b649372873 修复split 264/265相关逻辑的bug xiongziliang 2020-04-30 10:00:55 +0800
6518e5d448

Merge pull request #16 from xiongziliang/master baiyfcu 2020-04-29 18:26:06 +0800
1067c5a2d3 再优化dts获取 xiongziliang 2020-04-29 18:19:51 +0800
9d9f6e304e 完善dts计算算法 xiongziliang 2020-04-29 18:05:29 +0800
3630839bc9 关闭转协议后，将关闭解复用以提供性能 xiongziliang 2020-04-29 11:59:45 +0800
0270057907 新增rtmps默认端口 xiongziliang 2020-04-29 11:30:06 +0800
7e85be7654 添加rtmps服务器 xiongziliang 2020-04-29 11:25:15 +0800
f9df7f5217 去除ultraLowDelay配置项 xiongziliang 2020-04-29 11:08:43 +0800
4fbd45e408 h265新增支持两种类型的关键帧 xiongziliang 2020-04-29 10:01:56 +0800
163b0875cf 修复h264 split后可能多个字节的bug xiongziliang 2020-04-28 22:24:31 +0800
7565a20695 startRecord API with "customized_path" #279 xiongziliang 2020-04-28 15:24:08 +0800
0eb97d5471 修复不能控制录制路径的问题：#279 xiongziliang 2020-04-28 09:40:47 +0800
aa9bd56c5a 回调可以设置空指针 xiongziliang 2020-04-27 09:18:46 +0800
7490f320f8

Merge pull request #15 from xiongziliang/master baiyfcu 2020-04-26 22:35:29 +0800
7272f01ea9 确保能同步取消定时器 xiongziliang 2020-04-26 19:36:17 +0800