ZLMediaKit

Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

branch_cumulative_commit

feature/async_write_file

feature/dynamic_codec

feature/hls_record_disk

feature/log_context

feature/test

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

#3429

#3432

#3433

#3442

#3444

#3446

#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

#3691

#3692

#3693

#3694

#3699

#3707

#3713

#3714

#3715

#3716

#3716

#374

#375

#382

#383

#397

#4

#4

#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

0a1c7cb9c9 更新第三方库 xiongziliang 2023-04-01 23:25:42 +0800
8b97076372

完善issue模板，强制要求填写issue标题夏楚 2023-03-28 17:03:29 +0800
ad3d6b1714

Update question.md #2340 夏楚 2023-03-28 17:03:03 +0800
e71d780761

Update question.md 夏楚 2023-03-28 17:02:52 +0800
f7cf58ca82

Update feature.md 夏楚 2023-03-28 17:01:21 +0800
bc3dac723f

Update compile.md 夏楚 2023-03-28 17:01:09 +0800
72a53bb1b2

Update bug.md 夏楚 2023-03-28 17:00:20 +0800
c072710021

Update question.md 夏楚 2023-03-28 16:58:26 +0800
e0c7d78356

Update feature.md 夏楚 2023-03-28 16:58:05 +0800
58d9e61497

Update compile.md 夏楚 2023-03-28 16:57:48 +0800
19623023e9

Update bug.md 夏楚 2023-03-28 16:56:57 +0800
d8102e203a

Update compile.md 夏楚 2023-03-28 16:56:44 +0800
280136df74

Update question.md 夏楚 2023-03-28 16:56:22 +0800
4bc8c830a9

Update feature.md 夏楚 2023-03-28 16:55:23 +0800
11fa293a74 sync from master #2332 xiongguangjie 2023-03-27 19:33:47 +0800
514f81304a sync from rtc client js xiongguangjie 2023-03-27 19:15:51 +0800
5792af3dd5 fix direct_proxy is 0 repush not success xiongguangjie 2023-03-25 20:40:40 +0800
6383e25826 Merge branch 'master' into dev xiongguangjie 2023-03-25 20:32:43 +0800
a390042f38 srt push check audio and video timestamp sync xiongguangjie 2023-03-25 20:32:21 +0800
d611a18903 rtmp repush replace pre pusher xiongguangjie 2023-03-25 00:03:22 +0800
67d5ca0246 rtsp push replace pre pusher xiongguangjie 2023-03-24 23:13:25 +0800
ca7efd5941

