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

• 9d532cf16b fix startsendrtp pt error xgj 2022-04-01 19:12:37 +0800
• 61625f458f for webapi startsendrtp can send raw rtp xgj 2022-04-01 18:28:09 +0800
• b56113b69f
  解决大批量通过ffmpeg转推流时频繁ffmpeg重启崩溃问题 alexliyu7352 2022-03-30 10:27:35 +0800
• d5b8613858
  Merge pull request #1525 from wendelong/dev Xiaofeng Wang 2022-03-29 16:05:54 +0800
• 97ea8090ad 修复HLS播放导致程序异常的BUG wendelong 2022-03-29 13:43:17 +0800
• 62543202a5 精简进程管理相关代码 xiongziliang 2022-03-27 22:37:41 +0800
• ae99662a3d 修复编译警告 xiongziliang 2022-03-27 21:57:05 +0800
• 4b9b022690 优化进程管理代码: #1518 xiongziliang 2022-03-27 21:47:00 +0800
• 43c5d05d8f
  使用clone替代fork (#1518) alexliyu7352 2022-03-27 21:25:40 +0800
• 5879947325 webrtc url添加session参数，用于hook追踪会话唯一性 xiongziliang 2022-03-27 21:12:19 +0800
• b0af3334c1 修复firefox上webrtc echo测试无法通过的问题: #1493 xiongziliang 2022-03-26 22:11:50 +0800
• 822a401f30
  优化端口池范围限定逻辑 (#1508) Dw9 2022-03-26 10:15:18 +0800
• 59e80ef3fe
  先验证逻辑, 代码暂未优化和合并重复代码 alexliyu7352 2022-03-25 13:24:33 +0800
• 073b345226
  先验证逻辑, 代码暂未优化和合并重复代码 alexliyu7352 2022-03-25 13:23:48 +0800
• 24c6f28ef8 zlm rtc js sdk update for data channel xgj 2022-03-24 18:20:10 +0800
• 5bf76117ed
  编译问题 alexliyu7352 2022-03-23 16:56:22 +0800
• 234ba0b324
  Update Process.cpp alexliyu7352 2022-03-23 16:28:27 +0800
• fb0f38ec7e
  使用clone替代fork alexliyu7352 2022-03-23 15:42:23 +0800
• d0480a41bc Update Rtsp.cpp Dw9 2022-03-21 11:22:38 +0800
• a16b6cbc59 mp4切片逻辑提高对音视频交织性差的流的兼容性能 xiongziliang 2022-03-20 14:52:15 +0800
• e514ea7853
  更加明确推流目标是否是自己 alexliyu7352 2022-03-19 15:31:28 +0800
• 19c7d1c406 删除多余的日志打印 xiongziliang 2022-03-19 10:54:08 +0800
• b127d8c2a9 rtsp/GB28181随机端口，支持端口范围设置 xiongziliang 2022-03-13 20:48:01 +0800
• 4314006551 调整nack相关参数 xiongziliang 2022-03-13 19:22:19 +0800
• 94282d240e 修复编译问题 xiongziliang 2022-03-12 20:27:22 +0800
• aef2ae65af 优化代码 xiongziliang 2022-03-12 19:29:58 +0800
• 2ff293e2e5 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-03-12 19:28:02 +0800
• b8277974aa webrtc sdp msid不存在时，不添加 xiongziliang 2022-03-12 19:26:08 +0800
• cc91f10103
  修复关闭音频无法进行webrtc echo测试的bug (#1493) Dw9 2022-03-12 19:21:57 +0800
• 9c30cfef0e fix webrtc echo error Dw9 2022-03-12 18:20:19 +0800
• 76372cd34b 修好addStreamProxy接口获取参数失败的问题 xiongziliang 2022-03-12 15:23:45 +0800
• d239ada9ac 精简代码 xiongziliang 2022-03-12 15:18:12 +0800
• 9ae6abfbf4 更新addStreamProxy接口postman配置文件 xiongziliang 2022-03-12 15:15:52 +0800
• 3c99b3af98 修复addStreamProxy接口笔误 xiongziliang 2022-03-12 15:08:30 +0800
• 9527a2b1cf addStreamProxy接口新增多种转协议相关参数 xiongziliang 2022-03-12 15:07:01 +0800
• 8db01651fe on_publish hook新增rtsp/rtmp/ts/fmp4转协议开关 xiongziliang 2022-03-12 14:39:59 +0800
• 0f1120b8a6 on_publish hook新增多种选项 xiongziliang 2022-03-12 14:34:48 +0800
• 490656ec3e 去除mk_media_init_mute_audio接口 xiongziliang 2022-03-12 14:33:05 +0800
• 1cf0a0cc20 bug fix xiongziliang 2022-03-12 14:02:12 +0800
• 4dc621e1bb 转协议选项抽象为ProtocolOption对象 xiongziliang 2022-03-12 13:19:21 +0800
• ed661b1cf1 修改无法删除hls目录的bug:#1485 xiongziliang 2022-03-12 10:57:39 +0800
• 2d88115b3f 完善http直播url解析规则pr:#1467 xiongziliang 2022-03-12 10:04:36 +0800
• 81c0635bf2 Merge branch 'add_schema_query_string' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-03-12 09:53:07 +0800
• 090593f67c
  hls拉取索引文件避免循环重试 (#1474) alexliyu7352 2022-03-12 09:44:47 +0800
• 4be3c349be
  mpeg-ts解析丢弃不完整的包 (#1478) alexliyu7352 2022-03-12 09:41:15 +0800
• ef20204874
  格式化代码 夏楚 2022-03-12 09:40:56 +0800
• 276f763c08
  hls拉流动态计算切片超时时间 (#1477) alexliyu7352 2022-03-12 09:39:33 +0800
• b4241e12d5
  hls拉流新增支持mime类型 (#1476) alexliyu7352 2022-03-12 09:36:28 +0800
• 2c63916973
  http-ts拉流新增支持mime类型(#1475) alexliyu7352 2022-03-12 09:35:22 +0800
• 93261fe3ba Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-03-12 09:33:23 +0800
• df74606051 Merge remote-tracking branch 'origin/master' xiongziliang 2022-03-12 09:32:49 +0800
• 1b663e43ac 修复测试范例输入aac数据相关bug xiongziliang 2022-03-12 09:32:36 +0800
• 014293b019
  Update TSDecoder.cpp alexliyu7352 2022-03-06 23:06:49 +0800
• e7afe9265e
  丢弃不正确的包 alexliyu7352 2022-03-06 22:03:01 +0800
• fc2e51c5e7
  Update HlsPlayer.cpp alexliyu7352 2022-03-06 21:56:42 +0800
• bd4cdde2da
  动态计算切片超时时间 alexliyu7352 2022-03-06 21:53:15 +0800
• 84939d4d4f
  mime问题 alexliyu7352 2022-03-06 21:41:52 +0800
• 0b1fbe1db4
  mime头不全 alexliyu7352 2022-03-06 21:38:20 +0800
• 346e32af47
  hls拉取索引文件避免循环重试 alexliyu7352 2022-03-06 21:31:18 +0800
• ae62d44447
  Merge pull request #1470 from urmyfaith/patch-1 Xiaofeng Wang 2022-03-04 17:20:51 +0800
• cd4e772985
  remove dumplicate line rtc_media.type zx 2022-03-04 16:18:26 +0800
• 6ea6054073
  更新 issue 模版说明 Xiaofeng Wang 2022-03-04 15:07:01 +0800
• 4cfac989b3 支持?schema=rtmp/ts/fmp4格式 cqm 2022-03-03 19:39:18 +0800
• d88fe077ed on_publish hook新增originType字段 ziyue 2022-03-02 18:03:44 +0800
• 4af83cbe7c 修复ENABLE_MEM_DEBUG时编译失败的问题 ziyue 2022-03-01 19:00:50 +0800
• 5489b2dd17 更新第三方库: #1435 ziyue 2022-03-01 11:56:12 +0800
• 8324a9fe43 修复rtsp推流访问空指针的bug:#1456 xiongziliang 2022-02-28 17:20:20 +0800
• 7f66e6b4bf 消除编译警告 xiongziliang 2022-02-27 21:52:12 +0800
• 497bf289b6 完善rtc网络迁移日志打印 xiongziliang 2022-02-27 21:40:32 +0800
• f8ef5579ee 整理webrtc相关日志 xiongziliang 2022-02-27 21:26:49 +0800
• a0b464958c 优化rtp重发列队性能 xiongziliang 2022-02-27 12:24:54 +0800
• 6707b13418 rtp nack重传列队长度限制为5秒 xiongziliang 2022-02-27 02:08:17 +0800
• ba5ca8f5c7 修复rtp seq重复导致rtp nack重传列队异常的bug xiongziliang 2022-02-27 02:07:25 +0800
• 7a5cf925b0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-02-27 01:03:49 +0800
• b82cd5a500 确保ntp时间戳获取失败时，webrtc rtp重传缓存列队长度正常 xiongziliang 2022-02-27 01:02:54 +0800
• 3a2a60c40a
  防止开启模拟丢包代码时，生成twcc rtcp紊乱的bug 夏楚 2022-02-27 00:33:39 +0800
• db3df7b92e
  修复ssrc大小端转换bug 夏楚 2022-02-26 22:33:00 +0800
• d4ffeb005a
  新增官方docker镜像 (#1447) 夏楚 2022-02-24 11:46:38 +0800
• 113110bcb0
  Update README.md 夏楚 2022-02-24 11:44:49 +0800
• 26d0589bf5 ffmpeg命令支持相对路径 ziyue 2022-02-24 11:42:43 +0800
• bcb2810c62 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-02-24 11:30:49 +0800
• 5c6dcd041f 修复c api日志路径设置可能出错的问题 ziyue 2022-02-24 11:30:19 +0800
• 63f22ee6f2 截图失败时，返回ffmpeg日志; ffmpeg命令支持相对路径 ziyue 2022-02-24 11:28:48 +0800
• b8f2bb5061 修改推送官方镜像地址 monktan 2022-02-24 09:40:58 +0800
• a0d9244736
  Update README.md 夏楚 2022-02-23 20:59:06 +0800
• 77e4913afc 更新镜像打包脚本，修改用户名即可推送dockerhub monktan 2022-02-23 20:52:33 +0800
• a3d696d805 完善判定ffmpeg截图是否为空逻辑 ziyue 2022-02-23 17:06:09 +0800
• b2bb37dc5c http: 修复32位系统下，下载3GB以上文件失败的问题: #1446 ziyue 2022-02-23 17:03:13 +0800
• 4a7f5796ba 修复ts文件大于3GB时，获取文件大小异常的问题 ziyue 2022-02-23 17:01:53 +0800
• 40e32f2e26
  Update README.md 夏楚 2022-02-23 15:32:14 +0800
• 147ba6147c rtsp/rtp: 过滤干扰的rtp pt, 提高兼容性: #1445 ziyue 2022-02-22 16:53:05 +0800
• caf6ddf554 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-02-22 11:46:15 +0800
• a15d59cf23 hls/ts播放器改成绝对时间戳:#1389 ziyue 2022-02-22 11:44:37 +0800
• 9370a27c55
  更新 issue 模板 (#1439) Xiaofeng Wang 2022-02-21 14:35:53 +0800
• ad2f76981e 更新 issue 模板 wxf 2022-02-19 15:54:38 +0800
• d8b9c5b102
  更新 FFmpeg API 支持 FFmpeg 5 (#1434) Xiaofeng Wang 2022-02-17 21:03:20 +0800
• 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