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

• fb2fcf99f3 更新 FFmpeg API 支持 FFmpeg 5 Xiaofeng Wang 2022-02-17 20:36:33 +0800
• cb00dbab0f 在track就绪前，强制split frame，防止sps pps未被获取到 ziyue 2022-02-17 14:32:49 +0800
• c997d11bd1 修复mp4点播时，sps pps太长导致获取失败的问题 ziyue 2022-02-17 14:31:28 +0800
• 5af247aba0
  Update README.md 夏楚 2022-02-17 11:37:26 +0800
• b75ca804a4
  Update README.md 夏楚 2022-02-17 10:49:23 +0800
• 9c45fca761
  根据配置禁用mmap缓存 (#1429) xiongguangjie 2022-02-17 10:35:10 +0800
• af08b58d29
  cmake项目分组 (#1431) mtdxc 2022-02-17 10:33:42 +0800
• 8a373b51d8 cmake项目分组 重要项目(toolkit和mediakit)增加目录显示 cqm 2022-02-16 18:02:59 +0800
• c3a8d9d60b 根据配置禁用mmap缓存 xgj 2022-02-16 19:01:29 +0800
• 304c898a3a 完善http文件获取相关代码 ziyue 2022-02-16 16:58:13 +0800
• 81199fabd4 添加必要头文件：#1248 ziyue 2022-02-16 10:30:58 +0800
• 45d9bcd5f4 ts解析失败时清空split缓存 xiongziliang 2022-02-13 22:02:16 +0800
• 6876a0a3e9 更新第三方库，解决时间戳回环导致ts无pat/pmt的bug xiongziliang 2022-02-13 21:55:09 +0800
• 2e9d77e8e1 删除多余ts split代码 xiongziliang 2022-02-13 21:36:04 +0800
• 83c1f29253 HLS: 解决hls断流重新生成后异常的bug xiongziliang 2022-02-13 21:06:32 +0800
• e37982adee
  优化hls媒体流注册与无人观看清理机制 (#1421) 夏楚 2022-02-12 16:24:55 +0800
• a7fa97422e bug fixed ziyue 2022-02-12 16:21:41 +0800
• 7e48bd2933 优化hls cookie管理 ziyue 2022-02-12 16:07:37 +0800
• d65e90d7cb 优化hls媒体流注册与无人观看清理机制 ziyue 2022-02-12 15:20:28 +0800
• 2fbd8de727 更新zltoolkit,解决msvc2017编译问题 xiongziliang 2022-02-11 20:44:42 +0800
• d432888ad4
  Merge pull request #1419 from ZLMediaKit/feature/mmap 夏楚 2022-02-11 16:56:08 +0800
• a2b6344861 修复hls m3u8返回content-type异常的问题 ziyue 2022-02-11 16:36:40 +0800
• 49fc17d7e0 hls m3u8文件直接通过内存读写 ziyue 2022-02-11 16:21:19 +0800
• 642c9c075a 修复设置cookie错误的bug ziyue 2022-02-11 15:14:34 +0800
• 36f24527a4 http cookie减少互斥锁，优化性能 ziyue 2022-02-11 14:33:11 +0800
• c510f3765a 关闭小文件mmap预加载功能 ziyue 2022-02-11 14:02:55 +0800
• 984715a018 修复获取共享mmap大小bug ziyue 2022-02-11 13:40:41 +0800
• 8188aa0d53 非必要不调用fopen ziyue 2022-02-11 13:10:56 +0800
• 3f6f26731a ts小文件先加载到内存 ziyue 2022-02-11 12:48:54 +0800
• 96503967fc 屏蔽sendfile特性 ziyue 2022-02-11 12:03:45 +0800
• 832c8d0d80 优化mktime性能问题 ziyue 2022-02-11 11:54:12 +0800
• d541ed2572 修复编译警告 ziyue 2022-02-11 11:13:43 +0800
• 8338773767 hls/http-ts播放器新增性能测试模式 ziyue 2022-02-11 11:04:16 +0800
• 91c0a563c3 确保mmap缓存记录表不膨胀 ziyue 2022-02-10 21:23:50 +0800
• dc672b14e3 确保32位系统支持超过4GB文件下载 ziyue 2022-02-10 21:06:51 +0800
• ba213346bc http文件服务器mmap方案采用共享方式 ziyue 2022-02-10 20:23:37 +0800
• 72caa43c97 主动关闭的流不支持断流续推: #1401 ziyue 2022-02-09 14:31:40 +0800
• 595182cebb Revert "当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401)" ziyue 2022-02-09 14:21:35 +0800
• 81747d114e Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-02-09 11:48:51 +0800
• cd1ca2c18c http-flv直播后缀由.flv改成.live.flv(目的是防止与flv文件下载冲突) ziyue 2022-02-09 11:48:15 +0800
• 8c30f11c17 修复windows下编译错误 xiongziliang 2022-02-05 20:55:01 +0800
• 1dd3d6f1ac 忽略SIGPIPE信号 xiongziliang 2022-02-05 20:39:24 +0800
• 0402646f7c 防止命名空间歧义 xiongziliang 2022-02-05 01:01:29 +0800
• 4505f8ff4f 仅http协议开启sendfile优化 xiongziliang 2022-02-05 01:00:48 +0800
• d13e31c21b
  尝试使用sendfile优化http文件服务器 (#1411) 夏楚 2022-02-04 23:02:19 +0800
• fb0bf4840a 尝试使用sendfile优化http文件服务器2 xiongziliang 2022-02-04 22:59:32 +0800
• 04b2d67198 尝试使用sendfile优化http文件服务器 xiongziliang 2022-02-04 22:50:12 +0800
• c72cf4cbcc
  整理命名空间 (#1409) 夏楚 2022-02-02 20:34:50 +0800
• aa3736a647 修复编译问题3 xiongziliang 2022-02-02 19:53:59 +0800
• 7dd01093a3 修复编译问题2 xiongziliang 2022-02-02 19:38:55 +0800
• 954aeb5ed3 修复编译问题 xiongziliang 2022-02-02 19:30:03 +0800
• d1732ea1c9 修复macos ci xiongziliang 2022-02-02 19:21:39 +0800
• 9368b8278d 整理命名空间2 xiongziliang 2022-02-02 19:15:31 +0800
• 96cb340698 整理命名空间 xiongziliang 2022-02-02 19:03:49 +0800
• 769066f820 补充命名空间 Xiaofeng Wang 2022-01-26 19:31:10 +0800
• 3a7d3c5a6d feat: remove using namespace std in header files when zltoolkit remove std in header Johnny 2022-01-24 18:29:29 +0800
• 4449b92828 feat: remove using namespace std in header files. Johnny 2022-01-24 17:44:04 +0800
• f6b772975a feat: remove using namespace mediakit in header files. Johnny 2022-01-24 17:25:13 +0800
• dba0e5ae42 feat: remove using namespace mediakit in RtpExt.h Johnny 2022-01-24 17:05:14 +0800
• 1c6c4c83cd feat: remove using namespace mediakit in FFmpegSource.h Johnny 2022-01-24 17:02:32 +0800
• ad91614194 feat: remove using namespace mediakit in header files. Johnny 2022-01-24 16:49:13 +0800
• 80a0e27d8c
  link atomic library automatic when compile on raspberrypi (#1405) Dw9 2022-01-29 22:40:08 +0800
• 36a2f16efe 精简cmake操作 Dw9 2022-01-28 20:39:37 +0800
• ee085bf1bf 支持树莓派编译，自动检测atomic链接库 Dw9 2022-01-28 01:06:10 +0800
• 2f12f8cc1d 增加检测atomic源文件 Dw9 2022-01-28 01:05:12 +0800
• c97aa8483e
  当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401) joshuafc 2022-01-27 14:56:18 +0800
• 54f7df0043 MediaSource::close逻辑执行成功后执行unregist joshuafc 2022-01-27 14:52:28 +0800
• 4b2be8e05a
  调整 clang-format 风格配置 (#1404) Xiaofeng Wang 2022-01-27 14:39:55 +0800
• 59a90b3816 调整 clang-format 风格配置 Xiaofeng Wang 2022-01-26 19:56:41 +0800
• 969c52eacb 当调用mk_media_source_close(ptr, 1);时，主动注销流 joshuafc 2022-01-26 10:54:58 +0800
• 3bf6ec8939 修复获取推流所有权导致引用计数紊乱的bug: #1397 xiongziliang 2022-01-26 00:36:57 +0800
• 756ec1364b websocket客户端触发事件时确保对象强引用有效 ziyue 2022-01-25 11:44:51 +0800
• 4f27894302 添加bom头 ziyue 2022-01-24 14:25:37 +0800
• bc583e80b5 合并pr: #1391 ziyue 2022-01-24 14:23:36 +0800
• 96061f1d36 Merge branch 'fix_rtc_g711_play' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-24 14:16:19 +0800
• 341459fbf5 fix non rtc push rtc play g711 audio loss xgj 2022-01-24 11:57:24 +0800
• 0ae9a8c8c8 Revert "添加递归溢出检测代码: #1363" ziyue 2022-01-24 11:38:36 +0800
• 80ecd2098e 修复编译警告 ziyue 2022-01-24 10:48:15 +0800
• 131476d3ac 更新zltoolkit, 修复RingBuffer相关bug ziyue 2022-01-24 10:46:05 +0800
• 100822f079 HLS: 修复时间戳回退导致不生成ts切片的bug: #1381, #1386 ziyue 2022-01-21 18:00:12 +0800
• aea949bd54 修正切片时间为负的问题 Alex 2022-01-21 16:47:44 +0800
• 3a8e954255 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-21 16:11:22 +0800
• 5007578202 hls/ts 播放器不做content-length严格限制 ziyue 2022-01-21 16:10:27 +0800
• f46d909bba 添加bom头，解决msvc编译问题 xiongziliang 2022-01-20 22:49:47 +0800
• bf191aa902 去除多余头文件 ziyue 2022-01-20 15:39:40 +0800
• 88dc8d0a73 重写http客户端异常处理机制 ziyue 2022-01-20 14:48:45 +0800
• 0f905b7333 优化http-ts播放器日志提示 ziyue 2022-01-19 22:53:21 +0800
• ee6ad66a6d HTTP: 重写http相关超时管理机制 ziyue 2022-01-19 22:50:44 +0800
• 03a8d3a6ac Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-19 17:45:15 +0800
• 81cf93a2bf openRtpServer接口强制关闭reuse_port属性，防止端口冲突 ziyue 2022-01-19 17:44:58 +0800
• 23774cc3b3
  Update README.md 夏楚 2022-01-19 17:17:22 +0800
• bde80d205f
  Update README.md 夏楚 2022-01-19 17:12:03 +0800
• 8937d9ea92 添加递归溢出检测代码: #1363 ziyue 2022-01-17 14:47:55 +0800
• 0c4410c523 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-01-17 10:36:00 +0800
• 27482a5459 修复编译警告 ziyue 2022-01-17 10:35:29 +0800
• c9d755f4e8 修复编译问题 xiongziliang 2022-01-14 22:04:46 +0800
• e8b0993493
  给openrtpserver接口添加enable_reuse参数 (#1372) wangcker 2022-01-14 21:53:01 +0800
• 7407f34eba
  给openrtpserver接口添加enable_reuse端口 wangcker 2022-01-14 21:43:05 +0800
• 6971eb73d8
  修改rtpopen逻辑 wangcker 2022-01-14 21:42:05 +0800
• 2f17a105e5 fix reuse yinghui 2022-01-14 14:42:54 +0800