修正ssrc轮回为0时，ssrc重复分配为1的bug(#2327) ljx0305 2023-03-24 16:19:22 +0800
ba43d1aa3d

修正s_ssrc为0时ssrc为1，s_ssrc为1时ssrc也为1所造成的冲突问题 #2327 ljx0305 2023-03-24 10:57:08 +0800
876aea33f5 avoid fps too big xiongguangjie 2023-03-23 18:14:28 +0800
48e4705940

Merge pull request #1 from ZLMediaKit/master ljx0305 2023-03-23 17:23:22 +0800
98ec6b68d9

HttpRequester支持失败重试功能(#2323) mtdxc 2023-03-23 14:46:45 +0800
609cc9be21 change type from int to size_t #2323 cqm 2023-03-23 12:33:37 +0800
ea45dd3a17 HttpRequester add retry support cqm 2023-03-22 21:57:51 +0800
dfd37ff350 时间戳处理新增接口支持获取相对时间戳 xiongziliang 2023-03-22 21:18:46 +0800
e08bb73604

Merge pull request #2322 from Leonnash/master xiongguangjie 2023-03-22 16:04:19 +0800
cf342a6fdf

Update WebApi.cpp #2322 Leonnash 2023-03-22 15:52:56 +0800
950f33bd3f 新增windows中_M_ARM64 _M_ARM _M_X64 CPU指定集识别 baiyfcu 2023-03-17 02:04:00 +0800
a754a22680 修复在WINDOWS上cpu类型无法判断BUG baiyfcu 2023-03-17 01:31:56 +0800
1dec350dcd

修正on_rtp_server_timeout hook时获取的端口非真实端口 (#2297) ljx0305 2023-03-15 14:54:18 +0800
4f62129d65

精简之前漏修改的代码 #2297 ljx0305 2023-03-15 14:37:05 +0800
ab327853df

精简代码 ljx0305 2023-03-15 14:28:12 +0800
6008ae157a

修复addFFmepgSource接口参数非法时无法清除记录表的bug (#2305) Derek Liu 2023-03-14 19:38:24 +0800
aba2eb9e5d 捕获addFFmepgSource接口参数dst_url解析错误的抛错,通过错误回调返回返回错误,清除s_ffmpegMap表中的无效KEY #2305 刘跃龙 2023-03-14 10:00:32 +0000
70ad9cb0b6 设置webrtc端口缺省配置为0(不开启) xia-chu 2023-03-13 20:59:17 +0800
5ae34d666e

提高 rtmp tcUrl 解析兼容性 (#2303 #2298) TempoTian 2023-03-13 20:42:31 +0800
b9fa5f9b5e 实例汇报时间改成60分钟一次 xia-chu 2023-03-13 20:29:18 +0800
3c148b4e9a 修正 RTMP tcURL 解析错误 #2303 tempo 2023-03-13 15:21:27 +0800
37cb29fa8e

increase sdp rel-addr length limit: #2330 #2302 ahaooahaz 2023-03-13 17:38:08 +0800
ef6c0cdb88

incr sdp rel-addr length([#2330](https://github.com/ZLMediaKit/ZLMediaKit/issues/2300)) #2302 AHAOAHA 2023-03-13 16:25:43 +0800
fc91091e81

incr sdp rel-addr length([#2330](https://github.com/ZLMediaKit/ZLMediaKit/issues/2300)) #2301 zhanghao 2023-03-13 16:02:49 +0800
2c84f49c55

修正on_rtp_server_timeout hook时获取的端口非真实端口 ljx0305 2023-03-13 09:25:20 +0800
96e1cf8146 优化cpu类型判断宏 xia-chu 2023-03-12 18:45:37 +0800
46ba4894db 更新三方库 xia-chu 2023-03-12 18:13:27 +0800
d818cad3c0 修复低版本gcc编译器lambda不支持可变长度模板参数捕获导致的编译问题:#2295 xia-chu 2023-03-12 09:39:49 +0800
843e3423cf 新增实例上报功能: #2294 xia-chu 2023-03-12 00:06:39 +0800
4617b6faa0 更新readme功能描述 xia-chu 2023-03-11 21:22:37 +0800
15dc854e94

修复http multi form上传文件名相关bug(#2293) mtdxc 2023-03-11 21:08:39 +0800
44dde7a939 更新zltoolkit xia-chu 2023-03-11 21:02:32 +0800
8b0ad4d670 fixed oss form upload file error #2293 cqm 2023-03-11 20:20:41 +0800
1bab0b8e31 修复WebSocket线程安全问题，同时新增内置客户端、服务端心跳机制。 xia-chu 2023-03-11 11:08:14 +0800
c2a8d46a64 提高c sdk mk_media对象线程安全 xia-chu 2023-03-11 11:02:20 +0800
ba4296e180 修复断连续推情况下线程迁移导致崩溃的bug:#2283 xia-chu 2023-03-11 10:34:28 +0800
9188ed1613 更新zltoolkit xia-chu 2023-03-11 10:18:28 +0800
4cc2982a2c 重写jitter buffer算法，修复seq回环时可能丢包的bug xia-chu 2023-03-11 10:17:31 +0800
c301ecd207 限定nack rtt时间有效值范围 xia-chu 2023-03-11 10:16:44 +0800
1cc0f51c07

replace ffmpeg deprecated api avpicture_fill to av_image_fill_arrays (#2279) ljx0305 2023-03-09 15:24:32 +0800
2d7bddf5ca Revert "修正on_rtp_server_timeout hook时获取的端口非真实端口" #2279 ljx0305 2023-03-09 14:06:40 +0800
5f24842e7e

去掉代码注释 ljx0305 2023-03-09 09:06:52 +0800
cba46e2c87 Merge remote-tracking branch 'origin/master' xiongguangjie 2023-03-08 19:34:01 +0800
a7c7470d46 compitable for rtc ipv6 candidate and ice-lite sdp global session xiongguangjie 2023-03-08 19:33:52 +0800
07a3bf4df8 静音音轨不参与rtc转码 cqm 2022-11-30 12:05:02 +0800
b455586b34 重构 audio_transcode 代码： - 独立出 RtcMediaSource，并只对rtc开放 - 增加Rtc g711转码开关 cqm 2022-11-29 20:38:59 +0800
06ddad0512 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode cqm 2023-03-07 17:20:34 +0800
bb78a5ebee

Merge pull request #1 from ZLMediaKit/master ljx0305 2023-03-07 11:55:42 +0800
07aaf4c8f7

修正on_rtp_server_timeout hook时获取的端口非真实端口 ljx0305 2023-03-07 11:51:38 +0800
23296ae5fa 加大参数冗余，提高webrtc抗丢包能力 ziyue 2023-03-07 10:37:44 +0800
e326d04aed

ffmpeg deprecated avpicture_fill ljx0305 2023-03-07 10:30:00 +0800
d05c9d5f51 重写jitter buffer长度控制算法，提高webrtc/rtp抗丢包能力 ziyue 2023-03-06 20:43:07 +0800
d6e9a4fb90 remove PSParser mistake comment xiongguangjie 2023-03-06 19:33:34 +0800
9fdb3de8b2 优化rtp排序抖动缓存算法，提高webrtc/rtsp抗丢包性能 xiongziliang 2023-03-05 23:24:55 +0800
4942a0f574 优化nack重传rtt间隔时间估算逻辑 xiongziliang 2023-03-05 21:54:27 +0800
3bc75d6ba8 注释过多的日志 xiongziliang 2023-03-05 20:55:57 +0800
280ee30aac 优化webrtc nack响应速度且精简代码 xiongziliang 2023-03-03 21:56:14 +0800
9b273a33ba webrtc新增stop软插件，支持http信令调用 #2272 Dw9 2023-03-03 21:50:22 +0800
28f8c1ffec 统一webrtc注销流程，减少重载 Dw9 2023-03-03 21:33:05 +0800
11870fb18e 更新zltoolkit ziyue 2023-03-03 15:25:25 +0800
8ab3e0a4d4 初始化selectedTuple为nullptr, 修复webrtc ice建连状态错误 ziyue 2023-03-03 15:25:15 +0800
56d6eb0f28 批量替换tab为4个空格 ziyue 2023-03-03 15:24:12 +0800
a5c3db4ee1 修复逻辑判断不严禁XSS攻击，server在windows debug运行时拒绝服务攻击：#2213 baiyfcu 2023-03-03 14:44:59 +0800
bf7bee8ada 修复selectedTuple变量没初始化，并修改代码缩进 #2270 cqm 2023-03-03 12:35:00 +0800
4783ac0808

修复webrtc多候选地址无法来回切换的bug (#2266) mtdxc 2023-03-03 11:18:21 +0800
e86b25af9f selectedTuple使用强引用，提高性能 #2266 ziyue 2023-03-03 10:32:23 +0800
24a1b09dd1 精简代码，修复webrtc客户端断开时不触发流量统计事件的bug ziyue 2023-03-02 21:06:28 +0800
ff554f4cb0 强引用 IceServer::tuples 删除WebRtcTransportImp::_selected_session cqm 2023-03-02 18:02:16 +0800
42370aa312 fixed ice candidate error cqm 2023-03-02 11:54:22 +0800
91efab281e

c sdk添加安装动态库到bin目录 (#2259) gongluck 2023-02-28 23:00:59 +0800
539d6299f0 rtp服务器单端口模式收到相同ssrc推流时延时关闭RtpSession对象(防止频繁创建销毁对象) xiongziliang 2023-02-28 22:43:57 +0800
c2e1083493 复用rtp/rtcp判断逻辑过滤非rtp包: #2247 xiongziliang 2023-02-28 22:23:30 +0800
7fac3e063f Update CMakeLists.txt #2259 gongluck93@gmail.com 2023-02-28 15:21:47 +0800
bc609e0238 修复" install TARGETS given no ARCHIVE DESTINATION for static library target" gongluck93@gmail.com 2023-02-28 14:53:43 +0800
b27aec2119 api模块添加安装动态库到bin目录 #2258 gongluck93@gmail.com 2023-02-28 14:30:02 +0800
dc8508c58f 完善c sdk对象描述元信息，防止隐式指针转换错误 xiongziliang 2023-02-26 21:45:14 +0800
8f108395a5 rtp服务器过滤非rtp包: #2247 xiongziliang 2023-02-26 21:11:31 +0800
a981ce8cb3 优化webrtc nack算法：#2249 ziyue 2023-02-25 00:19:00 +0800
a15053ff01 更新作者列表 ziyue 2023-02-25 00:18:51 +0800