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

Mono Color

• c191c9cf86
  Merge 6259ed5b5e into d735aa1797 #3716 mtdxc 2024-07-14 09:32:55 +0800
• d735aa1797
  Media tuple refactor (#3715) master mtdxc 2024-07-14 09:32:41 +0800
• 0eb38635ce
  国标推流一直打印 'Already existed a same track' (#3713) 张传峰 2024-07-14 09:27:14 +0800
• 9727e03c2e
  修复创建单端口udp_server自定义vhost、app为空问题 (#3714 #3702) waken 2024-07-14 09:26:29 +0800
• 6259ed5b5e use vars.VERSION_ISSUE_NO #3716 cqm 2024-07-12 18:16:56 +0800
• 6905b5cfe6 RtpMultiCaster MediaTuple重构 #3715 cqm 2024-07-12 17:19:31 +0800
• f5a8226bbc PlayerProxy和Mp4Reader构造函数MediaTuple重构 cqm 2024-07-12 17:04:05 +0800
• 3b1f52ed34 修复创建udp_server自定义vhost、app问题 #3714 waken 2024-07-12 16:19:27 +0800
• 6552dffec3
  Merge pull request #32 from ZLMediaKit/master waken 2024-07-12 16:15:58 +0800
• af32be36c5
  Merge 9de09a4f68 into 3e7e1a317e #3429 johzzy 2024-07-12 14:01:11 +0700
• fdba1614fc 国标推流一直打印 'Already existed a same track' #3713 zhangchuanfeng 2024-07-12 14:57:17 +0800
• 6e44a5934b
  Merge b77515d217 into 3e7e1a317e #3189 vvoidon 2024-07-12 08:59:42 +0800
• 1f682e2c4e
  Merge c8fedccd78 into 3e7e1a317e #2423 alex 2024-07-12 08:58:52 +0800
• bebdda1407
  Merge 6119ac9c53 into 3e7e1a317e #3419 imp_rayjay 2024-07-12 08:57:19 +0800
• 525990261b
  Merge bacd6ed113 into 3e7e1a317e #3691 endless 2024-07-10 15:52:08 +0800
• 3e7e1a317e
  Fix the bug in Win32 that fails to retrieve sizes larger than 4GB. (#3707 #3702) PioLing 2024-07-10 10:43:14 +0800
• 20403b28e1
  Fix the bug in Win32 that fails to retrieve sizes larger than 4GB. #3707 PioLing 2024-07-10 09:49:53 +0800
• f24802d0e4
  WebAPI: Fix build if ENABLE_MP4=false (#3699) autoantwort 2024-07-09 04:43:34 +0200
• c72e576420
  rtp server新增支持自定义vhost和app名称 (#3693) zhang2349 2024-07-09 10:42:10 +0800
• 79f768e2fb WebAPI: Fix build if ENABLE_MP4=false #3699 Leander Schulten 2024-07-08 20:53:35 +0200
• c4acf45240 更新postman文件 #3693 zhang2349 2024-07-08 11:45:42 +0800
• a1b6ecc4e1 更新测试程序 zhang2349 2024-07-08 11:45:31 +0800
• b4fecdc929 防止对象析构时抛异常导致的崩溃 xia-chu 2024-07-05 21:05:59 +0800
• 8815776b81
  For rtc web demo add vconsole to look log on mobile phone (#3694) xiongguangjie 2024-07-05 20:56:58 +0800
• fb49515baa
  添加从mk_parser循环获取所有header的接口 (#3692) benshi 2024-07-05 20:56:23 +0800
• 6c3d362b5a
  修正finish是true但track不支持，没有执行addTrackCompleted的问题 (#3689) zhang2349 2024-07-05 20:55:36 +0800
• 5b4ec8415d
  Fix dahua nvr rtsp record compatible bug (#3677 #3632) xiongguangjie 2024-07-05 20:54:06 +0800
• 9f98c732ec 解决centos7官方源下架问题 feature/test xia-chu 2024-07-05 20:49:02 +0800
• 5f955f51b8 for rtc web demo add vconsole to look log on mobile phone #3694 xiongguangjie 2024-07-05 19:44:40 +0800
• 80b704ecc7 添加rtp server支持自定义vhost和app名称 zhang2349 2024-07-05 16:07:37 +0800
• 90103065ab 添加从mk_parser循环获取所有header的接口 #3692 benshi 2024-07-04 22:29:22 +0800
• bacd6ed113 修改每次单独sleep 40ms，导致总体时间偏差出现视频卡顿。 #3691 endless 2024-07-04 11:25:12 +0000
• 0a71a7993b
  修正finish是true但track不支持，没有执行addTrackCompleted的问题 #3689 zhang2349 2024-07-04 16:43:28 +0800
• 001d362395 fix dahua nvr rtsp record compatible bug for issue #3632 #3677 xiongguangjie 2024-07-01 19:46:58 +0800
• c15e454286 更新三方库，提高国标流兼容性 xiongziliang 2024-06-29 21:02:07 +0800
• 56d30322fe Linux平台下适配recvmmsg接口 xiongziliang 2024-06-29 11:33:17 +0800
• 8390d72b78 优化on_publish hook响应太慢导致rtp推流无法秒开的问题 xiongziliang 2024-06-28 22:38:16 +0800
• 5470049076 精简ProtocolOption相关代码 xia-chu 2024-06-28 19:35:03 +0800
• 116c3e4642
  Fix android build, link log library (#3670) gaoshan 2024-06-28 19:09:41 +0800
• cf6066b36e bugfix: 修复所有Player的删除器使用同一个线程进行析构导致崩溃的问题 (#3672) sgzed 2024-06-28 12:43:56 +0800
• 5a717186dd feat: 增加拉流代理rtsp时提供倍速功能支持 (#3669) Lidaofu 2024-06-28 12:43:41 +0800
• 0407389cb7 bugfix: 修复所有Player的删除器使用同一个线程进行析构导致崩溃的问题 #3672 #3671 sgg 2024-06-27 21:28:27 +0800
• 632c61d232
  fix android build, Update CMakeLists.txt #3670 gaoshan 2024-06-27 11:30:49 +0800
• be9b82ca79 feat: 增加拉流代理rtsp时提供倍速功能支持 #3669 lidaofu 2024-06-26 15:43:31 +0800
• 159d85f019 feat: 增加拉流代理rtsp时提供倍速功能支持 lidaofu 2024-06-26 15:33:45 +0800
• c24817671f Merge branch 'master' of https://github.com/lidaofu-hub/ZLMediaKit lidaofu 2024-06-26 14:53:10 +0800
• 2f2e8c2e43
  Adjust video layout (#3658) Xiaofeng Wang 2024-06-24 09:28:43 +0800
• 0d867e1939
  disable input device checking when recvOnly #3658 Xiaofeng Wang 2024-06-23 23:24:37 +0800
• b17987dd53
  set default aspect ratio of w:h to 16:9 Xiaofeng Wang 2024-06-23 23:23:49 +0800
• 2bf16e63e1 保证rtp服务器tcp模式下线程安全 xiongziliang 2024-06-21 21:04:51 +0800
• 2ead272187 修复webrtc播放时生成config rtp线程安全的bug xiongziliang 2024-06-21 20:46:17 +0800
• 1ef3642ed4 优化webrtc jitter buffer相关参数 xiongziliang 2024-06-21 20:21:45 +0800
• accb4b7336 保证rtp服务器tcp模式下线程安全 #3659 xiongziliang 2024-06-21 21:04:51 +0800
• 461c785620 修复webrtc播放时生成config rtp线程安全的bug xiongziliang 2024-06-21 20:46:17 +0800
• 2b2f379d52 优化webrtc jitter buffer相关参数 xiongziliang 2024-06-21 20:21:45 +0800
• 631498b167 Adjust video layout Xiaofeng Wang 2024-06-21 14:14:05 +0800
• 34bb843e9c
  update zlmrtcclient.js sdk and demon (#3653) xiongguangjie 2024-06-21 13:59:59 +0800
• 22f8a5a6d6 update zlmrtcclient.js support switch video and audio , and can select video and audio #3653 xiongguangjie 2024-06-20 16:56:37 +0800
• 9106dde23e
  g711 rtp encoder rtp mark set false compitable for freeswitch (#3647) xiongguangjie 2024-06-19 18:42:06 +0800
• 5e97ff22e8 g711 rtp encoder rtp mark set false compitable for freeswitch #3647 xiongguangjie 2024-06-19 17:55:16 +0800
• 2f6723f602
  perf: 调整VideoStack相关代码 (#3642) KkemChen 2024-06-19 14:06:02 +0800
• efc683228c
  修复H264/H265创建config帧异常问题(#3643) Xiaofeng Wang 2024-06-19 14:05:23 +0800
• d426c74c95 fixup! Send config frames once before sending DirectProxy RTP packets (#3611) #3643 Xiaofeng Wang 2024-06-19 12:06:12 +0800
• 7cab102bba chore: 修正缩进 #3642 KkemChen 2024-06-19 11:25:18 +0800
• 9fadcd275a
  Update WebApi.cpp KkemChen 2024-06-18 19:47:12 +0800
• bd9a7a78a2 perf: 调整VideoStack相关代码 KkemChen 2024-06-18 17:20:52 +0800
• e7d57cff7d
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-06-17 08:42:24 +0800
• 84dbe4b076
  Send config frames once before sending DirectProxy RTP packets (#3611) Xiaofeng Wang 2024-06-16 09:37:33 +0800
• 3de2ee7a2b 优化aac rtp解码器内存安全限定 xiongziliang 2024-06-16 09:34:39 +0800
• f7411db180
  send config frames once before sending DirectProxy RTP packets #3611 Xiaofeng Wang 2024-06-10 23:51:12 +0800
• 4f11cba26f
  support get config frames from video track Xiaofeng Wang 2024-06-15 23:17:20 +0800
• ad7b28bb0a
  补充mk_track、mk_media部分c api (#3628) Lidaofu 2024-06-15 15:55:39 +0800
• e2bb3607f9 完善 #3628 xiongziliang 2024-06-15 15:36:47 +0800
• 921f1c309d Merge branch 'master' of github.com:lidaofu-hub/ZLMediaKit xiongziliang 2024-06-15 15:30:56 +0800
• 720d6304d2 修复aac rtp解码兼容性相关bug xiongziliang 2024-06-15 15:11:36 +0800
• 170ec3c830 调整持续集成脚本 xiongziliang 2024-06-15 11:03:50 +0800
• 2287df325e feat: 补充mk_track、mk_media部分api lidaofu 2024-06-14 17:23:56 +0800
• f9f386bc23
  修改完善MediaSource事件拦截器 (#3622) PioLing 2024-06-14 12:59:02 +0800
• 15540fef26 修改完善mediasouce #3622 PioLing 2024-06-13 12:26:04 +0800
• d34da06766
  bugfix: 修复rtp推流观看人数统计异常的问题 (#3620 #3615) PioLing 2024-06-13 11:41:22 +0800
• 176c4e3b25
  修改rtpprocess 对象继承（MediaSourceEventInterceptor -->MediaSourceEvent） #3620 PioLing 2024-06-13 11:26:37 +0800
• c137776568 test: MediaPlayer拉流测试 #3619 KkemChen 2024-06-13 10:36:53 +0800
• 1695624732 防止release编译时第三方库断言不触发导致的崩溃 (#3617) #3618 xia-chu 2024-06-12 19:33:50 +0800
• 8159f4e085 bugfix: 修复rtp服务器单端口tcp模式下访问空指针崩溃的问题 xia-chu 2024-06-12 19:23:26 +0800
• c446f6bb98
  Disable unused docker workflow for pr (#3612) Xiaofeng Wang 2024-06-11 11:24:05 +0800
• 375e0f4294
  Disable unused docker workflow for pr #3612 Xiaofeng Wang 2024-06-11 00:07:04 +0800
• 4f7609d15d
  移除Android播放器代码，改成添加项目链接(#3606) li 2024-06-10 10:10:55 +0800
• d4d5da0bab 整理 #3606 xiongziliang 2024-06-10 10:08:07 +0800
• 10ee087664 Merge branch 'master' of github.com:leo94666/ZLMediaKit xiongziliang 2024-06-10 10:06:27 +0800
• b720ec7eff 新增mk_proxy_player_set_on_play_result代理失败回调接口 xiongziliang 2024-06-09 18:46:25 +0800
• 577fe86917 调整持续集成，linux ci修改为centos7 xiongziliang 2024-06-09 10:56:00 +0800
• 77d2df1695 移除RtpSelector相关逻辑，优化代码结构 xiongziliang 2024-06-09 10:52:10 +0800
• fbac3f9ba0
  RC4密码套件漏洞 (#3590) Luke 2024-06-09 10:45:40 +0800
• 6df0e2ee8b
  update ZLMRTCClient.js (#3596) xiongguangjie 2024-06-09 10:43:57 +0800
• 15bc4c8767
  解决帧率解析错误问题 (#3607) chdahuzi 2024-06-09 10:43:32 +0800
• 9a5fdd3dac
  修复组播bug (#3602) zwcarl 2024-06-09 10:42:02 +0800
• bb65f6908d 解决帧率解析错误问题 #3607 chdahuzi 2024-06-06 16:44:55 +0800
• ec439c70a1 添加Android端RTC播放器、推流等功能以及Demo li 2024-06-05 16:33:01 +0800
• 7bbdc0049c
  Merge 3c486dfb5e into 4cd735f61d #3603 li 2024-06-05 07:59:24 +0000
• 3c486dfb5e add android doc #3603 “719947897@qq.com” 2024-06-05 15:59:14 +0800