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

Mono Color

• 3dac9e1c51 srtp内部日志相关设置 xiongziliang 2021-03-27 23:42:44 +0800
• 8aa3ff425b 完善sdp相关定义 xiongziliang 2021-03-27 22:23:38 +0800
• 762cf227e5 初步添加sdp相关代码 ziyue 2021-03-27 18:33:20 +0800
• 272ab706b0 确保安全释放资源 ziyue 2021-03-27 10:16:49 +0800
• cc960a324f 支持多线程 ziyue 2021-03-27 10:07:06 +0800
• d0a1c72fda dtls环境自动初始化，支持多线程 ziyue 2021-03-27 10:03:19 +0800
• 0d4cc2fc65 srtp自动初始化，支持多线程 ziyue 2021-03-27 09:38:13 +0800
• bdf2783a6b 还原原始文件名 ziyue 2021-03-27 09:13:10 +0800
• 704421b728 完善 ziyue 2021-03-26 11:07:03 +0800
• 581ebfad71 添加测试web文件 ziyue 2021-03-25 16:03:28 +0800
• 65e470e060 初步添加rtsp转webrtc相关功能 ziyue 2021-03-24 16:52:41 +0800
• 2f0bdf2724 修复32位编译时，websocket相关bug ziyue 2021-03-21 18:22:32 +0800
• f2edf354de rtmp支持更新config帧 xiongziliang 2021-03-21 16:50:15 +0800
• c5b0485519 修复sps太长生成sdp异常的问题 ziyue 2021-03-18 16:10:46 +0800
• 51ac93a08c rtp超时检测最多暂停5分钟 更新zltoolkit ziyue 2021-03-16 15:37:34 +0800
• 060b654252 修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟 ziyue 2021-03-16 11:30:51 +0800
• d475191dc7 修复过早启动时间戳线程的bug ziyue 2021-03-16 10:52:43 +0800
• 28e6dd9e02 修复过早启动时间戳线程的bug ziyue 2021-03-16 10:50:08 +0800
• a0fc494ee3 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit xiongziliang 2021-03-14 10:34:33 +0800
• be8403c31c 完善代码 xiongziliang 2021-03-14 10:29:17 +0800
• 29ebcaf3e9
  Merge pull request #767 from sunhui2013/master 夏楚 2021-03-14 10:05:22 +0800
• ce80edffd2 增加支持TCP暂停 sunhui 2021-03-11 10:05:53 +0800
• f5e8bae760 解决不指定流或者TCP暂停断流问题 sunhui 2021-03-10 23:17:15 +0800
• c0f4899950 录制接口支持指定切片时间大小:#747 xiongziliang 2021-03-07 10:41:57 +0800
• daedbed737 更新第三方库 xiongziliang 2021-03-07 10:16:39 +0800
• 378ab47250 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit xiongziliang 2021-03-07 10:08:28 +0800
• 5064137a22 简化代码 xiongziliang 2021-03-07 10:05:52 +0800
• 5b4fe604cb 修复编译警告 xiongziliang 2021-03-07 10:05:23 +0800
• bd9769d215 兼容rtmps rtsps的推流地址 xiongziliang 2021-03-07 10:04:58 +0800
• 43828d4390 兼容某些rtmp流 xiongziliang 2021-03-07 10:04:27 +0800
• 43f2245587
  Merge pull request #758 from rmokerone/master 夏楚 2021-03-07 10:03:24 +0800
