Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

8.0

codex/fix-cookie-authentication-csrf-vulnerability

codex/fix-unbounded-memory-growth-in-mjpeg-rtp-decoding

copilot/reliable-udp-projects

feature/async_write_file

feature/dynamic_library

feature/hls_record_disk

feature/log_context

feature/transcode

feature/transcode2

master

seek_with_neg

#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

#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

#3397

#3406

#3407

#3409

#3411

#3412

#3419

#3429

#3432

#3433

#3442

#3444

#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

#3692

#3693

#3694

#3699

#3707

#3713

#3714

#3715

#3716

#3720

#3736

#374

#3740

#3747

#375

#3758

#3760

#3779

#3800

#3809

#3818

#382

#383

#3837

#3838

#3841

#3848

#3849

#3860

#3875

#3884

#3885

#3886

#3887

#3888

#3889

#3890

#3891

#3896

#3898

#3902

#3903

#3904

#3914

#3915

#3917

#3920

#3923

#3924

#3926

#3929

#3934

#3936

#3937

#3964

#3965

#397

#3980

#3985

#3986

#3990

#3991

#3992

#3996

#4

#4

#4003

#4008

#4018

#4019

#4028

#4029

#4031

#4032

#4033

#4034

#4035

#4039

#4042

#4043

#4048

#4050

#4055

#4059

#4069

#4073

#4085

#4088

#4092

#4093

#4100

#4101

#4102

#4106

#4113

#4114

#4128

#4129

#413

#4132

#4143

#4149

#4153

#4154

#4157

#4171

#4172

#4176

#4188

#4191

#4195

#4206

#4212

#4213

#4219

#4226

#4233

#4238

#4239

#4249

#425

#4257

#4262

#4282

#4291

#4295

#4307

#4308

#4315

#4320

#4321

#4328

#4332

#4334

#4340

#4343

#4346

#4347

#4359

#4364

#4369

#4372

#4374

#4379

#4382

#4384

#4386

#4387

#4389

#4390

#4401

#4402

#4421

#4424

#4427

#4436

#4442

#4445

#445

#4469

#4471

#4473

#4475

#4478

#4479

#4481

#4482

#4484

#4488

#4498

#4501

#4505

#4521

#4533

#4548

#4558

#4561

#4563

#4564

#4567

#457

#4570

#4571

#4576

#4579

#4582

#4582

#4586

#4587

#4598

#4609

#4613

#4617

#4620

#4622

#4631

#4632

#4633

#4646

#4654

#4664

#4664

#4667

#4671

#4677

#4678

#468

#4689

#4690

#4691

#4699

#4701

#4701

#4703

#4705

#471

#4710

#4720

#4727

#474

#4742

#4745

#4746

#4761

#4762

#4763

#4763

#4764

#4767

#4767

#4768

#4768

#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

Mono Color

