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

#4035

#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

• 7ba5da44f4 增加firstTSOneGOP配置,解决当GOP小于segDur时，可提高首屏播放的速度 zjx94 2023-11-25 17:08:41 +0800
• ca80688d87 rtsp恢复产生ntp时间戳 origin/feature/relative_stamp xia-chu 2023-11-25 11:27:43 +0800
• f6a97af55c 修复mp4录制使用相对时间戳导致不同步的bug xia-chu 2023-11-25 11:27:29 +0800
• 46c6ff038c 完善相对时间戳逻辑, 完善同步机制, 解决相对时间戳不同步的问题 xia-chu 2023-11-25 10:43:51 +0800
• 3f6625e75a 强制flush后更新时间戳 xia-chu 2023-11-25 10:32:22 +0800
• 14db56932b 新增平滑发送功能 xia-chu 2023-11-25 00:05:39 +0800
• 4f332c3d4f update: 等待每个视频流拿到1s的数据再开始编码（待实现 当输入视频流跟要输出视频帧率不一致时，进行补帧或丢帧） KKEM\Administrator 2023-11-24 21:17:29 +0800
• bd22c44ee9
  Docker镜像新增支持webrtc datachannel (#3020 #3019) KisChang 2023-11-24 17:32:32 +0800
• b9037424c8
  Update dockerfile KisChang 2023-11-24 14:53:16 +0800
• db0818c8d2
  新增mp4点播接口loadMP4File (#3018 #2972) 夏楚 2023-11-24 10:44:08 +0800
• 8c817e3cd2 MP4点播默认关闭hls-fmp4 xia-chu 2023-11-23 21:38:16 +0800
• 92e7d8837e
  RTC: 修复一组丢包分多次nack发送时blp-vector没有被重置的问题 (#3016) yujitai 2023-11-23 21:35:23 +0800
• e984e1d77e loadMP4File新增file_repeat参数 xia-chu 2023-11-23 21:34:52 +0800
• 93598e32ee 新增loadMP4File接口，支持点播指定mp4文件 (#2972) xia-chu 2023-11-23 21:27:50 +0800
• ad4f0317a5 RTC: 修复一组丢包分多次nack发送时blp-vector没有被重置的问题 于吉太 2023-11-23 20:57:10 +0800
• aacc95867f
  Add swagger ui for test http-api (#3012) alexliyu7352 2023-11-23 17:19:36 +0800
• 62eba8e390 feat: 视频拼接demo KkemChen 2023-11-23 17:01:21 +0800
• d959fbdd91 add swagger ui for test http-api Alex 2023-11-23 15:42:22 +0800
• d593267f61
  增加http代理功能 (#2988) alexliyu7352 2023-11-23 11:09:01 +0800
• 8bd7157ca1 支持日志上下文 feature/log_context xiongziliang 2023-11-20 21:59:43 +0800
• 84327213f8 typo fixed xiongziliang 2023-11-20 19:54:03 +0800
• c1f7908c9c 使用mINI方式设置http proxy url xiongziliang 2023-11-20 19:36:40 +0800
• a13b8417e5
  修复rtmps默认端口不对导致无法推/拉流问题 (#2996) Jovial Young 2023-11-19 14:37:04 +0800
• 22f5f56130
  rtc fix sdp ufag should not contain _ + = - by spec (#2993) xiongguangjie 2023-11-19 14:36:03 +0800
• 88f7f46497
  Bugfix: Only close edge streams with no viewers (#2994) Fummo 2023-11-19 06:35:18 +0000
• c03e7aaa96 修复rtmps默认端口不对导致无法推/拉流问题 Jovial 2023-11-18 14:00:48 +0000
• 03dccb6824
  Merge branch 'ZLMediaKit:master' into bugfix-origin-auto-close Fummo 2023-11-18 00:27:14 +0000
• 48ca0521cf
  Optimization syntax (#2915) Deepslient 2023-11-18 00:50:30 +0800
• 659fe7004c rtc sdp ufrag should not contain # = _ - due to https://crbug.com/1053756 xiongguangjie 2023-11-18 00:21:54 +0800
• ea3f3e3e63 Apply patch: Only close edge streams Fummo 2023-11-17 09:56:20 +0000
• 98f7c37cd5 代码润色 xia-chu 2023-11-17 17:52:34 +0800
• a78ca2ea5b 增加平均fps统计 Alex 2023-11-17 11:12:51 +0800
• 88dc59ec68 增加http代理功能 Alex 2023-11-17 05:49:03 +0800
• 7865f2c360
  修复udp单端口模式下rtp鉴权失败后无法关闭流的问题(#2985) taotaobujue 2023-11-15 11:02:12 +0800
• b3c7484c8a 解决：udp单端口模式下rtp鉴权失败后，继续接收流 taotaobujue2008 2023-11-14 20:51:07 +0800
• dfaa2ccf0a rtp通过udp推流鉴权失败后，增加延时断开，忽略所有数据。 zhutao04 2023-11-14 19:07:29 +0800
• 2a9a51af1f
  更新media-server (#2982) 老衲不出家 2023-11-14 02:33:37 -0600
• b45a1c9047 更新media-server monktan 2023-11-14 16:32:05 +0800
• d2374cbd79 兼容opensuse系统编译 648540858 2023-11-13 10:27:59 +0800
• fab7caa533 兼容opensuse系统编译 648540858 2023-11-13 10:27:59 +0800
• f6b6fe04cd 新增mk_publish_auth_invoker_do2接口，支持精细化控制推流转协议设置 xiongziliang 2023-11-12 21:14:46 +0800
• 4ea7565344 修复startSendRtp接口开启rtcp时触发断言异常的bug xiongziliang 2023-11-12 19:53:55 +0800
• 5b394fcff7 重写加载mp4文件推流rtsp/rtmp范例程序 xia-chu 2023-11-10 22:53:00 +0800
• 9a247e2fe4 重写加载mp4文件推流rtsp/rtmp范例程序 xia-chu 2023-11-10 22:53:00 +0800
• dbe6edb5de 更新zltoolkit xia-chu 2023-11-10 21:57:16 +0800
• 5c81640556
  修复国标级联音频可能错乱的bug (#2967) lvchenyun 2023-11-10 21:56:05 +0800
• 884f1d760b
  提高对不规范国标TCP推流的兼容性 (#2966) xbpeng121 2023-11-10 21:53:43 +0800
• fdd6c9e261 此场景(国标)由于直接转发，可能存在切换线程引起的数据被缓存在管道，所以需要CacheAbleFrame lvchy 2023-11-10 17:31:12 +0800
• f1e25b52bd Merge branch 'master' of https://github.com/xbpeng121/ZLMediaKit xbpeng121 2023-11-10 17:00:10 +0800
• aa06245971 适配对方流媒体不规范发rtp包问题。 问题：rtp-ps（tcp）包的搜索恢复，适1-建立tcp链接后，并不是从rtp包头开始发数据，所以zlm无法解析出正确的包。 解决方案： 1-在tcp数据报文中搜索0x000001bb(关键帧的system header)，找到后偏移固定字节恢复rtp包头 xbpeng 2023-11-10 16:19:15 +0800
• 5f8a77e6b1 Merge branch 'master' into dev xiongguangjie 2023-11-10 13:46:13 +0800
• 055fe2cb92 更新zltoolkit，修复fd溢出以及事件紊乱bug (#2946) xia-chu 2023-11-10 13:15:00 +0800
• 7f25138b46
  openRtpServerMultiplex接口统一url路径 (#2963) waken 2023-11-09 20:36:51 +0800
• a052e2c582 修复单词拼错 waken 2023-11-09 16:31:46 +0800
• 59342c0eec 单词错误 waken 2023-11-09 16:27:18 +0800
• 6888f20d74
  新增openRtpServerMultiplex接口，支持创建多路复用RTP服务器端口 (#2954) waken 2023-11-09 11:26:13 +0800
• f8285a3f6c
  startSendRtp接口新增支持同ssrc向多个服务器推流 (#2951) Dw9 2023-11-07 23:38:58 +0800
• 1609fe67d7
  Track新增update方法，支持更新宽高采样率等信息 (#2960) fruit Juice 2023-11-07 23:36:41 +0800
• 40ed60fc5e 确保线程安全 xia-chu 2023-11-07 23:33:09 +0800
• 014398a4f7 update返回bool xia-chu 2023-11-07 23:31:28 +0800
• a349a03ce9 Merge branch 'master' of github.com:xuandu/ZLMediaKit_1 xia-chu 2023-11-07 23:29:07 +0800
• 77b3c4312e 更新zltoolkit，修复打开文件描述符太多时，tcp服务器无响应的bug (#2946) xia-chu 2023-11-07 23:15:55 +0800
• aa5343effa 修复http客户端设置tcp连接超时时间单位错误的问题 xia-chu 2023-11-07 23:15:16 +0800
• a024f1e90d update mp4_video param when pixel changed xuandu 2023-11-07 22:23:56 +0800
• 433ecb1c5c
  RTC: 修复gop没有sps/pps导致的秒开失败问题 (#2959) yujitai 2023-11-07 19:34:40 +0800
• 603c080b29 增加ssrc_multi_send参数，保证默认发送行为 Dw9 2023-11-07 18:21:39 +0800
• 9f4adfcd33
  Merge 767b2a7aba into c95ccbd544 yujitai 2023-11-07 08:37:17 +0000
• e6981b84e3 RTC: 修复gop没有sps/pps导致的秒开失败问题 于吉太 2023-11-07 16:31:39 +0800
• 767b2a7aba RTC: 修复gop没有sps/pps导致的秒开失败问题 于吉太 2023-11-07 16:03:38 +0800
• d0a5948b78 增加创建多路复用RTP服务器接口 waken 2023-11-06 15:28:58 +0800
• c95ccbd544 更新webassist xiongziliang 2023-11-05 20:15:58 +0800
• 2628690673 国标udp多端口模式支持收到sr rtcp后回复rr rtcp xiongziliang 2023-11-05 13:26:42 +0800
• bf6fccd954 更新ZLToolkit，修复 #2946 xiongziliang 2023-11-05 13:04:41 +0800
• b257c670eb 调整持续集成配置 xiongziliang 2023-11-04 22:35:19 +0800
• 2206b031a9 防止析构时抛异常导致的崩溃 xiongziliang 2023-11-04 22:24:55 +0800
• ffcdecbff2 支持同ssrc向多个服务器推流 Dw9 2023-11-03 18:57:46 +0800
• 9f28384cd9 更新三方库 xiongziliang 2023-11-02 12:54:08 +0800
• 83b432b980 默认关闭only_audio模式，修复mk_media_start_send接口发送视频失败的bug xiongziliang 2023-11-02 12:51:08 +0800
• d8d7fe9144 通过getMediaList接口可返回Track时间戳增量信息 xia-chu 2023-10-28 11:09:31 +0800
• c1b82961cf deleteRecordDirectory接口新增name参数，可以指定删除特定录像文件 xia-chu 2023-10-28 10:22:43 +0800
• 6ccb57f4a1 通过getMediaList接口可返回Track时间戳增量信息 xia-chu 2023-10-28 11:09:31 +0800
• c1b6343479 deleteRecordDirectory接口新增name参数，可以指定删除特定录像文件 xia-chu 2023-10-28 10:22:43 +0800
• 0f94b48823
  修复url反转义失败时字符乱码相关bug (#2932 #2935) xiongguangjie 2023-10-27 22:49:42 +0800
• f78e3632e5 优化完善代码 2 xia-chu 2023-10-27 22:47:20 +0800
• e438744d76 优化完善代码 xia-chu 2023-10-27 22:46:02 +0800
• 6d06649a5b 更新webassist xia-chu 2023-10-27 21:45:03 +0800
• c876e53924
  优化ffmpeg url解析规则，提高rtmp客户端兼容性 (#2936) 夏楚 2023-10-27 21:39:36 +0800
• 7c81cbb24a fix url decode bug #2932 xiongguangjie 2023-10-27 19:42:52 +0800
• 1b95ed1c97 优化rtmp播放器url解析逻辑 xia-chu 2023-10-27 17:52:44 +0800
• be46a37d3a 精简代码 xia-chu 2023-10-27 17:43:32 +0800
• 0a09cdaeea 1. 局部变量删除前面的下划线 2. windows系统编译时strncasecmp 为_strnicmp yangkun 2023-10-27 13:54:31 +0800
• 7fde20bb4c 根据ffmpeg测试，类似rtmps://ip/a/b/c这样的url,app应该为a/b,stream_id应该为c, tcl_url应该为rtmps://ip/a/b,teams的rtmps需要按这种方式才能推成功 yangkun 2023-10-27 10:16:54 +0800
• 1a4b8406bb 新增作者列表 xia-chu 2023-10-25 20:41:39 +0800
• 4b568b33a1 新增web后台管理网页 xia-chu 2023-10-25 20:33:52 +0800
• ae662fa083
  webrtc dtls默认采用https证书，如果https证书不存在则随机生成 (#2928) 夏楚 2023-10-25 17:50:29 +0800
• 8294b7a175 修复https证书为空时的异常问题 xia-chu 2023-10-25 17:49:31 +0800
• 0d0b32f5e9 加载webrtc dtls证书时打印日志 xia-chu 2023-10-25 17:09:08 +0800
• 2d81c9969c webrtc dtls默认采用https证书，如果https证书不存在则随机生成 xia-chu 2023-10-25 17:04:09 +0800
• 0a19627d86
  修复startSendRtp成功后udp套接字被关闭的问题 (#2468 #2924) leibnewton 2023-10-25 15:14:08 +0800
• eeb2eadf0a Optimize index file code format Deepslient 2023-10-24 22:56:55 +0800