• e91f2e60c7 修改submodules源为gitee vroot 2021-03-07 09:45:58 +0800
• e6f28f7cd7 使用URL替换相对路径，避免其余项目的fork vroot 2021-03-05 18:24:09 +0800
• 9b7c9b9109 兼容sdp不规范的rtsp流 xia-chu 2021-02-28 21:02:23 +0800
• 6548f7959f 更新第三方库 xiongziliang 2021-02-28 21:02:55 +0800
• fb3603b433 兼容一些不规范的流 xiongziliang 2021-02-28 20:58:30 +0800
• 56f044f8ed 修复线程安全bug xiongziliang 2021-02-28 20:58:25 +0800
• 8d50d3c397 分包逻辑添加边界检测代码 xia-chu 2021-02-21 22:24:46 +0800
• ef46945de6 恢复使用jemalloc库 xia-chu 2021-02-21 21:38:24 +0800
• 0c728827aa 添加全局内存统计功能 xia-chu 2021-02-21 21:28:17 +0800
• a19f67679a 兼容一些rtsp流 #735 xia-chu 2021-02-21 21:27:26 +0800
• 19f3b1bd6f 防止打印过多调试信息 xia-chu 2021-02-21 21:26:45 +0800
• 8d122625c5 修复28181相关bug：#731 xia-chu 2021-02-09 14:19:07 +0800
• b7f4eae2bc 修复bug xia-chu 2021-02-09 14:01:10 +0800
• e4904623a7 修复rtmp兼容性bug xia-chu 2021-02-07 23:01:22 +0800
• 1f52c727ca 修复编译警告 xia-chu 2021-02-07 22:56:36 +0800
• a142665375 确保线程安全 xia-chu 2021-02-07 22:02:03 +0800
• 75d97b9221 优化H264 rtp相关代码 xia-chu 2021-02-07 18:29:48 +0800
• 80bcf53ccf 更新ZLToolKit并适配代码 xia-chu 2021-02-07 14:55:09 +0800
• 14b318525e 添加rtp rtmp个数统计 xia-chu 2021-02-05 16:49:11 +0800
• 62ba87dd0f 优化frame性能及整理代码 xia-chu 2021-02-05 11:51:16 +0800
• c5cfbce241 优化rtp性能 xia-chu 2021-02-05 11:28:50 +0800
• b0e1d5d6aa 重写rtp去冲突逻辑 xia-chu 2021-02-04 18:20:59 +0800
• d6fc56d950 时间戳异常时,确保合并帧逻辑正常：#724 xia-chu 2021-02-04 18:14:53 +0800
• 52480717e3 p帧时间戳异常时确保rtmp播放正常:#724 xia-chu 2021-02-04 18:13:33 +0800
• 34bbfc8bcb 修复编译警告 xia-chu 2021-02-04 18:09:06 +0800
• 1b24832a44 release编译不再链接jemalloc(实测发现使用jemalloc后性能降低) xia-chu 2021-02-04 17:59:53 +0800
• bc6286553a 优化rtmp性能 xia-chu 2021-02-04 17:58:51 +0800
• 827158af73 防止未开启录制功能时，使用该功能导致的bug xia-chu 2021-02-03 15:32:08 +0800
• 2b3ce0ec63 流量统计事件确保0字节时也能触发 xia-chu 2021-02-03 14:04:33 +0800
• b26f876cbb 添加c api推流测试程序:#716 xia-chu 2021-02-02 15:11:26 +0800
• 2b971a188d 完善c api xia-chu 2021-02-02 15:11:16 +0800
• 39229f9e39 修复rtp padding相关bug:#722 xia-chu 2021-02-02 12:00:03 +0800
• 3298184c5c 添加打印rtp详情功能 xia-chu 2021-02-02 11:54:49 +0800
• 1539e4ed60 优化rtsp性能 xia-chu 2021-02-02 10:33:56 +0800
• e4126809a6 实现28181 rtcp保活:#429 xia-chu 2021-02-01 09:55:13 +0800
• bba18156ea 更新第三方库，完善fmp4直播:#664 xiongziliang 2021-01-31 21:16:58 +0800
• e695d76ce9 整理代码 xiongziliang 2021-01-31 21:09:25 +0800
• ddd3438fc3 添加bom头 xiongziliang 2021-01-31 20:46:55 +0800
• eef5407aab 性能优化 xiongziliang 2021-01-31 20:36:19 +0800
• 7745cdb8fc 更新zltoolkit xiongziliang 2021-01-31 20:28:33 +0800
• 8db9f86a0a 防止重复添加RtcpContext xiongziliang 2021-01-31 19:56:18 +0800
• 51435d955c 优化rtp统计性能 xiongziliang 2021-01-31 19:55:47 +0800
• 070bf19cb5 重写rtp框架 xiongziliang 2021-01-31 19:19:24 +0800
• 5175c52abe 修复编译警告 xiongziliang 2021-01-31 19:19:08 +0800
• 4d6d56f2b7 消除编译警告 xiongziliang 2021-01-31 19:18:50 +0800
• 5c6560f55d 重写rtcp框架 xiongziliang 2021-01-31 19:18:17 +0800
• 629c39685b rtp打包添加mark位:#713 xiongziliang 2021-01-31 18:48:28 +0800
• ae8588089d 修复windows下组播拉流失败的问题:#708 xiongziliang 2021-01-31 18:38:11 +0800
• 837597e162 防止可能内存越界的问题 xiongziliang 2021-01-31 18:25:12 +0800
• 4c1f7babad 完善代码 xiongziliang 2021-01-31 18:24:41 +0800
• 0f39565f67 修复http直播不发送content-type的问题 xiongziliang 2021-01-31 18:24:03 +0800
• bad9553ec4 统计TcpServer个数 xiongziliang 2021-01-24 21:59:55 +0800
• 272d1a8bd9 兼容一些rtmp推流器: #692 xiongziliang 2021-01-23 10:06:38 +0800
• aa45590c13 添加对象统计接口 xiongziliang 2021-01-23 09:44:37 +0800
• 291caf537a H265 rtp支持聚合包 xiongziliang 2021-01-23 09:43:16 +0800
• fc8462bef1 完善性能测试工具 xiongziliang 2021-01-23 09:42:45 +0800
• af2481c619 ffmpeg拉流支持指定命令模板 xiongziliang 2021-01-23 09:42:15 +0800
• 7c8b3dd8f9
  Merge pull request #2 from xia-chu/master ixlm 2021-01-21 09:19:37 +0800
• f63b2b1863 去除编译警告，修复bug xia-chu 2021-01-19 16:05:38 +0800
• 5d752c89b5 修复编译问题 xiongziliang 2021-01-17 20:15:08 +0800
• b6cbc87712 全面整理代码，去除编译警告 xia-chu 2021-01-17 18:31:50 +0800
• fb1e35a39a 添加bom头 xiongziliang 2021-01-17 10:35:01 +0800
• 3ff802c2ea 更新ZLToolKit xiongziliang 2021-01-17 10:32:47 +0800
• 03d0b6a9ed 添加拉流代理性能测试工具 xiongziliang 2021-01-17 10:32:33 +0800
• b2fe8c926c 完善代码 xiongziliang 2021-01-17 10:29:29 +0800
• 4cae88e242 调整代码 xiongziliang 2021-01-17 10:28:52 +0800
• d879c5901d 延迟清空状态 xiongziliang 2021-01-17 10:28:06 +0800
• c445ad2cdf 修复rtsp播放器在处理rtp包时，清空状态导致的bug xiongziliang 2021-01-17 10:25:00 +0800
• 2dd87c8b59 修复直接拉流代理失效的bug xiongziliang 2021-01-17 10:22:51 +0800