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

#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

• f453668683 去除侦探gop长度的逻辑 xiongziliang 2020-01-20 15:34:06 +0800
• 795860a019 修复目录级别错误 liuziloong 2020-01-20 15:22:20 +0800
• 2384aa5bbd MP4录像增加一级目录，按照：年月/年月日/*.mp4存储； 增加按月，按天查询mp4录像； 消除一处编译器警告； liuziloong 2020-01-20 15:02:45 +0800
• ee2ca4bda5 Merge branch 'master' into research liuziloong 2020-01-19 15:09:34 +0800
• d2d84680c0 temp liuziloong 2020-01-19 14:54:31 +0800
• cbd6cd4e60 替换不可调试的宏代码 xiongziliang 2020-01-17 11:44:20 +0800
• 81d3e54d45 mark Luke 2020-01-16 11:08:15 +0800
• 22d5ec7796 Merge remote-tracking branch 'origin/master' xiongziliang 2020-01-15 20:00:05 +0800
• 95c8474d48 修复GOP缓存相关小bug xiongziliang 2020-01-15 19:59:47 +0800
• 114d447dac
  Merge pull request #215 from gemfield/master 夏楚 2020-01-15 15:31:14 +0800
• caa870c37e websocket服务器支持根据url选择不同的运行逻辑 xiongziliang 2020-01-15 15:11:42 +0800
• 34e3e9f720 优化及时推拉流秒开成功率 xiongziliang 2020-01-15 11:55:16 +0800
• 2610ba7c8b 修复rtmp注册时还未生成完整config包的bug xiongziliang 2020-01-15 11:46:15 +0800
• 444137e5b7 重写GOP缓存机制 xiongziliang 2020-01-15 11:07:55 +0800
• 0a4b59031f 及时推拉流也能确保第一帧为关键帧 xiongziliang 2020-01-14 19:41:55 +0800
• 5ee913a3bf Split Dockerfile to runtime and devel version, and also reduce the image size for runtime version Gemfield 2020-01-14 19:36:36 +0800
• a573d7302b 提高rtsp客户端兼容性 xiongziliang 2020-01-14 18:11:10 +0800
• dad0175094 Merge branch 'master' into research Luke 2020-01-14 11:39:43 +0800
• 2b511a05cc 修复编译问题 xiongziliang 2020-01-14 11:21:21 +0800
• 2d9537ec84 snap Luke 2020-01-14 10:36:38 +0800
• 491ed6f83d rtsp不允许覆盖时间戳(pts) xiongziliang 2020-01-14 10:34:05 +0800
• 4a7d17334c rtsp不允许覆盖时间戳(pts) xiongziliang 2020-01-14 10:29:27 +0800
• d8dbf43490 优化dts生成性能 xiongziliang 2020-01-14 10:25:14 +0800
• ec67900665 优化不含B帧时的dts生成性能 xiongziliang 2020-01-14 10:06:35 +0800
• 9fa6e9d8d9 添加dts生成算法，兼容含B帧的rtsp推流 xiongziliang 2020-01-14 10:04:24 +0800
• b55db11de3 解决rtmp过早注册的问题 xiongziliang 2020-01-13 15:48:55 +0800
• 66ec67bfb9 1、修复生成的rtmp无法被flash播放的问题 2、修复RTSP有B帧时，相对时间戳计算异常的问题 xiongziliang 2020-01-13 11:51:29 +0800
• db146406c3 修复gcc4.85无法编译的问题 xiongziliang 2020-01-10 15:29:21 +0800
• 8acb6e2093 修正错误注释 xiongziliang 2020-01-09 17:17:48 +0800
• 835d6bd9b5 允许本机和超级用户任意访问http目录 xiongziliang 2020-01-09 17:03:29 +0800
• bad036fdac 添加致谢 xiongziliang 2020-01-09 10:06:30 +0800
• 653132b38c 去除多余日志 xiongziliang 2020-01-08 14:03:56 +0800
• ab32ca39a9 去除多余日志 xiongziliang 2020-01-08 14:00:53 +0800
• 5d2864cff2 优化DevChannel内存拷贝问题 xiongziliang 2020-01-08 12:15:59 +0800
• 57c5d2963a 优化DevChannel内存拷贝问题 xiongziliang 2020-01-08 12:14:27 +0800
• 9cdbe4c4ef 修复协议转换配置开关不生效的bug xiongziliang 2020-01-07 15:38:35 +0800
• 5258169a07 修复协议转换配置开关不生效的bug xiongziliang 2020-01-07 15:37:48 +0800
• 09a2623e1b 还原 xiongziliang 2020-01-07 15:16:01 +0800
• 16751ddf04 windows支持FFmpeg拉流代理 xiongziliang 2020-01-07 15:10:59 +0800
• 77bbc7ae4d Merge remote-tracking branch 'FreeNVR/freenvr' xiongziliang 2020-01-07 15:08:15 +0800
• 9c42c5ed8c windows视频FFmpeg拉流代理 xiongziliang 2020-01-07 14:37:18 +0800
• 5b533354c3 增加todo 刘子龙 2020-01-07 11:17:55 +0800
• 306e202ca1 1.添加windows下ffmpeg拉流分发支持，目前不是很完善，后续再修改 2.server/system下未兼容完成 Luke 2020-01-07 11:09:11 +0800
• 01bae24fdc update zltoolkit xiongziliang 2020-01-07 10:45:55 +0800
• 4591ece566
  Update README.md 夏楚 2020-01-06 14:23:23 +0800
• 3ddb9e4843
  Update README.md 夏楚 2020-01-06 14:19:15 +0800
• 1ce9af35e3 1、复用rtsp url解析代码 2、修复rtsp/rtmp推流异常回调紊乱的问题 xiongziliang 2020-01-04 12:03:53 +0800
• e4f9e377c5 修复FFmpeg日志路径相关的bug xiongziliang 2020-01-03 17:26:36 +0800
• cdba214e79 MP4录制修复兼容性问题 xiongziliang 2020-01-03 14:27:26 +0800
• d482dc1c05 完善http服务器mime类别 xiongziliang 2020-01-02 18:24:11 +0800
• 52d831e990 简化hls cookie相关逻辑 xiongziliang 2020-01-02 17:46:20 +0800
• d082955510 合并#199 xiongziliang 2020-01-02 16:29:20 +0800
• bca2472fcd Merge branch 'master' of https://github.com/gemfield/ZLMediaKit xiongziliang 2020-01-02 13:55:02 +0800
• e31c1ee207 Add optional customized_path parameter for startRecord Gemfield 2020-01-02 12:47:12 +0800
• bedf088e67 修改默认配置文件 xiongziliang 2020-01-02 11:56:44 +0800
• 8ab0917133 Add optional customized_path parameter for startRecord Gemfield 2019-12-31 18:41:04 +0800
• 84de9720b5 更新ZLToolKit xiongziliang 2019-12-29 18:32:26 +0800
• 0063571f3a 解决hls中断恢复时播放器计数不准确的问题 xiongziliang 2019-12-29 17:55:02 +0800
• 7e1e367844 优化FFmpeg拉流失败重试机制 xiongziliang 2019-12-29 17:14:23 +0800
• 4d42459004 优化代码 xiongziliang 2019-12-29 16:54:02 +0800
• f48e611253 优化http文件服务器性能 xiongziliang 2019-12-29 15:55:20 +0800
• 345db4b999 优化代码 xiongziliang 2019-12-29 15:43:51 +0800
• e91c26c052 实现hls的流量汇报事件 xiongziliang 2019-12-29 15:38:29 +0800
• e951efc615 优化hls直播性能 xiongziliang 2019-12-29 14:00:20 +0800
• c3302eec1e 优化hls播放器计数 xiongziliang 2019-12-29 13:38:16 +0800
• 97ad062dcf 默认关闭rtmp时间戳覆盖 xiongziliang 2019-12-29 12:16:02 +0800
• 236dc46b82 完成HLS按需生成流 xiongziliang 2019-12-29 12:10:31 +0800
• 4b4c4e0cec 实现hls按需拉流 xiongziliang 2019-12-29 11:52:02 +0800
• 54736859d4 基本完成hls相关的主要事件 xiongziliang 2019-12-29 10:49:04 +0800
• 1afacdcff8 初步添加HlsMediaSource xiongziliang 2019-12-28 18:50:56 +0800
• e72fa359b6 完善hls播放器个数计数 xiongziliang 2019-12-28 16:57:35 +0800
• f93b32740f 初步实现hls播放器个数计数 xiongziliang 2019-12-28 16:48:42 +0800
• 94806b2cd6 初步实现hls播放器个数计数 xiongziliang 2019-12-28 16:48:11 +0800
• 20d56b713f 性能优化 xiongziliang 2019-12-28 13:39:25 +0800
• 71631a33c4 http服务器实现后台线程读取数据 xiongziliang 2019-12-28 13:11:41 +0800
• 582f769893 移动index.html xiongziliang 2019-12-27 15:50:45 +0800
• 291969aee6 修复文件写缓存提前销毁的问题:#196 xiongziliang 2019-12-27 15:36:54 +0800
• 37bca15dc9 flv录制添加参数vhost xiongziliang 2019-12-27 13:56:02 +0800
• 118be421d6 添加bom头 xiongziliang 2019-12-27 12:22:17 +0800
• aaab52c94f 文件根目录httpRoot改成www，并且自动复制到相应目录 xiongziliang 2019-12-27 12:15:38 +0800
• 2aec68fd6f 添加install命令 xiongziliang 2019-12-27 12:03:54 +0800
• c3a32e862a 修复编译错误 xiongziliang 2019-12-27 10:52:14 +0800
• 7d7b29825f 添加线程相关api xiongziliang 2019-12-27 10:47:01 +0800
• e8951c129f 添加线程相关api xiongziliang 2019-12-27 10:46:40 +0800
• 5b43b2c004 添加util相关函数，整理库文件名 xiongziliang 2019-12-27 10:10:31 +0800
• 528e4fffe5 完成tcp服务器/客户端 c api xiongziliang 2019-12-26 21:24:40 +0800
• 11a7d1e6c4 完成tcp服务器/客户端 c api xiongziliang 2019-12-26 21:22:19 +0800
• 56397628da 修复未初始化导致的bug xiongziliang 2019-12-26 19:36:57 +0800
• 003021e24b 优化http服务器性能 xiongziliang 2019-12-26 15:02:28 +0800
• f7db9d3690 默认关闭虚假主机 xiongziliang 2019-12-26 12:23:38 +0800
• a30a4e24f1 修复rtsp推流转协议失败的bug xiongziliang 2019-12-26 12:20:34 +0800
• 453660ab79 整理MediaSource派生类 修复转协议或录制时忽然Track的问题 xiongziliang 2019-12-26 12:10:54 +0800
• 9e8fe8c86a 完善代码 xiongziliang 2019-12-26 12:09:35 +0800
• 3830792c57 整理MediaSource派生类 修复转协议或录制时忽然Track的问题 xiongziliang 2019-12-26 11:53:19 +0800
• 806747a9d5 完善范例程序 xiongziliang 2019-12-26 09:50:10 +0800
• ca833c40d5 完善范例程序 xiongziliang 2019-12-26 09:49:45 +0800
• 761a665b1b 删除冗余设计 xiongziliang 2019-12-26 09:43:44 +0800
• 8b23f01509 修复编译失败问题 xiongziliang 2019-12-25 20:13:49 +0800
• d59a706cc1 简化代码 xiongziliang 2019-12-25 20:07:42 +0800
• b219a82ff5 添加websocket 服务器的c范例程序 xiongziliang 2019-12-25 15:45:22 +0800