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

#4035

#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

• 6a64917427 添加播放恢复事件 xiongziliang 2019-05-08 15:27:37 +0800
• 3e0e0ce2aa 初步添加RTCP包接收接口已经发送接口 xiongziliang 2019-05-08 15:08:57 +0800
• 7997c06010 初步添加RTCP包接收接口 xiongziliang 2019-05-08 14:23:18 +0800
• 962dca081c 提高rtsp客户端兼容性问题 xiongziliang 2019-05-05 12:06:12 +0800
• 5979752fa1 hls切片以系统时间戳为准 xiongziliang 2019-04-29 11:26:14 +0800
• ebfcd86875 修复Socket onErr事件发送数据导致递归触发的bug xiongziliang 2019-04-25 15:17:26 +0800
• 8d70e0769c 更新ZLToolKit xiongziliang 2019-04-24 16:13:37 +0800
• 4d1a0e47c8 删除多余代码逻辑 xiongziliang 2019-04-24 12:03:20 +0800
• df4989cc38 RTP最大支持1604个字节 xiongziliang 2019-04-24 11:55:00 +0800
• c0d3185a38 添加RTP异常包处理逻辑 xiongziliang 2019-04-24 11:40:54 +0800
• 9ce5c146a9 更新ZLToolKit(修复编译问题) xiongziliang 2019-04-24 11:15:43 +0800
• d295d9bd4c 忽略一些无效rtp包 xiongziliang 2019-04-24 09:25:08 +0800
• 0f6d4ca629 优化http客户端内存占用 xiongziliang 2019-04-23 12:25:10 +0800
• 5dfb7663e4 优化http服务器和客户端内存占用 xiongziliang 2019-04-23 12:22:59 +0800
• 74621618ff 优化http/rtsp推流器/rtmp推流器内存占用 xiongziliang 2019-04-23 12:16:14 +0800
• ebd2ed2d97 优化rtsp/http/rtmp服务器内存占用 xiongziliang 2019-04-23 11:52:40 +0800
• bb9a02b817 优化rtsp服务器内存占用 xiongziliang 2019-04-23 11:43:48 +0800
• 846c25b525 Merge remote-tracking branch 'origin/master' xiongziliang 2019-04-22 11:20:35 +0800
• 7fddb722f0 更新ZLToolKit(兼容老版本openssl) xiongziliang 2019-04-22 11:20:27 +0800
• b9bd5c34db
  Update README.md 夏楚 2019-04-18 09:31:57 +0800
• 2ad9c44ddf 更新ZLToolKit xiongziliang 2019-04-17 10:51:17 +0800
• c355ca51bf 优化http服务器目录菜单生成 http文件服务器路径目录支持无/结尾 xiongziliang 2019-04-17 10:32:49 +0800
• bc1a79038c 更新ZLToolKit(完善ssl相关) xiongziliang 2019-04-16 17:25:19 +0800
• a266123365 更新ZLToolKit(复用Buffer提升性能) xiongziliang 2019-04-12 09:49:14 +0800
• eea71b659d ssrc切换后清空rtp排序缓存 xiongziliang 2019-04-11 22:35:37 +0800
• 9fc534d815 优化rtp排序逻辑，处理seq回环的情况 xiongziliang 2019-04-11 18:26:40 +0800
• dee4f0317a 更新ZLToolKit（修复tcp客户端bug） xiongziliang 2019-04-10 09:25:12 +0800
• 51d0964fe9 更新media-server xiongziliang 2019-04-09 21:26:31 +0800
• 5ac0be52cb 修复组播相关bug xiongziliang 2019-04-09 21:05:30 +0800
• 1a3d1eb4fb 优化代码结构 xiongziliang 2019-04-09 12:39:38 +0800
• 3284ab2464 rtmp转rtsp兼容无metedata的流 xiongziliang 2019-04-09 11:42:28 +0800
• 9cb704664b map修改为unordered_map xiongziliang 2019-04-09 11:33:28 +0800
• 4908ab4b47 简化RTMP的注册逻辑 xiongziliang 2019-04-09 11:31:47 +0800
• 507eba76c7 兼容无config包的rtmp流 xiongziliang 2019-04-09 11:25:36 +0800
• 26f813b1b5 事件invoker执行改成同步，为了兼容srs-bench xiongziliang 2019-04-09 09:49:13 +0800
• 531e8c4f49 更新ZLToolKit xiongziliang 2019-04-08 15:08:31 +0800
• c4d14ec415 修复flv PreviousTagSize相关问题 xiongziliang 2019-04-08 15:06:40 +0800
• a638c029dd 更新ZLToolKit xiongziliang 2019-04-08 10:17:40 +0800
• 9ddce9b5fc 完善cmakelist.txt xiongziliang 2019-04-04 11:41:51 +0800
• 87afd61616 可以自定义选择编译某特性 xiongziliang 2019-04-04 11:30:57 +0800
• 8169e57d1a Merge remote-tracking branch 'origin/master' xiongziliang 2019-04-04 10:02:24 +0800
• d3a58521c8 完善rtmp兼容性问题 xiongziliang 2019-04-04 10:02:16 +0800
• f95305af9b
  Update README.md 夏楚 2019-04-03 22:10:05 +0800
