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

#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

• 0730b02d8e
  Merge pull request #2 from xiongziliang/master sunhui2013 2019-11-25 17:01:42 +0800
• 21cf3bcee0 播放器track未初始化成功时间改成最大为5秒 xiongziliang 2019-11-21 18:07:40 +0800
• ab97486200 完善判断逻辑 xiongziliang 2019-11-21 16:34:18 +0800
• 54f2c0b53c 兼容一些奇怪sdp的rtsp url xiongziliang 2019-11-21 16:31:50 +0800
• e7bd5a4174 兼容一些奇怪的sdp xiongziliang 2019-11-21 15:11:43 +0800
• 083933cbad 修复访问野指针的问题：#146 xiongziliang 2019-11-21 13:46:42 +0800
• e6d511cc9e 解决播放成功与中途断开事件触发紊乱的问题:#143 xiongziliang 2019-11-19 15:52:02 +0800
• 4a58610446 修复退出后，析构的问题 Luke 2019-11-19 15:11:05 +0800
• fd0937dd41
  Merge pull request #1 from xiongziliang/master kqbi 2019-11-19 14:26:18 +0800
• e2d548284a
  Merge pull request #1 from xiongziliang/master tsingeye 2019-11-19 14:20:12 +0800
• 85cd4a7d02 修复遍历删除可能崩溃的bug xiongziliang 2019-11-19 10:55:44 +0800
• 2eb64d2c39 确保rtp端口为偶数，rtcp端口为奇数 xiongziliang 2019-11-19 10:20:57 +0800
• 517f3c229c 添加kick_sessions接口 xiongziliang 2019-11-18 16:34:39 +0800
• bcc5c839a5 close_stream接口结果返回字段改成result xiongziliang 2019-11-18 16:28:56 +0800
• f628985037 优化代码 xiongziliang 2019-11-18 16:16:56 +0800
• 0d42aab9e7 修复FFmpeg拉流代理无法通过close_stream接口关闭的bug xiongziliang 2019-11-18 12:07:11 +0800
• ddf351d350 添加close_streams接口 xiongziliang 2019-11-18 10:46:59 +0800
• a993132a59 修复FFmpeg拉流代理卡顿的问题 xiongziliang 2019-11-15 13:50:42 +0800
• 08ad39d005
  Update ccpp.yml 夏楚 2019-11-14 15:26:35 +0800
• 2543ee01dc
  Update ccpp.yml 夏楚 2019-11-14 15:22:15 +0800
• a3e67a1306 完成workflows测试 xiongziliang 2019-11-14 15:14:25 +0800
• c8ba6fd73f 更新ZLToolKit xiongziliang 2019-11-14 14:48:27 +0800
• c1f3b8ffbc
  Create ccpp.yml 夏楚 2019-11-14 14:45:12 +0800
• d440c424c4 获取线程负载接口返回code字段 简化代码 xiongziliang 2019-11-13 14:33:19 +0800
• aef8fb8849 添加isMediaOnline接口判断是否媒体在线 xiongziliang 2019-11-13 14:26:12 +0800
• 9665d557ae 兼容拼写错误 xiongziliang 2019-11-13 14:11:49 +0800
• 0522ad2677 Merge remote-tracking branch 'origin/master' xiongziliang 2019-11-13 14:05:33 +0800
• 88a5de00b2 修正拼写错误 xiongziliang 2019-11-13 14:05:15 +0800
• 94eebdadf1
  Update README_CN.md 夏楚 2019-11-13 10:45:52 +0800
• d1fd674c36
  Update README.md 夏楚 2019-11-13 10:43:46 +0800
