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

• 2975a61d4a 修改配置文件表达错误 monktan 2020-11-16 14:58:16 +0800
• e89459a935
  修正错误 夏楚 2020-11-16 11:46:04 +0800
• 45ec80656d 修改配置文件表达错误 monktan 2020-11-16 10:27:49 +0800
• 50f1b4ad4f Merge remote-tracking branch 'upstream/master' monktan 2020-11-16 10:26:31 +0800
• 1cc3add97f 提升按需转协议性能与体验 xiongziliang 2020-11-15 00:59:31 +0800
• 0f54351811 按需转协议默认关闭(意即一直转协议) xiongziliang 2020-11-15 00:43:42 +0800
• bb9b39d821 添加按需转协议开关，默认一直转协议：#569 xiongziliang 2020-11-15 00:40:46 +0800
• ebbe124d00 修复不能立即关闭拉流代理的问题：#559 xiongziliang 2020-11-15 00:00:22 +0800
• 3d8f015f5d GB28181推流，无人观看时不解复用数据 xiongziliang 2020-11-14 23:11:28 +0800
• 2b7d8ae295 Merge remote-tracking branch 'upstream/master' monktan 2020-11-09 10:58:45 +0800
• 67d80c94fa 合并代码 monktan 2020-11-09 10:58:33 +0800
• 6c8f1c9403 更新ZLToolKit，修复bug: #558 xiongziliang 2020-11-08 21:42:36 +0800
• 9618748c65 默认hook地址置空，方便关闭hook 同时整理简化代码 xiongziliang 2020-11-08 09:28:46 +0800
• a93c57eb59 修复ehome推流相关bug: #549 xiongziliang 2020-11-07 17:46:37 +0800
• 57a11f19dd 提高rtsp兼容性: #551 xiongziliang 2020-11-07 17:45:58 +0800
• ba7251f345 修复偶尔获取H265宽高失败的问题 xiongziliang 2020-11-07 17:45:16 +0800
• bad419e41f 修复cts小于0的问题 xiongziliang 2020-11-07 17:44:30 +0800
• 2107e58295 重置rtmp时间戳 monktan 2020-11-03 21:26:48 +0800
• 4fb7e4841f Merge remote-tracking branch 'upstream/master' into master monktan 2020-11-02 10:09:27 +0800
• d957b6816a rtp推流支持h264负载：#360 xiongziliang 2020-11-01 22:27:44 +0800
• d36e64eff4 提升性能 xiongziliang 2020-11-01 21:33:42 +0800
• 69d53990a9 修改默认配置文件 xiongziliang 2020-11-01 03:42:51 +0800
• 700a16c759 大幅提升接收推流性能以及降低内存占用 xiongziliang 2020-11-01 03:41:35 +0800
• 67719899b7 remove redundant log monktan 2020-10-28 10:53:19 +0800
• 039ce00211 优化日志流异常标识 monktan 2020-10-26 11:26:12 +0800
• a1fe5ee817 merge upstream monktan 2020-10-25 17:48:37 +0800
• 5c7a08eb7c 添加bom头 xiongziliang 2020-10-24 23:37:43 +0800
• b5a25793c4 修复rtp tcp推流情况下获取Origin相关失败的问题 xiongziliang 2020-10-24 23:34:22 +0800
• d74604e014 支持海康ehome推流 xiongziliang 2020-10-24 23:33:58 +0800
• bb5edcb8b4 更新第三方库 xiongziliang 2020-10-24 23:33:40 +0800
• ab9a605a66 优化代码结构 xiongziliang 2020-10-24 23:33:13 +0800
• 289e4f695a 校验rtp是否合法 xiongziliang 2020-10-24 23:32:43 +0800
• 18459db8f1 支持ehome推流：#514 xiongziliang 2020-10-24 23:32:23 +0800
• 38a002646d 修复FFmpeg拉流代理功能缺陷的问题：#533 xiongziliang 2020-10-24 23:31:58 +0800
• 67e49cb66e 修复close stream接口返回code不正确的问题 xiongziliang 2020-10-24 23:31:40 +0800
• 8cb564de0a 优化直播源类型说明 xiongziliang 2020-10-24 23:31:22 +0800
• bfdd02905c 重连时，注销直接拉流代理的流：#532 xiongziliang 2020-10-24 23:30:25 +0800
• dd2abd7924 修复拼写错误 xiongziliang 2020-10-24 23:30:06 +0800
• c5f1b4cd52 程序退出时清空RtpProcess对象 xiongziliang 2020-10-24 23:29:44 +0800
• fd898254f2 修复fu rtp打包的bug xiongziliang 2020-10-24 23:29:21 +0800
• 84784f21c4 优化性能 xiongziliang 2020-10-24 23:28:56 +0800
• 02c4aa3f4b 优化代码 xiongziliang 2020-10-24 23:28:25 +0800
• e95ed256ea optimize log monktan 2020-10-23 09:47:14 +0800
• b49d377293 Merge remote-tracking branch 'upstream/master' into master monktan 2020-10-20 15:57:14 +0800
• fe46ccc53f Merge remote-tracking branch 'upstream/master' into master monktan 2020-10-20 11:28:52 +0800
• 46ee7f369b 防止误删gop缓存 xiongziliang 2020-10-20 00:06:59 +0800
• c9d7cd99a3 修复线程安全相关bug:#521 xiongziliang 2020-10-20 11:50:18 +0800
• 44bb1ba5ef rtp端口取偶数:#526 xiongziliang 2020-10-20 10:38:31 +0800
• 130c411ae4 修复添加track太晚导致的bug: #528 xiongziliang 2020-10-20 10:21:35 +0800
• 231cd2e79f merge upstream monktan 2020-10-19 20:27:42 +0800
• 734cd06a48 update rtp sort monktan 2020-10-19 16:57:40 +0800
• 6f977a1c14 Merge remote-tracking branch 'upstream/master' into master monktan 2020-10-19 12:18:00 +0800
• b7d6442870 tcp情况下，rtp长度不得超过2K，防止发送端存在缓存覆盖的bug xiongziliang 2020-10-18 23:05:24 +0800
• ac381350f3 更新readme xiongziliang 2020-10-18 21:39:43 +0800
• e3364e9029 优化代码 xiongziliang 2020-10-18 21:39:22 +0800
• 51fcaeda4c 更新第三方库 xiongziliang 2020-10-18 21:33:36 +0800
• fcf641dfb6 优化rtp排序算法 xiongziliang 2020-10-17 14:46:59 +0800
• 12e71fc67a Merge remote-tracking branch 'upstream/master' into master monktan 2020-10-12 10:03:03 +0800
• 2965248346 修复std::move后智能指针无效的问题 xiongziliang 2020-10-10 18:44:48 +0800
• 209689121a 消除编译警告 xiongziliang 2020-10-10 18:36:29 +0800
• dfaa8b540c 使用临时变量和std::move减少智能指针的拷贝构造 xiongziliang 2020-10-10 18:23:25 +0800
• b6a82c372a Merge remote-tracking branch 'upstream/master' into master monktan 2020-10-09 19:20:12 +0800
• 5c8446bc62 修改暂停接口返回值 monktan 2020-10-09 15:12:05 +0800
• 03bf2486ae Merge remote-tracking branch 'upstream/master' into master monktan 2020-10-09 09:41:43 +0800
• 83a24a5863 删除过期配置项 xiongziliang 2020-10-01 21:45:09 +0800
• 4d39176877 重写rtp排序算法:#510 xiongziliang 2020-10-01 21:33:07 +0800
• 6a8268f323 添加配置项 mediaServerId xiongziliang 2020-10-01 20:58:19 +0800
• c968769a13 update README.md xiongziliang 2020-10-01 20:20:40 +0800
• bc36e000b3 提炼rtp排序算法 xiongziliang 2020-10-01 19:02:14 +0800
• eee65a51ce 修复FFmpeg截图可能失败的问题 xiongziliang 2020-10-01 19:01:48 +0800
• d047392be0 修复无法关闭FFmpeg子进程的问题 xiongziliang 2020-10-01 18:49:36 +0800
• a1de3bfd30 添加流创建时间、在线时间 xiongziliang 2020-10-01 18:57:15 +0800
• cd27e5a9f9 注意！hls mp4录制的customized path字段改成录制根目录 相当于配置文件中hls mp4录制根目录相关设置 xiongziliang 2020-10-01 14:55:34 +0800
• 8b7c792e44 更新 xiongziliang 2020-10-01 14:45:43 +0800
• 728dd3ec3c 合并pr:#509 xiongziliang 2020-10-01 14:37:52 +0800
• eccb1a664c Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit xiongziliang 2020-10-01 13:39:19 +0800
• e26f997225 修改参考案例 xiongziliang 2020-10-01 11:58:16 +0800
• d78d753429 添加网速统计功能 xiongziliang 2020-10-01 11:02:13 +0800
• 7f3877e437 添加网速统计功能 xiongziliang 2020-10-01 11:02:00 +0800
• 719bbee954
  Update README.md 夏楚 2020-09-30 10:30:28 +0800
