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

#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

• 03c93d0b23
  Add config for save fmp4 record files (#3356) jamesZHANG500 2024-03-10 16:19:02 +0800
• 78a6f041a8
  Fixed issue that set use_ps in startSendRtp api does not take effect (#3353) huangcaichun 2024-03-10 16:17:29 +0800
• 1c22deed60 修改config.ini代码 zhangkejun 2024-03-08 11:33:24 +0800
• 8c6df251d1
  Merge branch 'ZLMediaKit:master' into record_fmp4 jamesZHANG500 2024-03-08 11:24:10 +0800
• 5e9ff5dff8 为录像fmp4配置文件增加注释 zhangkejun 2024-03-08 11:20:56 +0800
• fe61b572e0
  Fix hls fmp4 clear cache bug (#3355) xiongguangjie 2024-03-08 11:04:59 +0800
• ed647ca501 Fixed issue that set use_ps forwarding does not take effect for tcp passive mode huangcc 2024-03-08 10:32:28 +0800
• 5d94cd031b fix hls fmp4 clear cache bug for https://github.com/ZLMediaKit/ZLMediaKit/issues/3348 xiongguangjie 2024-03-07 22:34:41 +0800
• 9e7ef8a6a9 Fixed issue that set use_ps forwarding does not take effect huangcaichun 2024-03-07 16:08:33 +0800
• f916975791 MP4打包录像文件支持通过配置文件改为fmp4格式 zhangkejun 2024-03-07 14:33:17 +0800
• 3df1841232 Merge branch 'master' of https://github.com/ixingqiao/ZLMediaKit xingqiao 2024-03-07 11:59:02 +0800
• 9f80691145 feat: add ServiceController to manage PlayerProxy/PusherProxy/FFmpegSource/RtpServer services Johnny 2024-03-03 14:48:06 +0800
• df24bf732e move addStreamPusherProxy Johnny 2024-03-03 13:43:51 +0800
• 3e977a604b update some code Johnny 2024-03-02 16:59:42 +0800
• 6bd120a32f fix https://github.com/ZLMediaKit/ZLMediaKit/security/code-scanning/48 Johnny 2024-03-02 12:48:51 +0800
• 79b2aa6adc
  openRtpServer接口增加单视频参数，加快单视频流注册速度 (#3342) waken 2024-03-05 17:06:31 +0800
• ee67b19790 合并冲突 Waken 2024-03-05 13:51:49 +0800
• a50a254a9f # Waken 2024-03-05 13:44:35 +0800
• f778f782a3 减少修改范围 Waken 2024-03-05 11:33:43 +0800
• ffdc13bfb9
  RTP proxy通过UDP收流，调整udp recv socket buffer size成配置 (#3336) 张传峰 2024-03-05 10:42:22 +0800
• 9349135aea
  Merge pull request #25 from ZLMediaKit/master waken 2024-03-05 09:57:43 +0800
• 817dd521cb openRtpServer接口增加单视频参数，加快单视频流注册速度 Waken 2024-03-05 09:57:01 +0800
• 210894ed83 Use find_package when pkg_check_modules fails wdl1697454803 2024-03-01 13:27:44 +0800
• a554fab5fb add cmake minimum required 3.6.0 wdl1697454803 2024-02-28 18:26:25 +0800
• a4672913a5
  Merge pull request #24 from ZLMediaKit/master waken 2024-03-04 16:33:55 +0800
• 33ecc871f3 Merge branch 'master' into dev xiongguangjie 2024-03-04 15:56:31 +0800
• 1242e7878e Merge branch 'master' of https://github.com/wdl1697454803/ZLMediaKit wdl1697454803 2024-03-04 00:00:00 +0800
• 374b2680d6
  Merge branch 'ZLMediaKit:master' into master 张传峰 2024-03-02 20:55:41 +0800
• 9e89d3acd1 rtp proxy推流udp socket recv socket buffer size调整成配置 zhang-chuanfeng 2024-03-02 20:54:35 +0800
• f49aed7a32
  srt optimization code for query poller (#3334) johzzy 2024-03-02 06:25:32 -0400
• edbbecc247
  Merge branch 'ZLMediaKit:master' into master 张传峰 2024-03-02 18:06:19 +0800
• 1b709f665a Update submodules xiongziliang 2024-03-02 16:57:27 +0800
• 24ad9c9b9e
  Support mpegts rtp payload in startSendRtp (#3335) 夏楚 2024-03-02 16:53:53 +0800
• 5a6364bae2
  Add datachannel c apis and callbacks(#3328) gongluck 2024-03-02 16:52:51 +0800
• 9eef09f083 防止访问空指针 xiongziliang 2024-03-02 16:45:34 +0800
• 06abbd0eb7
  rtp send rtp g711 audio can config duration (#3325) xiongguangjie 2024-03-02 16:40:13 +0800
• e8011a7f6a Support mpegts rtp payload in startSendRtp xiongziliang 2024-03-02 16:37:23 +0800
• 1ed5949d47 update function signature about srt transport Johnny 2024-03-02 11:54:21 +0800
• e437d3a7e0 fix warning Johnny 2024-03-02 11:56:29 +0800
• ef25f27dc6 feat: add querySrtTransport Johnny 2024-03-02 11:35:26 +0800
• c7fd7871f9 feat: update SrtTransportManager key type from std::string to uint32_t Johnny 2024-03-02 10:53:34 +0800
• f9ddf4d396 fix build error gongluck 2024-03-01 21:17:47 +0800
• 6444b1857c code for optimization xiongguangjie 2024-03-01 21:08:19 +0800
• 358a106c6a 防止线程安全问题，规范代码 gongluck 2024-03-01 20:53:41 +0800
• 17bc1d62b1 Use find_package when pkg_check_modules fails wdl1697454803 2024-03-01 13:27:44 +0800
• 49e7f07e5a
  fix build error gongluck 2024-02-29 21:45:16 +0800
• 925bc3d744 fix code comment xiongguangjie 2024-02-29 21:10:56 +0800
• 327cd0ca85 fix error xiongguangjie 2024-02-29 21:07:25 +0800
• f84bead962 variable style unitform xiongguangjie 2024-02-29 21:03:33 +0800
• 203d5c77cb for rtp g711 encoder optimization xiongguangjie 2024-02-29 20:59:03 +0800
• 01083ebef9 增加datachannel数据收发的回调通知 gongluck 2024-02-29 18:33:27 +0800
• e880f9635b fix CodeQL error xiongguangjie 2024-02-28 22:55:37 +0800
• 094ee39515 rtp send rtp g711 audio can config duration xiongguangjie 2024-02-28 20:26:31 +0800
• 2de8512b11 add cmake minimum required 3.6.0 wdl1697454803 2024-02-28 18:26:25 +0800
• af17ae8606 fix tcp rst and push not success xiongguangjie 2024-02-26 19:47:37 +0800
• 87cb488b04
  Added support for DRI frames in MJPEG RTP packetization (#3305) imp_rayjay 2024-02-19 11:54:13 +0800
• e7e157c312 打包mjepg rtp的时候增加支持DRI(原先只在解包的时候支持,打包的时候并不支持) rayjay 2024-02-19 11:20:06 +0800
• 4fb593f4a1
  Fix compilation failure issue caused by lack of regular expression support in gcc 4.8.5 (#3301 #3279) xiongguangjie 2024-02-19 11:05:30 +0800
• 2b05d49f71 fix gcc 4.8.5 bug for https://github.com/ZLMediaKit/ZLMediaKit/issues/3279 xiongguangjie 2024-02-18 20:09:38 +0800
• da5673d1c4 Update ZLToolKit xiongziliang 2024-02-07 23:07:25 +0800
• 81b08af0ce Ensure thread safety of player and pusher xiongziliang 2024-02-07 23:06:42 +0800
• 306a32131c Fix crash issue when exit test_player xiongziliang 2024-02-07 22:40:41 +0800
• 4d28b99780
  Add mk_proxy_player_create2 for support more proxy options (#3262) lidaofu-hub 2024-02-04 23:15:11 +0800
• bfcaf15075
  Ignore localhost address when get icecand for webrtc from http request (#3282) waken 2024-02-04 23:11:18 +0800
• 1d708bb9e7 webrtc获取Host，忽略127.0.0.1 Waken 2024-02-02 13:41:35 +0800
• 96c5b76b3b Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-02-02 11:45:43 +0800
• a3a676ea09 Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-02-01 16:53:30 +0800
• 0359f178de Update ZLToolKit xiongziliang 2024-01-28 19:35:06 +0800
• 826f4de24a Add new authors xiongziliang 2024-01-28 19:31:20 +0800
• ceae040a7a
  Fix http url path and component's coding (#3237 #3181) sandro-qiang 2024-01-28 19:18:36 +0800
• 5e1629c381 urlencode/urldecode函数改名避免造成现有代码不兼容 Sandro 2024-01-28 15:21:11 +0800
• cfe9a31ca6 Fix http cross domain issues xiongziliang 2024-01-27 21:29:10 +0800
• 56bdb14baf
  解决流名被替换后，getRtpInfo等接口无法使用新流名的问题 (#3265) chdahuzi 2024-01-27 20:55:57 +0800
• fb628bf93e 优化代码，减少一次map查找 chdahuzi 2024-01-27 19:28:20 +0800
• 58030ec7d5 解决流名被替换后，getRtpInfo等接口无法使用新流名的问题 chdahuzi 2024-01-26 18:11:39 +0800
• f3fe23c1b1 添加拉流代理更都参数配置 李道甫 2024-01-26 10:54:40 +0800
• fd1ebb1a51
  Auto get icecand ip address from http request (#3251) waken 2024-01-26 10:26:30 +0800
• 9977b550e0
  Add snapshot cmd parameter to ignore audio (#3246) 张传峰 2024-01-26 10:19:19 +0800
• f2f7d656cc 修改ffmpeg抓拍忽略音频默认配置 zhangchuanfeng 2024-01-25 14:11:43 +0800
• 17962b7740 修复编译错误 Waken 2024-01-24 16:14:50 +0800
• 4c2f70e28a 头文件 Waken 2024-01-24 15:39:15 +0800
• 69ab6f970f 修复双网卡下，webrtc获取的localIp不对导致无法播放，需从源host获取ip Waken 2024-01-24 15:33:21 +0800
• c55d0cb66a Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-01-24 15:23:44 +0800
• 62641f426b
  Fix a bug in WebRTC where the DTLS certificate is too large(big than MTU) (#3250) 老衲不出家 2024-01-24 15:14:23 +0800
• cfd7ab33b2 修复dlts证书太大 导致超过mtu的bug monktan89 2024-01-24 15:03:37 +0800
• f9da87eb5d
  update media-server for ps demuxer bug fix (#3249) xiongguangjie 2024-01-23 22:47:39 +0800
• ccbd23997f update media-server for ps demuxer bug fix xiongguangjie 2024-01-23 22:44:49 +0800
• 6fcb832740 增加截图命令忽略音频参数 zhangchuanfeng 2024-01-23 17:29:21 +0800
• aa5d646be8 strCoding增加的成员函数忘了加类名名字空间 Sandro 2024-01-19 16:02:33 +0800
• d26f7b89dd 修正了http url和参数的编码解码 Sandro 2024-01-19 15:51:19 +0800
• 2ce92aca19 Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-01-19 13:51:11 +0800
• fdc5bfac26
  Add win32 mmap (#3229) PioLing 2024-01-18 11:04:27 +0800
• b43f5a119e
  correct typo (#3231) Paul Philippov 2024-01-17 22:00:14 -0500
• 3a80b1de1e
  openRtpServer接口新增local_ip参数 (#3224) waken 2024-01-18 10:59:09 +0800
• 230d2ff6ff 修改类型引发的编译错误 Waken 2024-01-18 10:24:13 +0800
• ee579ad483 Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-01-18 10:21:27 +0800
• 6096d80479 代码格式化 Waken 2024-01-18 10:20:30 +0800
• b2a805734a
  Remove the variable capture of "fp". PioLing 2024-01-18 09:07:16 +0800
• 5760f16b65
  correct typo Paul Philippov 2024-01-17 18:34:45 -0500
• 8d951f06a0
  修复rtp udp推流时，调用close_stream延时3秒才注销的bug (#3226) chdahuzi 2024-01-17 18:11:56 +0800