ZLMediaKit

amass/ZLMediaKit

Fork 0

mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-12-03 00:33:04 +08:00

Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

feature/async_write_file

feature/dynamic_codec

feature/dynamic_library

feature/hls_record_disk

feature/log_context

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

#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

#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

#3924

#3926

#3929

#3934

#3936

#3936

#3937

#3964

#3965

#3965

#397

#3980

#3985

#3986

#3986

#3990

#3991

#3992

#3996

#4

#4

#4003

#4008

#4018

#4019

#4028

#4029

#4031

#4032

#4033

#4034

#4035

#4039

#4042

#4043

#4048

#4048

#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

9f25392f69 精简api命名 xia-chu 2021-05-07 14:01:24 +0800
2e8a7be5ea 完善rtp ext相关代码 xia-chu 2021-05-07 12:00:26 +0800
b2be30fd51 添加bom头 xia-chu 2021-05-07 11:19:12 +0800
d337b8d864 添加rtp ext解析相关代码 xia-chu 2021-05-06 16:25:18 +0800
842257edaa 完善rtcp ext xia-chu 2021-05-06 12:02:16 +0800
cbee3210a0 完善twcc fci xia-chu 2021-05-06 12:01:56 +0800
f9ebd82e6d 支持更多rtp ext xia-chu 2021-05-06 10:54:06 +0800
521d9f906b 完善remb相关控制代码 xia-chu 2021-05-06 10:40:21 +0800
6292824e34 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-30 18:05:48 +0800
af59fdeb86 addStreamProxy接口支持超时参数 xia-chu 2021-04-30 18:01:48 +0800
c77c4cfd4d sdp相关特性暴露成常量 xia-chu 2021-04-30 15:15:35 +0800
dc2c882994 添加remb开关 xia-chu 2021-04-30 15:08:43 +0800
8f17fcdf1d remb改成固定间隔发送 xia-chu 2021-04-30 14:49:06 +0800
6274cbdd28 统一代码风格 xia-chu 2021-04-30 14:31:08 +0800
1d0eca512b !6 优化rtsp推流单个Track其他协议的注册速度，不需要等待3s Merge pull request !6 from xiongguangjie/dev 夏楚 2021-04-30 14:29:36 +0800
e58b9f7faf Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-30 14:14:49 +0800
3da874b6a1 修复错误拼写、加快流注册速度 xia-chu 2021-04-23 16:37:08 +0800
e8a409b811 更新链接地址 xia-chu 2021-04-30 11:41:58 +0800
8e9d7a9fd5 作者列表勘误 xia-chu 2021-04-30 11:41:35 +0800
3cc640f96e 删除无效配置 xia-chu 2021-04-30 09:24:09 +0800
af5195374a 更新链接地址 xia-chu 2021-04-30 11:41:58 +0800
7ebdce38e9 作者列表勘误 xia-chu 2021-04-30 11:41:35 +0800
88e1c323c3 删除无效配置 xia-chu 2021-04-30 09:24:09 +0800
5145c7e658 optimize one track ready speed not wait 3000ms xgj 2021-04-29 18:36:04 +0800
dbf2cd013c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-28 18:02:02 +0800
839420814e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit xia-chu 2021-04-28 17:34:41 +0800
adc3d74344 修复bug xia-chu 2021-04-28 17:32:16 +0800
6ef69d4ef1 修复bug xia-chu 2021-04-28 17:32:16 +0800
e021279fab 修复"Too short data for FU-A H.264 RTP packet"的问题 xia-chu 2021-04-28 16:07:01 +0800
514a028eac 修复fu-a打包时，无rtp负载的情况 xia-chu 2021-04-28 16:03:05 +0800
726e909601 支持remb控制推流比特率 xia-chu 2021-04-28 15:41:36 +0800
9396270ce2 添加twcc相关api xia-chu 2021-04-28 15:07:15 +0800
ac55ae79fb 修复fci内存越界问题 xia-chu 2021-04-28 13:55:00 +0800
61afc57ed1 修复编译问题 xiongziliang 2021-04-27 23:05:04 +0800
26cd5660cd sdp返回真实ip和端口 xia-chu 2021-04-27 01:16:01 +0800
1d84bb5458 完善twcc相关逻辑 xia-chu 2021-04-26 21:50:31 +0800
6c951c8ca9 完善rtcp padding相关逻辑 xia-chu 2021-04-26 21:50:10 +0800
2d8ef45e4d 完善fci相关代码 xia-chu 2021-04-26 21:03:04 +0800
aa54adb1ab 修复编译问题 xia-chu 2021-04-26 20:29:06 +0800
cf520491fa Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-26 19:50:17 +0800
86afa379c4 更新zltoolkit,修复gcc下编译问题 xia-chu 2021-04-26 19:24:28 +0800
af2b1246fd 统一帧合并逻辑 xia-chu 2021-04-26 18:26:07 +0800
d005ccf396 更新zltoolkit xia-chu 2021-04-26 18:24:34 +0800
a28c76a33c 限制未就绪状态track的最大帧缓存数量 xia-chu 2021-04-26 14:58:06 +0800
fbc8c2286e 等待添加fci相关适配代码 xia-chu 2021-04-23 18:30:37 +0800
8702ad101b 完善rtcp feedback相关代码 xia-chu 2021-04-23 18:27:47 +0800
caceb90b40 修复错误拼写、加快流注册速度 xia-chu 2021-04-23 16:37:08 +0800
93160c0ec7 添加rtpfb枚举与工具类 xia-chu 2021-04-23 15:25:33 +0800
48338af700 完善FCI相关代码 xia-chu 2021-04-23 15:06:55 +0800
743862d786 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-23 09:43:08 +0800
259247132a Merge remote-tracking branch 'origin/master' xiongziliang 2021-04-22 22:13:17 +0800
f70bfb5f8b 兼容GB28181 tcp推流缓存覆盖的垃圾设备 xiongziliang 2021-04-22 22:02:21 +0800
99a1d06d9b 修正TWCC错误理解 xia-chu 2021-04-22 18:56:12 +0800
90ad90cb78 初步完成TWCC包的解析 xia-chu 2021-04-22 17:34:26 +0800
5db6154707 添加TWCC部分代码 xia-chu 2021-04-22 11:43:33 +0800
dc3d59952e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-20 17:58:21 +0800
0bb87858a3 提升单track情况下秒开体验 xia-chu 2021-04-20 17:53:43 +0800
9b951ab69a 单track情况下最多等待3秒 xia-chu 2021-04-20 17:32:40 +0800
ef0371ef94 修复编译警告 xia-chu 2021-04-20 17:32:22 +0800
007c04d958 编译警告修复 xia-chu 2021-04-20 17:17:56 +0800
cce9de74d3 完善rtcp nack相关代码 xia-chu 2021-04-20 17:15:01 +0800
31b6dde715 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-20 14:30:34 +0800
9004ad7a60 修复老版本openssl编译问题 xiongziliang 2021-04-19 19:48:30 +0800
f69a23565d Merge remote-tracking branch 'github/master' into dev xiongziliang 2021-04-18 23:13:47 +0800
4a6a3746dd 更新ZLToolKit xiongziliang 2021-04-18 23:11:08 +0800
387574a802 rtp主动推流时不触发无人观看事件:#799 xiongziliang 2021-04-18 21:27:44 +0800
980867965c Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-04-18 21:04:10 +0800
5fd23c4cf7 更新ZLToolKit xiongziliang 2021-04-18 21:03:20 +0800
7884338b60 修复rtmp协议amf3不兼容的bug xiongziliang 2021-04-18 21:02:01 +0800
77da999394 更新第三方库 xiongziliang 2021-04-15 21:45:00 +0800
880b9139b0 性能优化 xia-chu 2021-04-15 19:46:45 +0800
d76c38ef72 调整264 rtp打包逻辑 xia-chu 2021-04-15 19:39:24 +0800
9d385b36fd 优化多slice情况下关键帧判断逻辑 xia-chu 2021-04-15 19:37:13 +0800
e00fe51b26 关闭测试代码 xia-chu 2021-04-15 19:35:49 +0800
cc5dee0abf 优化sdp fmtp字段处理逻辑 xia-chu 2021-04-15 19:35:25 +0800
46e3538dca Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev xia-chu 2021-04-15 16:22:21 +0800
3150ccdb70 add some comment xgj 2021-04-15 14:08:25 +0800
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 +0800
6e4dfaf53f fix webrtc h264 rtp Packetizer error xgj 2021-04-15 00:15:41 +0800
7ce965af48 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-14 18:39:53 +0800
765db1eb8b 添加rtcp fci相关代码 xia-chu 2021-04-14 16:19:46 +0800
c8e4c916bf Update issue templates 夏楚 2021-04-14 14:55:53 +0800
7ad3bc854b Update issue templates 夏楚 2021-04-14 14:52:55 +0800
8c0781d4bf Update issue templates 夏楚 2021-04-14 14:49:50 +0800
a4ba0c2b60 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-14 09:26:11 +0800
c4fd9e294a Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-14 09:25:56 +0800
37096f8ed0 完善rtcp的定义 xiongziliang 2021-04-13 22:27:57 +0800
29c8c9bf26 Merge remote-tracking branch 'origin/dev' into dev xia-chu 2021-04-13 18:51:16 +0800
f939e0a894 添加一些rtcp fci相关定义 xia-chu 2021-04-13 18:50:20 +0800
136d126e74 Update RtpReceiver.cpp 夏楚 2021-04-13 08:28:23 +0800
69148d28de Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-12 15:41:05 +0800
d619c33b1f Update issue templates 夏楚 2021-04-12 13:58:35 +0800
46b84fcf39 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-12 13:48:34 +0800
a53c41fbb1

Update bug--.md 夏楚 2021-04-12 10:26:26 +0800
a9ad0552fd Update issue templates 夏楚 2021-04-12 10:25:20 +0800
8a51bd2d9e 新增rtp ssrc异常处理逻辑 xia-chu 2021-04-11 20:35:00 +0800
753fe05813 采用pts xiongziliang 2021-04-11 12:07:04 +0800
fbe8beb364 添加rtc相关配置与描述 xiongziliang 2021-04-11 12:06:55 +0800
8b7289a689 rtsp推流支持关闭直接代理模式 xiongziliang 2021-04-11 12:06:40 +0800
9e93561c77 只有linux平台打开链接顺序无关选项 xiongziliang 2021-04-11 11:53:05 +0800