• 4132df89cd 增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径，ffmpegsource中的超时时间，webhook中的唯一id等 qiuzhouwei 2020-09-28 10:45:59 +0800
• 0d63db5a9a Merge remote-tracking branch 'upstream/master' into master monktan 2020-09-27 20:18:59 +0800
• bae52db6ba 修复关闭某些功能后，编译失败的问题 xiongziliang 2020-09-27 16:54:55 +0800
• fbecb7f5f4 添加rtp pause接口，目前默认3分钟 monktan 2020-09-27 16:51:35 +0800
• 09d2472f6b Merge remote-tracking branch 'upstream/master' into master monktan 2020-09-27 15:15:01 +0800
• 5cd8e8ae1c 添加媒体生成源信息 xiongziliang 2020-09-27 11:32:49 +0800
• c4e28fb894 Merge remote-tracking branch 'upstream/master' into master monktan 2020-09-27 10:55:34 +0800
• 2cf66594e8 解决截图失败的问题 xiongziliang 2020-09-26 10:07:22 +0800
• 4f42f508d5 复用代码 xiongziliang 2020-09-26 09:39:38 +0800
• 94134ef617 ehome初版 kqbi 2020-09-25 11:11:18 +0800
• 8b6394d43d
  Merge pull request #19 from xia-chu/master baiyfcu 2020-09-22 17:20:22 +0800
• 2ae97a66ea
  Update README.md 夏楚 2020-09-22 16:07:11 +0800
• 9aff554719 Merge remote-tracking branch 'upstream/master' into master monktan 2020-09-22 15:49:22 +0800
• d3be28b1a9 Merge remote-tracking branch 'upstream/master' into master monktan 2020-09-21 15:50:15 +0800
• efdc105b40 减少内存拷贝，提升性能 xiongziliang 2020-09-21 14:56:58 +0800
• 416d21df36 返回值去除std::move xiongziliang 2020-09-21 14:32:56 +0800
• 0b33bc1888 合并主分支 monktan 2020-09-21 11:01:02 +0800
• 06f1731bca 添加作者 xiongziliang 2020-09-21 10:29:51 +0800
• ab74a185a0 更新第三方库 xiongziliang 2020-09-20 23:27:26 +0800
• 29eec742e1 添加新作者 xiongziliang 2020-09-20 23:05:13 +0800