• ee072191e0 开始对接rtsp源 ziyue 2021-04-02 17:56:24 +08:00
• 7110dc75ae 整理代码 ziyue 2021-04-02 17:08:11 +08:00
• 33d2e71368 合并代码，去除冗余代码 ziyue 2021-04-02 16:23:40 +08:00
• a328520c9c buf fixed xiongziliang 2021-04-01 22:24:35 +08:00
• 2434470fb8 G711强制规格 xiongziliang 2021-04-01 22:20:29 +08:00
• d2fec801c9 兼容不规范的rtmp推流器：#764 xiongziliang 2021-04-01 21:56:21 +08:00
• 075756c4c6 提升兼容性：#789 xiongziliang 2021-04-01 21:46:02 +08:00
• 5539050f06 更新第三方库 xiongziliang 2021-04-01 21:44:10 +08:00
• f217467699 Merge remote-tracking branch 'origin/master' xiongziliang 2021-04-01 20:14:44 +08:00
• 9a26ba9f8a 修复android下编译问题 xiongziliang 2021-04-01 20:14:07 +08:00
• 1978748f2e 接收到rtp包 ziyue 2021-04-01 14:16:42 +08:00
• 9ffa5c2135 恢复检查dtls证书 ziyue 2021-04-01 14:07:48 +08:00
• 6a95562dca 稍微调整 ziyue 2021-04-01 11:59:35 +08:00
• fd23a87cfb answer sdp通过chrome校验 ziyue 2021-04-01 11:42:40 +08:00
• 4853a5af48 完善answer代码 ziyue 2021-04-01 11:02:09 +08:00
• 83208b0b31 完善 ziyue 2021-04-01 10:35:31 +08:00
• 868b379a12 完善answer sdp代码 ziyue 2021-04-01 10:09:50 +08:00
• 356a8d1596 实现部分answer代码 ziyue 2021-03-31 18:32:43 +08:00
• 7e5cb33395 开始对接js ziyue 2021-03-31 17:15:26 +08:00
• 978917b465 添加接口 ziyue 2021-03-30 18:34:17 +08:00
• 45b8f83131 删除测试代码 ziyue 2021-03-30 13:53:45 +08:00
• e296ebae6e bug fixed ziyue 2021-03-30 13:11:59 +08:00
• c6a5471a23 完成sdp转string ziyue 2021-03-30 13:09:02 +08:00
• 6d16ae91e6 添加rtc配置类 ziyue 2021-03-30 11:51:39 +08:00
• 2065b6fea8 去掉最大枚举定义 ziyue 2021-03-30 11:51:19 +08:00
• a7a94f0885 sdp相关的代码移动到主目录 ziyue 2021-03-30 10:59:15 +08:00
• a3d0d3b7ad 忽略大小写拼写 ziyue 2021-03-30 09:58:53 +08:00
• daef7051ad sdp完整性检查，与忽略大小写拼写 ziyue 2021-03-30 09:53:58 +08:00
• a1b2aa9abb 整理与校验 xiongziliang 2021-03-29 23:55:29 +08:00
• 87c53dab92 完成sdp的分析 xiongziliang 2021-03-29 23:03:55 +08:00
• 62036d0f5d 完善sdp提取 ziyue 2021-03-29 18:31:56 +08:00
• 9d2498a694 candidate foundation改为string类型 ziyue 2021-03-29 12:28:47 +08:00
• ba06def4d8 开始提取汇总sdp信息 ziyue 2021-03-29 12:00:42 +08:00
• b714dfddda 添加辅助方法 ziyue 2021-03-29 11:39:58 +08:00
• 2643269581 添加部分对象定义 ziyue 2021-03-29 10:54:18 +08:00
• 7726caa7f2 修复bug与编译警告 ziyue 2021-03-29 09:53:54 +08:00
• 1228d07ff3 extmap支持方向 xiongziliang 2021-03-29 00:12:20 +08:00
• e670099192 完善sdp相关 xiongziliang 2021-03-28 23:52:26 +08:00
• 7722564ad8 添加注释 xiongziliang 2021-03-28 23:36:11 +08:00
• 6fa385f3a1 sdp 支持ssrc-group属性 xiongziliang 2021-03-28 23:31:21 +08:00
• 81f29fea61 基本完成sdp的解析和生成 xiongziliang 2021-03-28 17:32:53 +08:00
• f4746d161c 添加sdp自动化解析机制 xiongziliang 2021-03-28 09:49:34 +08:00
• 3dac9e1c51 srtp内部日志相关设置 xiongziliang 2021-03-27 23:42:44 +08:00
• 8aa3ff425b 完善sdp相关定义 xiongziliang 2021-03-27 22:23:38 +08:00
• 762cf227e5 初步添加sdp相关代码 ziyue 2021-03-27 18:33:20 +08:00
• 272ab706b0 确保安全释放资源 ziyue 2021-03-27 10:16:49 +08:00
• cc960a324f 支持多线程 ziyue 2021-03-27 10:07:06 +08:00
• d0a1c72fda dtls环境自动初始化，支持多线程 ziyue 2021-03-27 10:03:19 +08:00
• 0d4cc2fc65 srtp自动初始化，支持多线程 ziyue 2021-03-27 09:38:13 +08:00
• bdf2783a6b 还原原始文件名 ziyue 2021-03-27 09:13:10 +08:00
• 704421b728 完善 ziyue 2021-03-26 11:07:03 +08:00
• 581ebfad71 添加测试web文件 ziyue 2021-03-25 16:03:28 +08:00
• 65e470e060 初步添加rtsp转webrtc相关功能 ziyue 2021-03-24 16:52:41 +08:00
• 2f0bdf2724 修复32位编译时，websocket相关bug ziyue 2021-03-21 18:22:32 +08:00
• f2edf354de rtmp支持更新config帧 xiongziliang 2021-03-21 16:50:15 +08:00
• c5b0485519 修复sps太长生成sdp异常的问题 ziyue 2021-03-18 16:10:46 +08:00
• 51ac93a08c rtp超时检测最多暂停5分钟 更新zltoolkit ziyue 2021-03-16 15:37:34 +08:00
• 060b654252 修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟 ziyue 2021-03-16 11:30:51 +08:00
• d475191dc7 修复过早启动时间戳线程的bug ziyue 2021-03-16 10:52:43 +08:00
• 28e6dd9e02 修复过早启动时间戳线程的bug ziyue 2021-03-16 10:50:08 +08:00
• a0fc494ee3 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit xiongziliang 2021-03-14 10:34:33 +08:00
• be8403c31c 完善代码 xiongziliang 2021-03-14 10:29:17 +08:00
• 29ebcaf3e9 Merge pull request #767 from sunhui2013/master 夏楚 2021-03-14 10:05:22 +08:00
• ce80edffd2 增加支持TCP暂停 sunhui 2021-03-11 10:05:53 +08:00
• f5e8bae760 解决不指定流或者TCP暂停断流问题 sunhui 2021-03-10 23:17:15 +08:00
• c0f4899950 录制接口支持指定切片时间大小:#747 xiongziliang 2021-03-07 10:41:57 +08:00
• daedbed737 更新第三方库 xiongziliang 2021-03-07 10:16:39 +08:00
• 378ab47250 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit xiongziliang 2021-03-07 10:08:28 +08:00
• 5064137a22 简化代码 xiongziliang 2021-03-07 10:05:52 +08:00
• 5b4fe604cb 修复编译警告 xiongziliang 2021-03-07 10:05:23 +08:00
• bd9769d215 兼容rtmps rtsps的推流地址 xiongziliang 2021-03-07 10:04:58 +08:00
• 43828d4390 兼容某些rtmp流 xiongziliang 2021-03-07 10:04:27 +08:00
• 43f2245587 Merge pull request #758 from rmokerone/master 夏楚 2021-03-07 10:03:24 +08:00
• e91f2e60c7 修改submodules源为gitee vroot 2021-03-07 09:45:58 +08:00
• e6f28f7cd7 使用URL替换相对路径，避免其余项目的fork vroot 2021-03-05 18:24:09 +08:00
• 9b7c9b9109 兼容sdp不规范的rtsp流 xia-chu 2021-02-28 21:02:23 +08:00
• 6548f7959f 更新第三方库 xiongziliang 2021-02-28 21:02:55 +08:00
• fb3603b433 兼容一些不规范的流 xiongziliang 2021-02-28 20:58:30 +08:00
• 56f044f8ed 修复线程安全bug xiongziliang 2021-02-28 20:58:25 +08:00
• 8d50d3c397 分包逻辑添加边界检测代码 xia-chu 2021-02-21 22:24:46 +08:00
• ef46945de6 恢复使用jemalloc库 xia-chu 2021-02-21 21:38:24 +08:00
• 0c728827aa 添加全局内存统计功能 xia-chu 2021-02-21 21:28:17 +08:00
• a19f67679a 兼容一些rtsp流 #735 xia-chu 2021-02-21 21:27:26 +08:00
• 19f3b1bd6f 防止打印过多调试信息 xia-chu 2021-02-21 21:26:45 +08:00
• 8d122625c5 修复28181相关bug：#731 xia-chu 2021-02-09 14:19:07 +08:00
• b7f4eae2bc 修复bug xia-chu 2021-02-09 14:01:10 +08:00
• e4904623a7 修复rtmp兼容性bug xia-chu 2021-02-07 23:01:22 +08:00
• 1f52c727ca 修复编译警告 xia-chu 2021-02-07 22:56:36 +08:00
• a142665375 确保线程安全 xia-chu 2021-02-07 22:02:03 +08:00
• 75d97b9221 优化H264 rtp相关代码 xia-chu 2021-02-07 18:29:48 +08:00
• 80bcf53ccf 更新ZLToolKit并适配代码 xia-chu 2021-02-07 14:55:09 +08:00
• 14b318525e 添加rtp rtmp个数统计 xia-chu 2021-02-05 16:49:11 +08:00
• 62ba87dd0f 优化frame性能及整理代码 xia-chu 2021-02-05 11:51:16 +08:00
• c5cfbce241 优化rtp性能 xia-chu 2021-02-05 11:28:50 +08:00
• b0e1d5d6aa 重写rtp去冲突逻辑 xia-chu 2021-02-04 18:20:59 +08:00
• d6fc56d950 时间戳异常时,确保合并帧逻辑正常：#724 xia-chu 2021-02-04 18:14:53 +08:00
• 52480717e3 p帧时间戳异常时确保rtmp播放正常:#724 xia-chu 2021-02-04 18:13:33 +08:00
• 34bbfc8bcb 修复编译警告 xia-chu 2021-02-04 18:09:06 +08:00
• 1b24832a44 release编译不再链接jemalloc(实测发现使用jemalloc后性能降低) xia-chu 2021-02-04 17:59:53 +08:00
• bc6286553a 优化rtmp性能 xia-chu 2021-02-04 17:58:51 +08:00