• 38c2c465f7 完善mp4推流 xiongziliang 2019-04-03 11:49:58 +0800
• ea4f9a0c4a mp4close放在后台线程执行 xiongziliang 2019-04-03 11:09:50 +0800
• 3453575c15 完善兼容性问题 xiongziliang 2019-04-02 15:49:43 +0800
• 4a8f8e3a40 Merge remote-tracking branch 'origin/master' xiongziliang 2019-04-02 15:08:39 +0800
• 791d84d08e 完善websocket xiongziliang 2019-04-02 15:07:54 +0800
• 8e314ff82a
  Update README.md 夏楚 2019-04-01 16:11:32 +0800
• 2d701128d3
  HLS支持265 夏楚 2019-04-01 16:08:02 +0800
• 33ff630e9b 修复编译问题 xiongziliang 2019-04-01 13:30:00 +0800
• 437360f2d3 尝试修复编译bug xiongziliang 2019-04-01 13:24:21 +0800
• 5324bb4791 文件重命名 xiongziliang 2019-04-01 13:19:48 +0800
• 33eb7ef320 整体替换HLS生成代码，支持265 xiongziliang 2019-04-01 12:57:33 +0800
• d1f722939d 自动复制证书至可执行目录 xiongziliang 2019-04-01 10:37:11 +0800
• 9247cb9571 支持客户端自定义设置EventPoller对象，提高线程安全性 xiongziliang 2019-04-01 10:16:15 +0800
• 6e2002e451 确保程序退出时释放相关资源 xiongziliang 2019-03-30 00:40:39 +0800
• 3eb068b827 更新ZLToolKit xiongziliang 2019-03-30 00:34:47 +0800
• 45d9cc8831 更新ZLToolKit xiongziliang 2019-03-29 18:41:31 +0800
• a80959cc10
  Update README.md 夏楚 2019-03-28 15:08:25 +0800
• 6f269ecc5b 添加bom头 xiongziliang 2019-03-28 14:47:16 +0800
• 8b6991dc20
  Update README.md 夏楚 2019-03-28 12:08:31 +0800
• 3132cccb8f
  支持rtsp推流 夏楚 2019-03-28 12:07:46 +0800
