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

#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

#4034

#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

• 31792dcc0f ServiceController增加size方法 Waken 2024-05-31 12:02:42 +0800
• 7e82c970d4 Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-05-31 12:01:22 +0800
• ef3905e28d
  Merge pull request #31 from ZLMediaKit/master waken 2024-05-31 12:01:14 +0800
• 8996f3226a Merge branch 'master' of https://github.com/mc373906408/ZLMediaKit Waken 2024-05-31 11:59:46 +0800
• 31264e4cf4 桌面推流ok li 2024-05-30 18:00:44 +0800
• bebeee07d3 桌面推流ok li 2024-05-30 16:38:23 +0800
• ff8769f4ac 桌面推流ok li 2024-05-30 16:38:04 +0800
• 49dfccd56f
  补充C API拉流代理缺少retry_count重试次数配置 (#3584) Lidaofu 2024-05-30 10:49:05 +0800
• b5df0c6374 ok li 2024-05-29 17:59:19 +0800
• 8b83220ccd ok li 2024-05-29 17:56:58 +0800
• 677f7824d8 feat: 补充C API拉流代理缺少retry_count重试次数配置 修改函数位置 李道甫 2024-05-29 13:22:41 +0800
• 84209bec26 feat: 补充C API拉流代理缺少retry_count重试次数配置 修改函数名称 李道甫 2024-05-29 10:45:46 +0800
• b5c0f73849 feat: 补充C API拉流代理缺少retry_count重试次数配置 李道甫 2024-05-29 10:02:13 +0800
• 4258bbe927 feat: 补充C API拉流代理缺少retry_count重试次数配置 李道甫 2024-05-29 09:59:59 +0800
• 0859ff6909 feat: 补充C API拉流代理缺少retry_count重试次数配置 李道甫 2024-05-29 09:48:57 +0800
• 0de114c3b9
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-29 09:47:25 +0800
• 3a50c6e06d 重新整理issue模板规范要求 xiongziliang 2024-05-25 21:50:25 +0800
• 942458480d Demangle backtrace function binary symbols when generated crash logs xiongziliang 2024-05-25 21:16:57 +0800
• 12b71ca41d Update zltoolkit xiongziliang 2024-05-25 20:44:58 +0800
• f83e287c77
  修复C++17新库std::variant导致的编译出错 (#3567) waken 2024-05-23 17:36:56 +0800
• e695d928ea 修复C++17新库std::variant导致的编译出错 Waken 2024-05-23 16:03:15 +0800
• 47a4543283
  Merge pull request #29 from ZLMediaKit/master waken 2024-05-23 15:57:02 +0800
• 373620cfc6
  feat: add broadcast event for player count change (#3562) KkemChen 2024-05-23 10:30:11 +0800
• cdc53327e5 chore: Rename variables related to “broadcast_player_count_changed” KkemChen 2024-05-22 19:30:42 +0800
• 4ff12cb108 feat: add flag to control broadcast event for player count change KkemChen 2024-05-22 15:05:11 +0800
• 56e840efcd feat: add broadcast event for player count change KkemChen 2024-05-22 11:55:27 +0800
• 48afb32c59 feat: add broadcast event for player count change KkemChen 2024-05-22 11:55:27 +0800
• 02d09f59de
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-20 08:34:58 +0800
• 968f6c69c3
  修复Windows下链接OpenSSL静态库缺少Crypt32库的问题 (#3552) Lidaofu 2024-05-19 10:34:46 +0800
• 0935da60a3
  feat: Add on_mk_get_statistic_cb c api to obtain performance statistics data (#3549) PioLing 2024-05-19 10:30:29 +0800
• 6f5afdb189 feat: 修复Windows下链接OpenSSL静态库缺少Crypt32库问题 李道甫 2024-05-17 18:46:34 +0800
• cee854442b 添加on_mk_get_statistic_cb PioLing 2024-05-17 15:29:00 +0800
• a23e34244f
  格式化 test_bench_push.cpp PioLing 2024-05-17 14:32:06 +0800
• 6505a8d218
  格式化（删除多余空格） test_bench_proxy.cpp PioLing 2024-05-17 14:30:38 +0800
• de64ffa7b0
  格式化test_bench_forward.cpp（删除多余空格） PioLing 2024-05-17 14:28:36 +0800
• 61caf03732 完善 test 例子 PioLing 2024-05-17 14:19:34 +0800
• b574e5e202 添加on_mk_get_statistic_cb PioLing 2024-05-17 14:09:41 +0800
• 06f9c26832 完善 test 例子 PioLing 2024-05-17 14:07:36 +0800
• a31173c06d
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-16 18:58:42 +0800
• 502e611d14 zlm 编译默认输出utf-8字符集，和开启/Zc:__cplusplus选项（默认c++14） admin 2024-05-16 09:12:10 +0800
• 65c2abb0b5 修复无法删除mp4录像文件的bug admin 2024-05-15 11:30:16 +0800
• 472d7d1e4f 兼容rtsp服务端发送缓冲区溢出覆盖的bug admin 2024-05-15 11:17:12 +0800
• ff3a8190e6 修复无法删除mp4录像文件的bug admin 2024-05-15 11:30:16 +0800
• 3633425de1 兼容rtsp服务端发送缓冲区溢出覆盖的bug admin 2024-05-15 11:17:12 +0800
• 3317fe1b08
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-14 14:47:16 +0800
• 469a9af166 back li 2024-05-14 10:37:26 +0800
• 5df2b80757
  Nack相关参数可配置化 (#3510 #3507) gongluck 2024-05-12 18:15:11 +0800
• 20926d86a4 在config.ini文件中添加下nack配置以及相关注释 gongluck 2024-05-12 14:40:25 +0800
• cc465f03f8 test li 2024-05-11 17:41:52 +0800
• a6e7d5b3a6
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-11 17:03:03 +0800
• 6632cc308c ok li 2024-05-11 16:36:20 +0800
• bbdbd6a3e0 feat: Using kBeatIntervalMS option for rtsp heartbeat interval time and add kRtspBeatType for setting rtsp heartbeat type xia-chu 2024-05-11 14:38:33 +0800
• 1c89950ebe
  Fix record info size to int64 (#3527) xiongguangjie 2024-05-11 10:49:33 +0800
• 03a451caa8 fix record info size overflow for 2G xiongguangjie 2024-05-10 19:40:50 +0800
• 1acd657171
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-10 15:19:11 +0800
• 18c5bb3670
  添加C API on_record_ts 回调ts录像信息 (#3520) Lidaofu 2024-05-10 14:27:23 +0800
• cf0da3c383 feat: format code by mk_events.h 李道甫 2024-05-10 11:35:15 +0800
• 9fbe725d8d feat: Supplement the definition of define 李道甫 2024-05-09 21:27:13 +0800
• 6649488be7 feat: Change to mp4_info to record_inf 李道甫 2024-05-09 21:02:07 +0800
• bccb3e26e6
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-09 20:36:50 +0800
• 2eed284e61 feat: Close the connection after authentication failed in HTTP API xia-chu 2024-05-09 18:07:08 +0800
• 8ac957f338 bugfix: Fix the memory overflow issue in H264Splitter xia-chu 2024-05-09 18:06:19 +0800
• 43dba5f870 add armeabi-v7a libZLToolKit.a li 2024-05-09 17:13:57 +0800
• a17e820229 add arm64-v8a libZLToolKit.a li 2024-05-09 17:11:53 +0800
• c1075fa5b5 remove x86 li 2024-05-09 17:11:08 +0800
• 0dcf083b4f init li 2024-05-09 16:58:15 +0800
• 0308f101ca add: C API on_record_ts callback 李道甫 2024-05-08 18:34:16 +0800
• 4f72eef6ae
  Merge branch 'ZLMediaKit:master' into master Lidaofu 2024-05-07 14:23:46 +0800
• cb99a77d06 修复编译错误 gongluck 2024-05-07 11:03:04 +0800
• 33756ecb9d nack接收端参数可配置化 gongluck 2024-05-07 10:40:00 +0800
• 58d273e04e add me to README li 2024-05-06 17:54:30 +0800
• aa13b29470
  Merge branch 'ZLMediaKit:master' into master li 2024-05-06 17:02:32 +0800
• 6813538118 nack相关参数可配置化 gongluck 2024-05-06 14:23:14 +0800
• 64fdd78330
  修复函数mk_rtc_send_datachannel声明、定义没对应的错误 (#3508) gongluck 2024-05-06 11:07:23 +0800
• 7de84e9f82
  修复函数mk_rtc_send_datachannel声明、定义没对应的错误 gongluck 2024-05-03 15:40:09 +0800
• 046aaa3498
  修复拉取指定流时时长信息丢失的问题 (#3500) yanggs 2024-05-01 13:19:47 +0800
• 86348b86ee
  Update README.md 夏楚 2024-04-30 22:06:53 +0800
• 686d107be3 修复拉取指定流时时长信息丢失的问题 callinglove 2024-04-29 10:18:15 +0800
• e678ea1e63 修复拉取指定流时丢掉时长信息的问题 yanggs 2024-04-28 14:05:54 +0800
• 9de09a4f68 support http://www.webrtc.org/experiments/rtp-hdrext/video-layers-allocation00 Johnny 2024-03-31 12:09:43 +0800
• 5237daf627 Merge branch 'master' into dev xiongguangjie 2024-04-22 17:08:10 +0800
• 664d0b67bc Add the listRtpSender http api xia-chu 2024-04-21 11:31:43 +0800
• 2d66dd7cb3 Fixing the problem of WebRTC handshake failure caused by unsupported RTP extensions (#3486) xia-chu 2024-04-20 22:49:27 +0800
• e4de454d5d Charset default to UTF-8 on Windows xia-chu 2024-04-20 22:25:21 +0800
• 44d6457108 Update ZLToolKit, support kqueue for macOS/BSD xia-chu 2024-04-20 21:15:47 +0800
• ff70ef233c Fix bug where ts files are not written into m3u8 file during HLS playback. xia-chu 2024-04-20 20:00:25 +0800
• 4aa330ab82
  rtp g711 encoder rtp not key pos avoid gop cache useless (#3476) xiongguangjie 2024-04-16 22:34:54 +0800
• 0b9be9d95d rtp g711 encoder rtp not key pos avoid gop cache useless xiongguangjie 2024-04-16 19:58:06 +0800
• 607276c24a g711 rtp encoder rtp not key pos xiongguangjie 2024-04-16 19:40:26 +0800
• 8b9a4092c2 Revert "rtp packet ring buffer set 4096 avoid overflow" xiongguangjie 2024-04-16 18:11:58 +0800
• 10734495b9 rtp gop size is 1024 xiongguangjie 2024-04-16 18:11:40 +0800
• 3204769d5e rtp packet ring buffer set 4096 avoid overflow xiongguangjie 2024-04-16 17:37:46 +0800
• 3adbad5fc4 sync from master xiongguangjie 2024-04-16 17:28:10 +0800
• c341f8ebf6 startSendRtp不指定use_ps时，发送的为裸包，不兼容之前的旧版本。 renlu 2024-04-10 13:14:53 +0800
• d8cb75d387
  Improve url encode and decode code add user pass encode decode methond (#3468) xiongguangjie 2024-04-13 20:36:15 +0800
• 3dcd0ed463
  Enable video stack individually (#3469) Aven 2024-04-13 20:35:59 +0800
• 9951c78a73 fix typo Aven 2024-04-12 11:12:12 +0800
• 878872f74e enable video stack to be toggled individually. Aven 2024-04-12 11:11:04 +0800
• 6665861e09 optimazition url encode code and add user pass encode pass fix rtsp user pass decoder error xiongguangjie 2024-04-11 20:04:32 +0800
• bce6716a9b
  Merge branch 'ZLMediaKit:master' into master lidaofu-hub 2024-04-10 17:17:16 +0800