• 5bc7116e2a 增加windows系统服务 Luke 2019-11-12 12:33:16 +0800
• 3554fe920f 更新ZLToolKit xiongziliang 2019-11-12 10:00:55 +0800
• 8c0596bfb2 更新ZLToolKit(修复发送缓存覆盖导致ssl错误的bug) xiongziliang 2019-11-12 09:52:34 +0800
• 1b6e61c413 1、修复#125 2、修复非法rtsp url导致异常的问题 xiongziliang 2019-11-11 19:03:03 +0800
• 36a3f4225c Merge remote-tracking branch 'origin/master' xiongziliang 2019-11-11 16:22:31 +0800
• d6b319b993 尝试修复 #125 xiongziliang 2019-11-11 16:22:12 +0800
• c2e3dfbbe9
  Merge pull request #124 from gemfield/master 夏楚 2019-11-08 16:54:23 +0800
• 814e94b6b0 Add Docker support Gemfield 2019-11-08 16:50:23 +0800
• 5a1503008f 完善注释 xiongziliang 2019-11-08 15:55:26 +0800
• a8a4f267f7 添加配置项，控制在关闭hook时，推流是否转协议或录制 xiongziliang 2019-11-08 15:54:13 +0800
• 9b7d62347e 完善 xiongziliang 2019-11-08 15:26:46 +0800
• 9d7b2821b7 初步支持ssl多证书 xiongziliang 2019-11-08 15:20:54 +0800
• ccbd1d4a83 添加hls.segRetain配置项，修复hls切片等于segNum+1的问题 xiongziliang 2019-11-05 10:27:28 +0800
• 35c4c05e7b 修复setServerConfig接口保存配置文件相关bug xiongziliang 2019-11-04 09:21:11 +0800
• a30a83d665 添加H265相关接口 xiongziliang 2019-11-01 15:40:21 +0800
• 5d1df021fe
  Merge pull request #9 from xiongziliang/master baiyfcu 2019-10-30 13:20:09 +0800
• 0bff2ad176 优化精简Http服务器代码 xiongziliang 2019-10-29 09:16:52 +0800
• 43e1cc69a8 优化http服务器 xiongziliang 2019-10-29 00:35:44 +0800
• fd10ef1187 添加下载文件http api范例 xiongziliang 2019-10-28 17:23:16 +0800
• 52a663033d Merge remote-tracking branch 'origin/master' xiongziliang 2019-10-28 16:50:40 +0800
• 7ed5b7c2ba http api服务器支持发送大文件 xiongziliang 2019-10-28 16:50:15 +0800
• 16fc6be1c6 update android libs nanguantong 2019-10-28 16:35:35 +0800
• 3f7757e4f3 merge nanguantong 2019-10-28 16:23:52 +0800
• e97f517b3a
  Update README_CN.md 夏楚 2019-10-28 13:57:09 +0800
• cad870a987
  Update README_CN.md 夏楚 2019-10-28 13:55:48 +0800
• f949ca0e7c
  Update README.md 夏楚 2019-10-28 13:55:01 +0800
• 7c16f37d64 优先判断文件然后再判断http-flv xiongziliang 2019-10-27 09:15:29 +0800
• 4ae66f0672 修复mmap相关bug xiongziliang 2019-10-27 03:42:56 +0800
• 4d1d6b1467 暂时禁用mmap xiongziliang 2019-10-27 03:00:19 +0800
• 6023885e93 抽象整理HttpBody类，fread模式下使用循环池提升内存性能 xiongziliang 2019-10-27 02:04:51 +0800
• 144fb20339 http服务器支持mmap,提示性能 xiongziliang 2019-10-26 18:41:42 +0800
• 2bc918cd2e 去除gfs依赖 xiongziliang 2019-10-25 10:46:59 +0800
• 6a8a486171 重新git常规方式添加 xiongziliang 2019-10-25 10:46:38 +0800
• 5cae433158 去除git lfs文件 xiongziliang 2019-10-25 10:43:55 +0800
• 4dd02e2de7 Merge remote-tracking branch 'remotes/upstream/master' nanguantong 2019-10-24 16:05:58 +0800
• 8e48ab3463 解决defunct进程的问题 xiongziliang 2019-10-24 11:42:39 +0800
• 1f89a86892 新增getWorkThreadsLoad接口 xiongziliang 2019-10-24 11:21:55 +0800
• a739bd7304 完善日志 xiongziliang 2019-10-23 12:00:53 +0800
• 7e1e735203 更新ZLToolKit xiongziliang 2019-10-21 09:03:11 +0800
• a4dab8767f 支持相对路径 xiongziliang 2019-10-18 10:06:18 +0800
• 0aa28b2848 简化代码 xiongziliang 2019-10-18 10:02:42 +0800
• 0f5582689b 防止越权访问 xiongziliang 2019-10-18 09:58:22 +0800
• 67d2beb52a 配置文件支持相对路径，http文件服务器防止访问根目录父目录 xiongziliang 2019-10-18 09:51:20 +0800
• cbb25eadef Merge remote-tracking branch 'origin/master' xiongziliang 2019-10-16 11:10:40 +0800
• 3bad329f09 修复resetTracks情况下 MP4录制可能出现的bug xiongziliang 2019-10-16 11:10:20 +0800
• 82098a284c
  Update .gitattributes 夏楚 2019-10-16 10:40:19 +0800
