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

• 03f6f4c4c0 fix publish type yangkun 2021-07-09 14:58:58 +08:00
• 9217a5dbcd 精简代码 ziyue 2021-07-09 14:04:34 +08:00
• 4b0d0efdfb 修复笔误 ziyue 2021-07-09 14:02:25 +08:00
• 35d9321b93 整理H264/H265 Frame对象及相关代码 ziyue 2021-07-09 13:38:20 +08:00
• 4fb4471647 修复265 rtmp/flv相关bug:#965 ziyue 2021-07-08 17:09:42 +08:00
• d62cdd81b8 webrtc不支持的mline设置为inactive ziyue 2021-07-07 17:58:29 +08:00
• 4b694ccde8 http-ts直播减少一次内存拷贝 ziyue 2021-07-07 16:15:42 +08:00
• 6220db77e8 修复webrtc纯音频推流时不能注册流的bug:#963 ziyue 2021-07-07 14:47:41 +08:00
• 039be5444e 修复m3u8中extinf不准的问题：#816 ziyue 2021-07-07 11:51:44 +08:00
• 03addaf0b7 由于frame merge时已经过滤无效帧，所以移除多余代码 ziyue 2021-07-07 11:37:22 +08:00
• 59131e3b0a 修复ts/ps解析后组帧逻辑bug：#964 ziyue 2021-07-07 11:02:05 +08:00
• 9f9b3a5a64 提高http-ts直播性能：#961 xiongziliang 2021-07-06 23:57:39 +08:00
• c393cc7c0e 修复GB28181粘帧导致花屏的问题: #964,#954 xiongziliang 2021-07-06 23:37:04 +08:00
• 756b6a4cff Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-07-06 23:12:52 +08:00
• ea39ffe558 Merge pull request #966 from johzzy/master 夏楚 2021-07-06 23:13:05 +08:00
• 986e9511a2 完善rtt相关代码 xiongziliang 2021-07-06 23:09:56 +08:00
• 4c296488f1 修复rtcp rr/sr时间戳转换相关问题,计算rtt ziyue 2021-07-06 21:48:51 +08:00
• 849a2a0de8 整合rtp ext相关定义. Johnny 2021-07-06 17:54:10 +08:00
• bf8642d62f 修复笔误：#955 ziyue 2021-07-06 11:16:59 +08:00
• 0838db5326 修复tcp server循环引用的问题 ziyue 2021-07-06 10:34:00 +08:00
• 4ef1fe2a1f 修复tcp服务器负载均衡机制失效的问题 xiongziliang 2021-07-05 22:33:21 +08:00
• 477dd17b5f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-07-05 21:15:24 +08:00
• 4a6c164d83 更新网络框架,解决负载不够均衡的问题 ziyue 2021-07-05 21:14:08 +08:00
• 1e4963b8fc 修正 Nack 回环检查 wxf 2021-07-02 15:56:35 +08:00
• b9fad1e5f3 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-07-02 14:56:21 +08:00
• 77ba24b59c 修改错误代码 ziyue 2021-07-02 14:55:22 +08:00
• c97678af0a webrtc播放触发流未找到事件，实现按需生成流 ziyue 2021-07-02 14:50:48 +08:00
• c426c702df Fix error: cannot bind packed field to T& wxf 2021-07-01 22:05:47 +08:00
• 81c5f5030a 新增作者 ziyue 2021-07-01 11:03:28 +08:00
• 1dd88fceaa Merge branch 'master' of https://github.com/lawrencehj/ZLMediaKit ziyue 2021-07-01 11:02:17 +08:00
• 1485be266a 查找MediaSource时，app与stream id不能为空 ziyue 2021-07-01 10:56:59 +08:00
• f1d89b5297 修正Windows下宏替换编译错误问题 lawrencehj 2021-07-01 10:39:28 +08:00
• 09fa6b7aae 精简代码 xiongziliang 2021-06-30 23:35:19 +08:00
• c470016316 优化MediaSource遍历性能 xiongziliang 2021-06-30 23:03:27 +08:00
• 69c3b24d06 优化遍历MediaSource接口性能 ziyue 2021-06-30 21:06:29 +08:00
• 4ec311652a 未找到依赖库时，关闭编译test_player ziyue 2021-06-29 18:37:09 +08:00
• ebb7aeef9b 播放器沿用之前名称 ziyue 2021-06-29 18:26:03 +08:00
• d8f75aee55 新增作者 ziyue 2021-06-29 18:20:18 +08:00
• 11e993d870 修改接口 ziyue 2021-06-29 18:19:05 +08:00
• 013109796d 确保线程安全 ziyue 2021-06-29 17:53:26 +08:00
• 1b674a6ac2 播放器新增支持音频:#945 ziyue 2021-06-29 17:44:35 +08:00
• 66f28f52b4 添加Ptr定义 ziyue 2021-06-29 17:42:32 +08:00
• df377fc1f4 修改宏定义，防止频繁重新全量编译 ziyue 2021-06-29 17:41:56 +08:00
• 509930ff0a Merge branch 'master' of https://github.com/DoubleX69/ZLMediaKit ziyue 2021-06-29 11:50:24 +08:00
• 3165a2f81c 修改服务器版本信息声明相关代码 ziyue 2021-06-29 11:16:05 +08:00
• 7375889b2e Update config.h 6.0 夏楚 2021-06-29 10:39:31 +08:00
• dfbfd65ab3 宏定义移至macros.h文件 ziyue 2021-06-28 20:29:56 +08:00
• de5cf86050 http最大请求加大到40 KB ziyue 2021-06-28 20:12:35 +08:00
• 397c1c7c57 整理宏 ziyue 2021-06-28 20:12:07 +08:00
• d4b3036446 add：增加Audio子目录及对应的库 DoubleX69 2021-06-28 17:51:58 +08:00
• 0263bb9b50 修改提示信息 DoubleX69 2021-06-28 17:51:08 +08:00
• 4edb015d2d add: 增加AudioPlayer播放音频 DoubleX69 2021-06-28 17:34:07 +08:00
• 5ac4e3cc72 add: 增加Audio相关代码 DoubleX69 2021-06-28 17:33:26 +08:00
• 7e5873d818 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-06-28 16:29:50 +08:00
• ded38fc3f6 Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-06-28 16:03:20 +08:00
• 48d82daa5c 添加bom头 ziyue 2021-06-28 16:02:13 +08:00
• 42d2c1b4c0 Merge pull request #941 from ZLMediaKit/feature/fix-cmake-prepend Xiaofeng Wang 2021-06-28 14:03:44 +08:00
• e1be491d4c Merge pull request #940 from ZLMediaKit/feature/fix-cmake-prepend Xiaofeng Wang 2021-06-28 14:03:33 +08:00
• f06faa7c02 cmake list PREPEND only from 3.15 support use append linux use link group solve link order error xgj 2021-06-28 11:12:14 +08:00
• 8cf58dd843 Revert "调整链接顺序, 修正编译问题" wxf 2021-06-28 13:53:28 +08:00
• cd7af6fa4e update ziyue 2021-06-28 11:31:11 +08:00
• 89fb4222ce 默认关闭编译webrtc ziyue 2021-06-28 10:46:03 +08:00
• 8f730b8dab 整理代码 ziyue 2021-06-28 10:35:08 +08:00
• 430229fe94 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev_test ziyue 2021-06-28 10:11:39 +08:00
• 02bd01c83b 完善http option命令 ziyue 2021-06-28 10:09:44 +08:00
• fae86a9b4b !11 合帧逻辑 加强判断，防止 SPS PPS VPS 作为一帧，rtmp h264/h265 打包 保证帧内必须有VCL Merge pull request !11 from xiongguangjie/dev 夏楚 2021-06-28 02:02:49 +00:00
• 3f36a10bee Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-06-26 18:28:31 +08:00
• d3f81745fd Merge pull request #936 from ZLMediaKit/feature/fix-workflow 夏楚 2021-06-26 18:16:45 +08:00
• c733e7af41 Merge pull request #935 from ZLMediaKit/feature/fix-compile 夏楚 2021-06-26 18:16:05 +08:00
• 72e8b6efa4 支持集成 WebRTC 功能 wxf 2021-06-26 17:58:00 +08:00
• 0a7acf94d3 明确使用的编译服务器版本 wxf 2021-06-26 17:57:05 +08:00
• b026634a3e 未启用 WebRTC 的情况下禁用相关测试用例 wxf 2021-06-26 17:10:42 +08:00
• a92b02907d 调整链接顺序, 修正编译问题 wxf 2021-06-26 16:55:30 +08:00
• 4609716ba3 Merge pull request #933 from CharleyWangHZ/master 夏楚 2021-06-26 03:55:17 +08:00
• c0f362af33 for linux compile --start-group and --end-group xiongguangjie 2021-06-25 22:03:52 +08:00
• 6d8d64caf6 for mergen xiongguangjie 2021-06-25 21:24:53 +08:00
• 8c670c652e 提前映射ssrc与rid的关系 ziyue 2021-06-25 18:08:21 +08:00
• 0f1d1ded7e rid支持更新 ziyue 2021-06-25 18:08:03 +08:00
• 365aead8b6 修复注释 ziyue 2021-06-25 17:24:32 +08:00
• edf30a04cf 优化代码 ziyue 2021-06-25 17:17:48 +08:00
• 89ef183647 精简代码 ziyue 2021-06-25 17:10:27 +08:00
• 423dd454ca 整理代码 ziyue 2021-06-25 17:02:58 +08:00
• 76ebf02ced 记录所有rtp的ssrc ziyue 2021-06-25 16:57:38 +08:00
• a7f75774e9 整理RtpReceiver相关代码 ziyue 2021-06-25 16:24:44 +08:00
• 18b7e45906 整理nack相关代码 ziyue 2021-06-25 15:43:47 +08:00
• 7406281c96 抽象RtpExtContext对象 ziyue 2021-06-25 15:31:13 +08:00
• 964cf39145 RtcpContext修改时间戳单位、整理WebRTC相关代码 ziyue 2021-06-25 14:59:27 +08:00
• 6c01cf336e 抽象MediaTrack与RtpChannel对象 ziyue 2021-06-25 14:37:11 +08:00
• ba672178b4 修复simulcast无法开启主码流的问题 ziyue 2021-06-25 13:23:10 +08:00
• 332e8fa180 Update HttpSession.cpp CharleyWangHZ 2021-06-25 11:17:21 +08:00
• 248c9e8f9a Update HttpSession.h CharleyWangHZ 2021-06-25 10:59:56 +08:00
• e3d17848f6 Update HttpSession.cpp CharleyWangHZ 2021-06-25 10:59:06 +08:00
• e7e7906ecd for firefox ingore ssrc is 0 xgj 2021-06-25 10:08:53 +08:00
• ebb947c698 完善simulcast与ssrc相关处理代码 ziyue 2021-06-24 17:54:16 +08:00
• 3862c8f1da 删除多余行 ziyue 2021-06-24 17:53:37 +08:00
• 74a935a8cd 完善simulcast播放统计功能 ziyue 2021-06-24 13:20:17 +08:00
• 7a02d2c8d6 不支持的rtp方向，answer sdp设置为inactive ziyue 2021-06-24 13:09:51 +08:00
• e9d28c1386 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev xgj 2021-06-24 11:53:15 +08:00
• a91f4d29f2 完善simulcast接收及处理 ziyue 2021-06-24 11:39:55 +08:00
• dcb91e3b50 初步支持simulcast流的接收和分流 ziyue 2021-06-23 21:44:04 +08:00