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

• 1eb40884c4 完善按需拉流范例 xiongziliang 2019-06-10 14:13:43 +0800
• c876c43374 优化代码 xiongziliang 2019-06-10 12:33:45 +0800
• 307321a380 更新ZLToolK(修复环形缓存相关的bug) xiongziliang 2019-06-10 12:23:51 +0800
• c503749328 添加FFmpeg拉流功能 xiongziliang 2019-06-06 18:28:33 +0800
• ecc133d605 本地的hook事件不做鉴权 xiongziliang 2019-06-06 15:33:11 +0800
• 34d0635f2e Merge remote-tracking branch 'origin/master' xiongziliang 2019-06-06 15:29:44 +0800
• c454240c83 完善事件取消监听机制 xiongziliang 2019-06-06 15:29:36 +0800
• d6b5e08e35
  Update README.md 夏楚 2019-06-03 16:22:35 +0800
• 7bb1b7f670 修正注释 xiongziliang 2019-06-03 16:10:36 +0800
• 7f062c661b 更新ZLToolKit(环形缓存性能以及稳定性提升) xiongziliang 2019-06-03 12:35:35 +0800
• c0f41167ba 创建Socket优先绑定本线程 xiongziliang 2019-05-31 18:01:38 +0800
• f2e4eac5ef 修复热加载不同配置文件的bug xiongziliang 2019-05-31 15:49:52 +0800
• f5a80e3799 onNoneReader事件避免重复触发 xiongziliang 2019-05-31 15:40:55 +0800
• ec190e3273 修复windows编译问题 xiongziliang 2019-05-31 12:14:51 +0800
• 2b86082f3d 修复FFmpeg无法播放rtsp over http的问题 xiongziliang 2019-05-31 10:16:31 +0800
• 0428507509 添加头文件宏 xiongziliang 2019-05-31 09:06:30 +0800
• d85e19fb74 防止拉流中途重复拉流 xiongziliang 2019-05-30 16:45:11 +0800
• c38521aa0e 修复编译bug xiongziliang 2019-05-30 16:03:06 +0800
• db0611de91 修复rtsp注册前未设置sdp的bug rtsp鉴权放置在查找流之前，防止无谓的按需拉流 xiongziliang 2019-05-30 16:01:56 +0800
• 6d08e2a243 完善rtmp服务器错误提示 xiongziliang 2019-05-30 12:17:26 +0800
• 042981c4e4 完善rtsp服务器错误提示 xiongziliang 2019-05-30 12:14:20 +0800
• c8b192fa6e 完善http错误提示 xiongziliang 2019-05-30 10:59:14 +0800
• 0c460b397d 发送超时时间可配置 xiongziliang 2019-05-30 10:41:25 +0800
• 5304d81306 修复https客户端无法完成ssl握手的问题 xiongziliang 2019-05-30 10:12:47 +0800
• 422a0ce86e 忽略无效ssl证书 xiongziliang 2019-05-30 09:21:45 +0800
• a317ff8614 on_stream_not_found接口检查参数 xiongziliang 2019-05-29 18:30:43 +0800
• e9e21e11a2 rtsp/rtmp超时时间可配置 xiongziliang 2019-05-29 18:24:35 +0800
• a39c4c1344 完善错误提示 xiongziliang 2019-05-29 18:08:50 +0800
• f8f3c5dd19 优化虚拟主机相关 xiongziliang 2019-05-29 09:30:39 +0800
• d0deea8b58 优化虚拟主机相关 xiongziliang 2019-05-29 09:28:35 +0800
• a109d966c8 优化虚拟主机相关 xiongziliang 2019-05-29 09:26:16 +0800
• c1b6df7bc7 优化虚拟主机相关 xiongziliang 2019-05-29 09:24:02 +0800
• a603d7f1c3 完善服务器日志打印 xiongziliang 2019-05-28 18:47:10 +0800
• 458a92521f 完善服务器日志打印 xiongziliang 2019-05-28 18:46:52 +0800
• 69624f84ac 完善设置项注释 xiongziliang 2019-05-28 17:27:28 +0800
• a100ee0acd 支持全局的禁用虚拟主机 xiongziliang 2019-05-28 17:14:36 +0800
• 2f976214ce 修复media命令相关bug xiongziliang 2019-05-28 10:02:12 +0800
• 7e770841d1 休眠1秒后退出 xiongziliang 2019-05-28 09:50:05 +0800
• 6442821d2b 删除冗余代码 xiongziliang 2019-05-28 09:38:15 +0800
• 94ccd27f47 等待流注册时间可配置化 xiongziliang 2019-05-28 09:25:41 +0800
• 22e39dc240 完成按需拉流测试 xiongziliang 2019-05-27 23:07:12 +0800
• 72581cf415 bug fixed xiongziliang 2019-05-27 22:51:16 +0800
• 29e4a6b14a http-flv支持延时注册流 xiongziliang 2019-05-27 22:49:30 +0800
• 0dc7cbb879 精简等待监听流异步注册后回复事件相关代码 xiongziliang 2019-05-27 22:32:07 +0800
• eabb673005 无人观看延时关闭 xiongziliang 2019-05-27 21:37:29 +0800
• 5b88057a89 添加无人观看主动断开事件 xiongziliang 2019-05-27 18:41:37 +0800
• b0bf216bc2 添加无人观看主动断开事件 xiongziliang 2019-05-27 18:39:43 +0800
• 3917b6451c 完善获取媒体读取器个数方法 xiongziliang 2019-05-27 16:09:29 +0800
• 0fa2452657 添加getAllSession接口 完善接口注释 xiongziliang 2019-05-27 15:09:44 +0800
• 1610bd2415 本机范围http api不需要secret xiongziliang 2019-05-27 14:21:38 +0800
• 3f51e9aed2 完善close_stream api错误提示 xiongziliang 2019-05-27 14:15:21 +0800
• f563274cda 完善主动关断流机制 xiongziliang 2019-05-27 14:14:42 +0800
• 3f211d1653 新增shell登录hook事件 默认hook url改成https 默认开始http hook xiongziliang 2019-05-27 13:56:37 +0800
• 3e54018409 删除重复代码 xiongziliang 2019-05-27 12:13:27 +0800
• c857968f40 flv录制延时两秒启动，防止收集config帧不齐 xiongziliang 2019-05-27 10:58:08 +0800
• 6ef5ae0f3c fix #32 : 兼容新老版本mysql客户端 xiongziliang 2019-05-24 17:50:46 +0800
• 9db03d4f48 更新ZLToolKit(修复win下编译问题) xiongziliang 2019-05-24 17:25:04 +0800
• a515a85235 更新ZLToolKit(优化时间戳获取函数) xiongziliang 2019-05-24 16:40:25 +0800
• db8a4a6e06 fix issue #31 xiongziliang 2019-05-23 09:23:24 +0800
• 7431a05811 修复编译错误 xiongziliang 2019-05-21 09:26:24 +0800
• 056ce72182 完整主进程 xiongziliang 2019-05-20 22:22:05 +0800
• bc0a39bc52 动态增删代理更改唯一key类型 xiongziliang 2019-05-20 18:17:53 +0800
• ce7a0223f1 动态代理拉流等待拉流结果 xiongziliang 2019-05-20 18:08:55 +0800
• fbead02868 流量统计添加isPlayer参数 xiongziliang 2019-05-20 17:46:06 +0800
• f9f487bf61 删除过多的线程切换 xiongziliang 2019-05-20 17:34:39 +0800
• 7539042d2b 敏感接口添加secret认证 xiongziliang 2019-05-20 17:12:00 +0800
• 40c1d1cae6 解决程序退出时资源释放顺序问题 xiongziliang 2019-05-20 17:03:04 +0800
• 8311524935 完善checkArgs函数 xiongziliang 2019-05-20 16:55:09 +0800
• 44ed51666f 添加参数合法性校验 xiongziliang 2019-05-20 16:53:29 +0800
• 283074ad42 开启崩溃捕获等 xiongziliang 2019-05-20 16:34:46 +0800
• 0637f1b476 修复variant无法转换成json的bug xiongziliang 2019-05-20 16:32:28 +0800
• 74d074ac53 完善Hook与API xiongziliang 2019-05-20 16:26:04 +0800
• 2f6773f180 添加完整的服务器用例 xiongziliang 2019-05-20 11:22:59 +0800
• 49d778af99 Merge remote-tracking branch 'origin/master' xiongziliang 2019-05-20 09:43:21 +0800
• 2217211464 rtp组播监听组播地址 更新ZLToolKit xiongziliang 2019-05-20 09:43:13 +0800
• a92b053267
  Update README.md 夏楚 2019-05-17 17:57:36 +0800
