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

• ef0371ef94 修复编译警告 xia-chu 2021-04-20 17:32:22 +08:00
• 007c04d958 编译警告修复 xia-chu 2021-04-20 17:17:56 +08:00
• cce9de74d3 完善rtcp nack相关代码 xia-chu 2021-04-20 17:15:01 +08:00
• 31b6dde715 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-20 14:30:34 +08:00
• 9004ad7a60 修复老版本openssl编译问题 xiongziliang 2021-04-19 19:48:30 +08:00
• f69a23565d Merge remote-tracking branch 'github/master' into dev xiongziliang 2021-04-18 23:13:47 +08:00
• 4a6a3746dd 更新ZLToolKit xiongziliang 2021-04-18 23:11:08 +08:00
• 387574a802 rtp主动推流时不触发无人观看事件:#799 xiongziliang 2021-04-18 21:27:44 +08:00
• 980867965c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-04-18 21:04:10 +08:00
• 5fd23c4cf7 更新ZLToolKit xiongziliang 2021-04-18 21:03:20 +08:00
• 7884338b60 修复rtmp协议amf3不兼容的bug xiongziliang 2021-04-18 21:02:01 +08:00
• 77da999394 更新第三方库 xiongziliang 2021-04-15 21:45:00 +08:00
• 880b9139b0 性能优化 xia-chu 2021-04-15 19:46:45 +08:00
• d76c38ef72 调整264 rtp打包逻辑 xia-chu 2021-04-15 19:39:24 +08:00
• 9d385b36fd 优化多slice情况下关键帧判断逻辑 xia-chu 2021-04-15 19:37:13 +08:00
• e00fe51b26 关闭测试代码 xia-chu 2021-04-15 19:35:49 +08:00
• cc5dee0abf 优化sdp fmtp字段处理逻辑 xia-chu 2021-04-15 19:35:25 +08:00
• 46e3538dca Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev xia-chu 2021-04-15 16:22:21 +08:00
• 3150ccdb70 add some comment xgj 2021-04-15 14:08:25 +08:00
• bffee09639 fix more slice nal one frame result rtp mark error and sps pps rtp not has a mark Your Name 2021-04-15 13:54:03 +08:00
• 6e4dfaf53f fix webrtc h264 rtp Packetizer error xgj 2021-04-15 00:15:41 +08:00
• 7ce965af48 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-14 18:39:53 +08:00
• 765db1eb8b 添加rtcp fci相关代码 xia-chu 2021-04-14 16:19:46 +08:00
• c8e4c916bf Update issue templates 夏楚 2021-04-14 14:55:53 +08:00
• 7ad3bc854b Update issue templates 夏楚 2021-04-14 14:52:55 +08:00
• 8c0781d4bf Update issue templates 夏楚 2021-04-14 14:49:50 +08:00
• a4ba0c2b60 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-14 09:26:11 +08:00
• c4fd9e294a Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-14 09:25:56 +08:00
• 37096f8ed0 完善rtcp的定义 xiongziliang 2021-04-13 22:27:57 +08:00
• 29c8c9bf26 Merge remote-tracking branch 'origin/dev' into dev xia-chu 2021-04-13 18:51:16 +08:00
• f939e0a894 添加一些rtcp fci相关定义 xia-chu 2021-04-13 18:50:20 +08:00
• 136d126e74 Update RtpReceiver.cpp 夏楚 2021-04-13 08:28:23 +08:00
• 69148d28de Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-12 15:41:05 +08:00
• d619c33b1f Update issue templates 夏楚 2021-04-12 13:58:35 +08:00
• 46b84fcf39 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-12 13:48:34 +08:00
• a53c41fbb1 Update bug--.md 夏楚 2021-04-12 10:26:26 +08:00
• a9ad0552fd Update issue templates 夏楚 2021-04-12 10:25:20 +08:00
• 8a51bd2d9e 新增rtp ssrc异常处理逻辑 xia-chu 2021-04-11 20:35:00 +08:00
• 753fe05813 采用pts xiongziliang 2021-04-11 12:07:04 +08:00
• fbe8beb364 添加rtc相关配置与描述 xiongziliang 2021-04-11 12:06:55 +08:00
• 8b7289a689 rtsp推流支持关闭直接代理模式 xiongziliang 2021-04-11 12:06:40 +08:00
• 9e93561c77 只有linux平台打开链接顺序无关选项 xiongziliang 2021-04-11 11:53:05 +08:00
• 5fadd2665d 非windows平台，才忽略静态库链接顺序 xiongziliang 2021-04-11 11:44:16 +08:00
• bbe67e928e Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev xiongziliang 2021-04-11 11:42:45 +08:00
• e094a0bcae Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-04-11 11:41:27 +08:00
• 65f072a82b Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit xiongziliang 2021-04-11 11:40:22 +08:00
• 271b180004 修复流注册事件track和regist字段缺失的bug xiongziliang 2021-04-11 11:39:49 +08:00
• 1739980989 Merge remote-tracking branch 'china/dev' into dev xgj 2021-04-11 09:15:22 +08:00
• 012f58d27c 添加rtp 调试接口 xiongziliang 2021-04-11 01:15:02 +08:00
• 33da2e28ec 修复pt覆盖失败的bug xiongziliang 2021-04-11 01:14:41 +08:00
• ebf650cf4f fix static library link order xgj 2021-04-10 22:24:26 +08:00
• e495dfca64 修复忽略g711a(pt=0)的bug xiongziliang 2021-04-10 21:58:27 +08:00
• 5b7974a522 添加版权信息 xiongziliang 2021-04-09 20:42:36 +08:00
• b180ea0609 删除测试代码 xiongziliang 2021-04-09 20:42:05 +08:00
• f1c22c478f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-04-09 20:19:59 +08:00
• 9b57edff09 webrtc supported 夏楚 2021-04-09 20:10:57 +08:00
• e899064b2a 添加webrtc相关描述 夏楚 2021-04-09 19:58:40 +08:00
• 7378650620 修复windows下获取ssrc失败的bug xia-chu 2021-04-09 12:15:32 +08:00
• 38894097ae Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-09 10:47:14 +08:00
• 67eb75048c Update README.md 夏楚 2021-04-08 18:11:21 +08:00
• 67e1b1f194 媒体注册hook添加编码等信息 xia-chu 2021-04-08 17:34:13 +08:00
• b2afae0e8a 暂时屏蔽一些日志 xiongziliang 2021-04-07 21:02:28 +08:00
• 1650f63af5 生成answer sdp失败时，立即销毁对象 xiongziliang 2021-04-07 20:41:17 +08:00
• fb9eefca69 完善日志 xiongziliang 2021-04-07 20:40:42 +08:00
• 87e1209d0a 修复某些平台下，udp connect后sendto时指定对端地址发送失败的问题 xiongziliang 2021-04-07 20:33:53 +08:00
• a22a6bafb7 添加流量统计事件 xia-chu 2021-04-07 18:35:38 +08:00
• 0c5fa36e4d rtc推流添加媒体事件相关接口 xia-chu 2021-04-07 18:18:27 +08:00
• 155c59e17e 添加rtc类型的推流 xia-chu 2021-04-07 18:17:49 +08:00
• b96052d387 完善rtc异常管理 xia-chu 2021-04-07 17:51:06 +08:00
• d354c9466c rtc添加对rtcp bye支持 xia-chu 2021-04-07 17:21:59 +08:00
• f374f72312 添加rtcp bye相关代码 xia-chu 2021-04-07 16:45:50 +08:00
• 79267ae551 比对codec失败时，先关闭profile比对，再关闭codec比对 xiongziliang 2021-04-06 23:47:54 +08:00
• b5e6c12ee8 H264 profile比对不区分大小写 xiongziliang 2021-04-06 23:46:45 +08:00
• c9a20eda16 profile匹配失败时，优先选择相同编码格式的方案 xiongziliang 2021-04-06 23:22:22 +08:00
• 204ef6e204 匹配H264 profile xiongziliang 2021-04-06 23:21:46 +08:00
• a42b56ba94 兼容Firefox xiongziliang 2021-04-06 22:51:16 +08:00
• b5bf930467 调整cmake ziyue 2021-04-06 18:30:36 +08:00
• 9c552128a7 修复sdp中没ssrc时触发的bug ziyue 2021-04-06 18:29:14 +08:00
• 8edd093d68 添加bom头 ziyue 2021-04-06 17:23:13 +08:00
• 50ca789c0c 预留同时推流拉流的接口 xiongziliang 2021-04-05 11:32:38 +08:00
• 606f251311 修复音频相关的bug xiongziliang 2021-04-05 11:07:41 +08:00
• ce04a7279c 优化代码 xiongziliang 2021-04-05 00:12:46 +08:00
• 3c935e7fdd 优化代码 xiongziliang 2021-04-05 00:06:21 +08:00
• 6070654860 rtc播放时，比对采样率等信息 xiongziliang 2021-04-04 23:58:59 +08:00
• fe02f2cf1c rtc推流和播放添加事件触发 xiongziliang 2021-04-04 23:20:10 +08:00
• 49d8e2f825 http请求最大允许40KB数据 xiongziliang 2021-04-04 23:17:11 +08:00
• 09add8d351 修改为捕捉摄像头 xiongziliang 2021-04-04 23:14:42 +08:00
• 5f0aeaa32a 区分推流和播放 xiongziliang 2021-04-04 23:13:01 +08:00
• f33d3ba175 还原配置文件 xiongziliang 2021-04-04 23:12:35 +08:00
• c70721a520 修改rtp pt时，确保不影响其他播放器 xiongziliang 2021-04-04 21:42:11 +08:00
• 2abb5078f9 实现rtc转rtsp xiongziliang 2021-04-03 09:34:49 +08:00
• 130a06897f 整理并注释代码 xiongziliang 2021-04-03 08:45:18 +08:00
• cfda7d8ba6 整理代码并完善rtcp相关功能 xiongziliang 2021-04-03 08:32:20 +08:00
• e9c963dc82 添加部分rtcp代码 xiongziliang 2021-04-03 00:04:52 +08:00
• a176cb83a8 预留rtcp相关代码 xiongziliang 2021-04-02 23:12:37 +08:00
• 8c460bfcff 基本完成rtc转rtsp xiongziliang 2021-04-02 23:01:58 +08:00
• dc485c6211 支持根据情况选择是否发生rtp xiongziliang 2021-04-02 21:08:40 +08:00
• c42b678cab 完成rtc发送 xiongziliang 2021-04-02 20:35:43 +08:00
• 4a62314be9 完善 ziyue 2021-04-02 18:36:33 +08:00
• 9a2f2cbf2e 完善rtsp sdp匹配 ziyue 2021-04-02 18:28:01 +08:00