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

• faa43adbbc Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev_test ziyue 2021-06-23 17:32:26 +08:00
• 307be4339f Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test ziyue 2021-06-23 17:32:09 +08:00
• eece9dc51a Create requirement.md 夏楚 2021-06-23 12:03:43 +08:00
• 0eecb3be6c Merge pull request #927 from ZLMediaKit/feature/fix-compile-el7 夏楚 2021-06-23 11:56:08 +08:00
• 8717cd2f3d 优化代码 ziyue 2021-06-23 11:09:53 +08:00
• d9de40526d 解决开启rtp推流鉴权导致udp丢包的问题，提升GB28181推流秒开体验 ziyue 2021-06-23 11:02:39 +08:00
• 0d4ac4f655 spec: Fix openssl directory wxf 2021-06-23 10:11:30 +08:00
• b34226b785 spec: WebRTC requires openssl >= 1.1 wxf 2021-06-23 10:00:46 +08:00
• 549b07f598 spec: Enable WebRTC wxf 2021-06-23 09:44:37 +08:00
• f5786fcba3 兼容 glibc < 2.18 wxf 2021-06-23 10:34:02 +08:00
• e8c9666af0 支持hls直播文件延时删除: #913 ziyue 2021-06-23 10:25:09 +08:00
• ce2122d3b6 优化rtmp chunk相关处理代码 xiongziliang 2021-06-22 10:39:16 +08:00
• 510d908bc4 rtp服务器支持opus推流 ziyue 2021-06-21 20:32:13 +08:00
• c90f348801 RTP服务器支持ES混合流, 同时新增H265/G711的支持 ziyue 2021-06-21 19:58:59 +08:00
• caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-21 17:51:15 +08:00
• 8375064a90 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-21 17:50:05 +08:00
• 25b2208f34 Merge pull request #921 from johzzy/johnny/dev Xiaofeng Wang 2021-06-20 09:10:08 +08:00
• 89d8f005f8 fix: fix typo. Johnny 2021-06-19 23:56:17 +08:00
• 9b111fac62 add to do for h265 rtmp xiongguangjie 2021-06-19 02:01:28 +08:00
• d215502ff5 rtmp packet must has vlc when flush xiongguangjie 2021-06-19 01:54:57 +08:00
• a28aeb2148 for frame merge must has vlc(video codec layer) data and flush rtmp a frame must has vcl xiongguangjie 2021-06-19 01:27:13 +08:00
• e3708e744e Merge pull request #918 from ZLMediaKit/feature/fix-sdp-candidate-parse 夏楚 2021-06-18 17:07:08 +08:00
• 05c9a842a9 !10 对h264 一帧多slice （多nal）fmp4播放卡顿（vlc） Merge pull request !10 from xiongguangjie/dev 夏楚 2021-06-18 07:27:52 +00:00
• 2335043cdf drop SEI and AUD for h264 and h265 avoid sei as a frame xgj 2021-06-18 15:19:21 +08:00
• 5fc5a9ef5f webrtc: 修正 sdp 中 candidate 解析问题 wxf 2021-06-18 13:36:25 +08:00
• a6e9652da8 for h264/h265 judge a frame start more safe(h264 is first_mb_in_slice h265 is first_slice_segment_in_pic_flag) and for h265 only idr is key frame xgj 2021-06-18 12:40:42 +08:00
• 3429690d75 for h264 pps sps aud sei not check first_mb_in_slice xgj 2021-06-17 19:26:58 +08:00
• 1920802764 for h264 multi slice on frame compatibility xgj 2021-06-17 18:08:35 +08:00
• e0d162c460 Merge remote-tracking branch 'origin/dev' into dev xgj 2021-06-17 16:15:51 +08:00
• f8467f21fb 推流失败时打印日志 ziyue 2021-06-17 11:34:24 +08:00
• 60a2346819 媒体源注销后不做无谓推流重试 ziyue 2021-06-17 11:32:57 +08:00
• e4172b4ab1 更新postman api配置文件 ziyue 2021-06-17 11:03:11 +08:00
• 752590f804 完善addStreamPusherProxy相关功能并修复自动删除相关的bug ziyue 2021-06-17 10:59:58 +08:00
• aa39680c69 addStreamPusherProxy接口修改key唯一性规则,新增rtsp推流类型、超时参数 ziyue 2021-06-17 10:41:26 +08:00
• eef0c31d7b addStreamProxy新增重试次数参数 ziyue 2021-06-17 10:39:22 +08:00
• 936c6f7965 调整代码细节 ziyue 2021-06-17 10:12:34 +08:00
• 06023f1770 Merge pull request #916 from ZLMediaKit/dev-monk 夏楚 2021-06-17 09:52:49 +08:00
• cd7ae27276 添加推流代理器 monktan 2021-06-16 19:40:08 +08:00
• fadef1cac3 完善添加track日志打印 ziyue 2021-06-16 11:39:46 +08:00
• 807f9626d5 webrtc新增对av1的支持 ziyue 2021-06-16 11:14:10 +08:00
• a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-16 10:40:17 +08:00
• d67060e97b mk_media_stop_send_rtp支持关闭单路流 ziyue 2021-06-16 10:36:53 +08:00
• 14d70426ed 加快GB28181推流时注册速度 ziyue 2021-06-16 10:26:17 +08:00
• a09de23271 修复调用mk_media_stop_send_rtp函数导致崩溃的bug ziyue 2021-06-16 10:14:24 +08:00
• 4d0db1b7c1 兼容时间戳不规范的H265流：#894 ziyue 2021-06-15 12:55:55 +08:00
• 98d9dcd009 when link ssl with static library add ld link like this cmake .. -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR=/usr/local/ssl -DOPENSSL_USE_STATIC_LIBS=TRUE xgj 2021-06-11 11:57:55 +08:00
• 5b8b5c0ed5 for ssl static link add ld library link xgj 2021-06-11 11:04:43 +08:00
• 24ab876fdb 修复重连时，创建多个mp4解复用器导致内存增长的bug:#895 ziyue 2021-06-10 14:45:26 +08:00
• 92f879d703 完善PlayerProxy关闭机制,重试次数超限后自动关闭 ziyue 2021-06-09 15:01:45 +08:00
• ad2cd11eec 优化判断h265是否为关键帧的代码 ziyue 2021-06-09 10:18:47 +08:00
• ca192a4286 H265 I帧多slice情况下导致花屏问题 baiyfcu 2021-06-09 09:51:28 +08:00
• b0af056356 删除过多的日志 ziyue 2021-06-08 21:06:14 +08:00
• 55c2b08c57 rtsp播放器在udp情况下超时时间延长4倍(防止vlc超时) ziyue 2021-06-08 20:51:54 +08:00
• 98dc9bc78e ssrc切换时间改为3秒:#899 ziyue 2021-06-08 20:05:45 +08:00
• 40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-08 17:52:44 +08:00
• 6ccf512367 完善内存统计 ziyue 2021-06-08 17:48:52 +08:00
• 9c3ec4b4ed 更新zltoolkit,修复Windows下编译问题 ziyue 2021-06-08 17:45:59 +08:00
• 868fb6e587 更新zltoolkit,修复RtpServer在tcp模式下崩溃的bug ziyue 2021-06-08 17:33:23 +08:00
• 0593f65fcb 完善代码 ziyue 2021-06-08 14:50:12 +08:00
• e88281b2ff 删除无效代码 ziyue 2021-06-08 14:49:48 +08:00
• 89d0a9dedf 屏蔽动态添加配置文件的特性 ziyue 2021-06-08 14:49:32 +08:00
• 9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev ziyue 2021-06-08 14:41:52 +08:00
• edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-08 14:40:51 +08:00
• 511aa2207f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-06-08 14:27:10 +08:00
• c4817c6d5f GB28181单端口接收流支持多线程 ziyue 2021-06-08 14:03:25 +08:00
• 92736db5b2 适配zltoolkit ziyue 2021-06-08 11:29:32 +08:00
• 8721c5a62b for joy4 rtmp push onMetaData compatibility xgj 2021-06-08 10:07:51 +08:00
• bb37bce3ac update zlmrtcclient.js xgj 2021-06-07 18:40:47 +08:00
• 0f3a8f4a9d fix webrtc to rtmp multi slice on frame error xgj 2021-06-07 17:32:28 +08:00
• d74779dc02 set server config can dynamic add config for add multi ffmpeg cmd template xgj 2021-06-04 18:06:40 +08:00
• 2ee7f67b5b 修复windows set FD 1024未生效BUG#898 baiyfcu 2021-05-31 16:51:43 +08:00
• c3354a3df6 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-05-31 14:18:48 +08:00
• 5eb00d5fab 修复windows下获取errno失败导致崩溃的bug:#889 ziyue 2021-05-26 16:26:09 +08:00
• 8f62365847 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-05-26 10:43:52 +08:00
• 3b4e7619ad Merge pull request #865 from yapingcat/master 夏楚 2021-05-22 11:04:50 +08:00
• f034dbf1fa Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-05-22 10:26:21 +08:00
• 9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-05-22 10:25:05 +08:00
• 975c11b74c 支持http响应无content-length字段的情况:#850 xiongziliang 2021-05-22 10:22:56 +08:00
• 7067472a18 转协议支持全局关闭音频:#883 xiongziliang 2021-05-22 10:17:52 +08:00
• b7e6bfb574 hook接口在http头中附带vhost:#872 xiongziliang 2021-05-22 09:53:31 +08:00
• 7641db4225 getMediaList等接口返回录制状态:#876 xiongziliang 2021-05-22 09:31:59 +08:00
• f54e02f511 修复http文件服务器相关bug xiongziliang 2021-05-22 09:28:19 +08:00
• 8cbec43ee8 合并代码 xiongziliang 2021-05-22 09:26:49 +08:00
• a391d1e289 修复rtsp推流带参相关的bug:#840 xiongziliang 2021-05-22 09:25:24 +08:00
• 08d4edddb0 修复http文件服务器相关bug xiongziliang 2021-05-22 09:13:00 +08:00
• d74589945a 还原 ziyue 2021-05-19 18:39:23 +08:00
• 3c49b3737e fix bug rtcp sr包的 ssrc 和rtp包中的一致 yapingcat 2021-05-17 09:20:03 +08:00
• 5b57b9d6ae 确保rtc播放不强引用rtsp直播源 xiongziliang 2021-05-16 22:13:08 +08:00
• 44b0e13ba7 完善打印svc tid xiongziliang 2021-05-16 22:12:26 +08:00
• c6d2b41d97 完善rtp ext相关处理方法 xiongziliang 2021-05-16 21:49:46 +08:00
• 5f05df98b0 添加获取类型方法 xiongziliang 2021-05-16 21:17:55 +08:00
• a84bcec4aa 完善rtp ext处理相关逻辑 xiongziliang 2021-05-16 20:56:03 +08:00
• bda378c340 完善发送rtx rtp处理 xiongziliang 2021-05-16 18:06:34 +08:00
• 7cdd5ed9df 修复rtx包未修改rtp ext id的问题 xiongziliang 2021-05-16 16:59:12 +08:00
• d4ff84e447 完善ssrc相关处理 xiongziliang 2021-05-16 16:12:10 +08:00
• f6eb84b413 添加ssrc相关方法 xiongziliang 2021-05-16 12:28:50 +08:00
• d395d23eeb 由于在RtspSession类确保了函数执行顺序，所以回滚多余代码也能确保单track流迅速注册 xiongziliang 2021-05-15 10:05:47 +08:00
• 4cd618899b Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-05-15 10:02:58 +08:00
• 259e9dab07 更新ZLToolKit xiongziliang 2021-05-15 09:59:36 +08:00
• 125b703ea9 Merge remote-tracking branch 'origin/master' xiongziliang 2021-05-15 09:57:21 +08:00