• 065b2cf678
  Update FUNDING.yml 夏楚 2019-10-15 18:49:35 +0800
• f816ea1727
  Create FUNDING.yml 夏楚 2019-10-15 18:23:14 +0800
• 68d29ba025 rtsp忽略无效的aac track xiongziliang 2019-10-14 16:52:15 +0800
• d40d9a5b5b
  Merge pull request #3 from xiongziliang/master nanguantong 2019-10-14 14:49:28 +0800
• a68368a7f3 修复#109 xiongziliang 2019-10-14 10:15:46 +0800
• 08386b958c 覆盖时间戳需要明确参数指定，防止误判 xiongziliang 2019-10-12 22:44:16 +0800
• 4642bbeb4c rtsp推流默认不覆盖时间戳 xiongziliang 2019-10-12 22:02:50 +0800
• adb808bbb4 完善配置文件注释 xiongziliang 2019-10-12 18:35:26 +0800
• d2406d239d 兼容一些奇怪的rtsp url xiongziliang 2019-10-12 11:22:17 +0800
• c4aaaa11c7 优化hls生成 xiongziliang 2019-10-12 10:29:40 +0800
• 7f203ce9b7 修复回复hls生成的bug xiongziliang 2019-10-11 19:01:34 +0800
• f1ed019437 合并#106 xiongziliang 2019-10-11 17:51:46 +0800
• d6e60e0919 添加断流重连是否接着前一次继续写;修复断流重连成功后hls时间戳错误问题 Weiwei.Zhou 2019-10-11 16:51:10 +0800
• 7d76a3eb9b 修复hls首个切片延迟生成的问题 Weiwei.Zhou 2019-10-11 16:16:14 +0800
• a604d8c620 mp4点播每次流化时间改成500毫秒，优化文件io性能 xiongziliang 2019-10-10 17:52:19 +0800
• 732e00ea63 release版本添加jemalloc库 xiongziliang 2019-10-10 17:28:38 +0800
• a09016303b 更新ZLToolKit xiongziliang 2019-10-10 14:35:17 +0800
• f0deafd722 mp4录制完成后是否进行二次关键帧索引写入头部 Weiwei.Zhou 2019-10-10 13:37:56 +0800
• 7608aa6fa9 merge Weiwei.Zhou 2019-10-10 13:22:51 +0800
• def2d71d30
  Merge pull request #2 from zlmediakit/master nanguantong 2019-10-10 12:34:11 +0800
• b3c53391f4 支持低版本Android xiongziliang 2019-10-09 22:18:49 +0800
• 67b70ec8bb android支持更低版本，默认关闭vhost xiongziliang 2019-10-09 22:14:41 +0800
• 54b2cd0089 更新ZLToolKit xiongziliang 2019-10-08 17:22:27 +0800
• ec925a64e4 防止时间戳回滚 xiongziliang 2019-10-08 12:55:19 +0800