• fed8a7b81f 优化播放器相关代码 xiongziliang 2019-03-28 12:02:59 +0800
• 6045b1b8f8 修复rtsp推流服务器在udp模式下的bug 优化代码 xiongziliang 2019-03-28 11:52:07 +0800
• d208f69730 优化推流器代码 xiongziliang 2019-03-28 09:43:47 +0800
• f6b963f0f2 整理优化代码 xiongziliang 2019-03-28 09:34:22 +0800
• b1859e33ab MediaPusher使用弱指针保存MediaSource xiongziliang 2019-03-28 09:23:22 +0800
• 32da13114a 解决程序退出异常的问题 xiongziliang 2019-03-27 19:02:22 +0800
• 5e7260c723 修复编译问题 xiongziliang 2019-03-27 18:58:43 +0800
• e44c2d5508 整理代码 xiongziliang 2019-03-27 18:56:49 +0800
• b1a2de3853 添加rtsp推流器 整理代码 xiongziliang 2019-03-27 18:41:52 +0800
• e3ab51b337 简化ssl相关代码 xiongziliang 2019-03-27 10:01:18 +0800
• 6d7f987783 Merge remote-tracking branch 'origin/master' xiongziliang 2019-03-26 18:04:14 +0800
• b5c3830a63 简化rtmp推流器代码 xiongziliang 2019-03-26 18:04:06 +0800
• c5531c9ddb
  Update README.md 夏楚 2019-03-26 15:40:43 +0800
• 7580f2fc0d
  新增更多测试数据 夏楚 2019-03-23 22:55:00 +0800
• e5373e3845
  更改为最新测试数据 夏楚 2019-03-23 22:30:04 +0800
• dc1cae2153 优化rtmp发送，减少内存拷贝以及开辟 xiongziliang 2019-03-23 22:00:16 +0800
• ce3c4c0d69 添加bom头 xiongziliang 2019-03-22 17:47:25 +0800
• f536b73b97 精简代码 xiongziliang 2019-03-22 17:40:41 +0800
• e445c7e14c 避免内存拷贝，大幅提高rtmp服务器的性能 xiongziliang 2019-03-22 14:37:03 +0800
• 2b4d8a123d 完善FLV复用器 xiongziliang 2019-03-22 14:11:39 +0800
• 8ebf127ee6 完善录制相关功能 xiongziliang 2019-03-22 13:31:39 +0800
• cc2d22737f 发布为4.0版本 xiongziliang 2019-03-22 12:28:08 +0800
• ba25059433 更新ZLToolKit xiongziliang 2019-03-22 12:27:20 +0800
• 46989d8b48 更新ZLToolKit(解决环形缓冲遍历时删除的bug) xiongziliang 2019-03-22 12:11:13 +0800
• b1a2f17df6 更新ZLToolKit(解决环形缓存可能死锁的问题) xiongziliang 2019-03-22 11:54:11 +0800
• 75a40daa07 修复rtsp组播相关bug 更新ZLToolKit(优化性能) xiongziliang 2019-03-22 10:27:21 +0800
• c570ffbd35 更新ZLToolKit(修复编译失败以及死锁问题) xiongziliang 2019-03-21 23:05:09 +0800
• b78c14a2a3 通过减少线程切换提高服务器性能 xiongziliang 2019-03-21 22:28:12 +0800
• 6238f5aa58 更新ZLToolKit xiongziliang 2019-03-20 15:19:36 +0800
• b42d647433 更新ZLToolKit(优化socket数据发送) xiongziliang 2019-03-19 22:27:33 +0800
• 14ef419b84 更新ZLToolKit(修复socket发送相关bug) xiongziliang 2019-03-19 22:14:44 +0800
• c23cf95eae 更新ZLToolKit最新代码 xiongziliang 2019-03-19 17:32:59 +0800
• c877f3b0ab 更新ZLToolKit(修复批量发送相关bug) xiongziliang 2019-03-18 23:43:19 +0800
• 082efb126b 适配ZLToolKit最新代码(优化发送性能) xiongziliang 2019-03-18 18:44:16 +0800
• 748adadd6a 更新ZLToolKit(完善惊群以及accept相关问题) xiongziliang 2019-03-15 10:24:20 +0800
• 4c05031ef4 修复多线程accept的相关bug xiongziliang 2019-03-14 18:06:36 +0800
• 64449f0362 更新ZLToolKit(TcpServer支持多个poller线程同时监听，大幅提高accept性能) xiongziliang 2019-03-14 17:21:50 +0800