• b69f0c2f87
  Update README.md 夏楚 2019-05-17 17:55:09 +0800
• 4db67aaa27 单线程提供线程安全 xiongziliang 2019-05-17 11:38:35 +0800
• 2a8b6d2b84 删除冗余代码 xiongziliang 2019-05-16 17:56:36 +0800
• 609006d06e 性能优化 xiongziliang 2019-05-16 17:34:38 +0800
• 28d20955e0 http服务器支持查找index.html文件 xiongziliang 2019-05-16 17:31:48 +0800
• 4c39821691 添加http服务器配置项:是否支持vhost xiongziliang 2019-05-16 17:09:29 +0800
• 36e8dcfac1 rtsp拉流改成udp方式 xiongziliang 2019-05-13 14:26:20 +0800
• 35734f9e27 sps pps vps帧不再缓存 xiongziliang 2019-05-13 14:17:55 +0800
• a88531354a 提升rtp组播线程安全性 4.0 xiongziliang 2019-05-13 09:36:23 +0800
• db1e850ef3 修复rtsp over http的bug xiongziliang 2019-05-10 18:40:30 +0800
• 37d842e444 修复rtsp组播相关的bug xiongziliang 2019-05-10 18:33:23 +0800
• b43df8be24 修复编译问题 xiongziliang 2019-05-10 17:03:17 +0800
• f1bd9be8a2 修复编译问题 xiongziliang 2019-05-10 16:59:12 +0800
• 6b86952d83 更新ZLToolKit（修复新版NDK编译问题） xiongziliang 2019-05-10 16:46:57 +0800
• 7b71115c90 封装MediaPlayer JNI接口 xiongziliang 2019-05-10 16:25:24 +0800
• d1035e28e9 完善日志 xiongziliang 2019-05-10 13:29:35 +0800
• 5def5be29f 添加android测试程序 xiongziliang 2019-05-10 13:25:22 +0800
• 304275a0e4 rtsp播放器支持rtcp xiongziliang 2019-05-09 13:35:54 +0800
• 9d92f613e2 优化接口命名，更新ZLToolKit xiongziliang 2019-05-09 10:49:50 +0800
• fe19ea3991 rtsp服务器支持发送rtcp包 xiongziliang 2019-05-08 18:46:56 +0800
• bceff73429 rtsp服务器支持发送rtcp包 xiongziliang 2019-05-08 17:49:05 +0800
• dc67665784 忽略非法的rtp/rtcp包 xiongziliang 2019-05-08 16:24:45 +0800
• 3d16f55446 设置rtcp端口目标地址 xiongziliang 2019-05-08 16:19:00 +0800
• 6d3d0272a6 删除冗余文件 更新licence日期 xiongziliang 2019-05-08 15:40:07 +0800