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

• ddbf5a1289
  Add error handling for the MapViewOfFile() function PioLing 2024-01-17 17:18:11 +0800
• 9a808cc752
  解决有时udp推流，close_streams关流延迟3秒才会注销的问题 chdahuzi 2024-01-17 14:19:38 +0800
• c0accf1028 [modify]调整cxx api install脚本 韩光磊 2024-01-17 14:18:01 +0800
• 62bf329563 修改类型错误 Waken 2024-01-17 13:50:22 +0800
• 13d7eb3fa5 openRtpServer接口增加local_ip参数 Waken 2024-01-17 10:52:52 +0800
• 78910b0737 Merge branch 'ZLMediaKit-master' Waken 2024-01-17 10:28:44 +0800
• 793fa65356 合并 Waken 2024-01-17 10:28:32 +0800
• 8e495be002 [modify]修复ZLToolKit install 韩光磊 2024-01-17 09:37:55 +0800
• 7f16d85906
  add win32 mmap PioLing 2024-01-16 18:04:25 +0800
• 6514be74f1 Prevent access to nullptr when cloning a track xiongziliang 2024-01-15 20:34:17 +0800
• dfda93a4c4 Ignore invalid H264/H265 rtmp packet instead of throwing an error xiongziliang 2024-01-15 20:32:06 +0800
• faf0febc54 Merge branch 'master' of https://github.com/ixingqiao/ZLMediaKit xingqiao 2024-01-12 15:26:23 +0800
• 08f9e83476 Merge remote-tracking branch 'origin/master' into dev xiongguangjie 2024-01-11 16:28:06 +0800
• 473228a128 Update ZLToolKit xiongziliang 2024-01-06 23:22:47 +0800
• 27217cb1e6 Fix _media_src setIndexFile by mistake for include_delay. Seto 2024-01-06 18:30:42 +0800
• 754019a58f Fix _media_src setIndexFile by mistake for include_delay. Seto 2024-01-06 18:30:42 +0800
• 8048cd886b Fix typo error of VideoTrackImp xiongziliang 2024-01-06 18:17:51 +0800
• 77400832ac Update ZLToolKit xiongziliang 2024-01-06 17:47:43 +0800
• b77515d217 修复hls按需拉流一次播放可能失败的问题 (#3153) voidon 2024-01-06 16:15:55 +0800
• aeda47ec8c
  修正SctpAssociation.cpp的访问越界 (#3182) sandro-qiang 2024-01-05 15:33:51 +0800
• e8e6edf93b 修正了Sctp访问越界和多线程访问静态buffer的问题 Sandro 2024-01-05 15:22:29 +0800
• c0062f40d1 修正了jemalloc的include路径 Sandro 2024-01-04 19:29:29 +0800
• bd0c473be2 修正了Sctp的一个访问越界错误 Sandro 2024-01-04 19:24:38 +0800
• b6cbbb4339
  Add hls_delay feature (#3158) SetoKaiba 2024-01-03 09:05:15 +0800
• 9f4398b9ce Add hls_delay feature Seto 2024-01-02 18:12:33 +0800
• bb2d482056 Update ZLToolKit xiongziliang 2023-12-31 22:16:05 +0800
• 519cce8c29 Add data alignment declaration xiongziliang 2023-12-31 22:15:51 +0800
• f382f1fa95 Replacing switch case with codec map xiongziliang 2023-12-31 22:14:58 +0800
• a106f8dfc0 Avoid blocking the poller thread xiongziliang 2023-12-31 22:10:13 +0800
• 7c42ac4d79
  Set the default port for WebRTC (#3175) Dw9 2023-12-29 10:53:47 +0800
• 72bda56fbb
  rtc udp/tcp port默认设置8000 Dw9 2023-12-29 10:48:05 +0800
• 4bee2d54b4 init li 2023-12-29 08:55:17 +0800
• 729e7f3d23 init li 2023-12-29 08:49:18 +0800
• 5e68ddacd8 test: 用于测试decoder反复创建销毁引发的内存泄漏 KkemChen 2023-12-28 15:46:39 +0800
• 4875d4ebfd ;.ll li 2023-12-27 23:14:04 +0800
• 3cc6e855c4 Merge branch 'master' into dev xiongguangjie 2023-12-27 14:42:03 +0800
• 631ef0bbc3 init li 2023-12-26 23:22:56 +0800
• 54cee338ef
  Merge cbbd575ec6 into bcf0c719f1 KkemChen 2023-12-23 10:42:06 -0800
• bcf0c719f1 Update ZLToolKit xiongziliang 2023-12-23 21:32:24 +0800
• 9d68b668fc
  Add http pipelining request support (#3154) xiongguangjie 2023-12-23 21:27:28 +0800
• d924990890 Merge branch 'feature/http_pipeline' of github.com:ZLMediaKit/ZLMediaKit # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. xiongziliang 2023-12-23 20:57:52 +0800
• ddc0391d07
  Update HttpSession.cpp 夏楚 2023-12-23 20:51:45 +0800
• 4d11399d48 add http pipelining support xiongguangjie 2023-12-22 19:54:09 +0800
• 107319769f add openssl li 2023-12-22 17:52:44 +0800
• 8f4e76406c
  修复编译 rpm 时获取调试信息失败问题 (#3151) snysmtx 2023-12-22 17:40:42 +0800
• b1cff54224 修复编译 rpm 时获取调试信息失败问题 snysmtx 2023-12-22 16:04:21 +0800
• a17b950b21
  Install http api and hook before starting the service listener (#3149) chdahuzi 2023-12-20 19:32:49 +0800
• 5b3d99bb92 初始化web接口调整到启动监听端口服务之前，解决程序刚刚启动时码流未经鉴权就被允许推流的问题 chdahuzi 2023-12-19 17:09:44 +0800
• 0dcf665d69 初始化web接口调整到启动监听端口服务之前，解决程序刚刚启动时码流未经鉴权就被允许推流的问题 lusirui 2023-12-19 16:13:08 +0800
• c7f2f9e883
  Change fillPicture (av_image_fill_arrays() ) align size from 1 to 32 (#3142) PioLing 2023-12-18 16:28:00 +0800
• 642a564b20
  Change av_image_get_buffer_size align size from 1 to 32 PioLing 2023-12-18 16:22:28 +0800
• 7457866266
  Change fillPicture (av_image_fill_arrays() ) align size from 1 to 32 PioLing 2023-12-18 15:54:20 +0800
• 350bfeff22
  Merge 5899dd48ed into e593ef5fef PioLing 2023-12-18 07:49:04 +0000
• 5899dd48ed
  Change fillPicture (av_image_fill_arrays )align size from 1 to 32 PioLing 2023-12-18 15:47:14 +0800
• d252895df6
  Merge branch 'ZLMediaKit:master' into master PioLing 2023-12-18 15:43:59 +0800
• e593ef5fef Change av_image_fill_arrays align size from 1 to 32 xiongziliang 2023-12-17 18:22:58 +0800
• f1923f0076 Ignore the http connection which calling kick_sessions http api xiongziliang 2023-12-17 18:13:51 +0800
• 189f787746 Disable enhanced-rtmp H265 default xiongziliang 2023-12-17 18:10:47 +0800
• a72d87cca7
  BugFix: MediaSource unregister after 3 seconds after calling close_streams (#3132) 648540858 2023-12-15 16:46:43 +0800
• 2441951dc5 修复调用close_streams后流注销需要三秒的问题 648540858 2023-12-15 16:37:55 +0800
• 0f34bb2353
  Merge branch 'ZLMediaKit:master' into master 648540858 2023-12-15 16:32:29 +0800
• f0e97cf19a Merge branch 'master' into dev xiongguangjie 2023-12-15 14:36:54 +0800
• 01b3755f9b Add hls_retain.m3u8 for some use case. Seto 2023-12-14 17:03:52 +0800
• c0bb7db476 BugFix: crash when FrameMerger::flush xia-chu 2023-12-14 17:28:21 +0800
• 07f3c6dde4
  支持创建不支持codec的frame (#3126) PioLing 2023-12-14 14:14:50 +0800
• 255f9feaf6
  创建不支持codec的frame PioLing 2023-12-14 13:42:28 +0800
• 67f46f2b84 Merge branch 'master' into dev xiongguangjie 2023-12-13 18:07:31 +0800
• 9933398614
  修复一个关闭GB28181时引发的崩溃问题 (#3118) waken 2023-12-13 17:41:57 +0800
• 2a91a87255 修改ref.first判断位置 Waken 2023-12-13 17:20:10 +0800
• b4a1997c63 还原postman方便提交pr Waken 2023-12-13 17:15:15 +0800
• 152d36f8ed 修复一处frame为空导致的崩溃 Waken 2023-12-13 17:07:02 +0800
• 958c8b7166 修复一处codoc值未捕获导致的崩溃 Waken 2023-12-13 16:32:50 +0800
• d8c234283b
  修复“创建多路复用RTP服务器(openRtpServerMultiplex)”的get请求 waken 2023-12-12 15:01:03 +0800
• f286709039
  Merge branch 'ZLMediaKit:master' into master waken 2023-12-12 14:58:14 +0800
• 1d92a46e7e Merge branch 'master' into dev xiongguangjie 2023-12-12 14:18:48 +0800
• 2f4cd67162
  修正 getCodecU 返回值 (#3104) PioLing 2023-12-11 16:24:54 +0800
• 85cec8b0bc
  Update G711.cpp PioLing 2023-12-11 14:23:12 +0800
• 33f860fd04 Fix A -> U Xiaofeng Wang 2023-12-11 11:05:42 +0800
• 3646f7f21c Dynamic load codec ext library feature/dynamic_codec xia-chu 2023-12-10 11:13:26 +0800
• 25c99470ee feat: add support of codec plugin xia-chu 2023-12-10 10:21:40 +0800
• 9ff4c09211 BugFix: fix webrtc bad weak ptr exception xia-chu 2023-12-10 10:21:21 +0800
• 882c9d5c36 feat: add support of codec plugin xia-chu 2023-12-10 10:21:40 +0800
• 5af5fcba60 BugFix: fix webrtc bad weak ptr exception xia-chu 2023-12-10 10:21:21 +0800
• 9773314f78 feat: add support of codec plugin origin/feature/codec_plugin xia-chu 2023-12-10 09:48:31 +0800
• f9963a851b 优化代码 xia-chu 2023-12-10 08:58:48 +0800
• 8ffad9c16a add force transcoding to AAC Alex 2023-12-10 03:09:01 +0800
• 64f15202de
  Support multi audio/video track 夏楚 2023-12-09 22:34:22 +0800
• 9dba0515ec 支持多轨道模式 xia-chu 2023-12-09 22:33:35 +0800
• 394fd2375f 修复_max_track_size值被覆盖的bug xia-chu 2023-12-09 22:26:04 +0800
• ccd1ef7f92 修复ts/ps解析可能addTrackCompleted的bug xia-chu 2023-12-09 22:10:19 +0800
• c433827c66 修复FrameStamp不拷贝index的bug xia-chu 2023-12-09 22:09:18 +0800
• 81020ff222 修复track clone不拷贝index的问题 xia-chu 2023-12-09 21:46:47 +0800
• 48b7cd1462 rtp server支持多track xia-chu 2023-12-09 21:39:46 +0800
• f5f658e474 修订多track时rtmp协议异常问题 xia-chu 2023-12-09 21:24:34 +0800
• 542029c1f9 修订多track时rtsp协议异常问题 xia-chu 2023-12-09 21:13:39 +0800
• 1c73be2e3f MediaSink忽略重复的track xia-chu 2023-12-09 21:04:07 +0800
• f100ea583e 防止多个track重复驱动静音生成 xia-chu 2023-12-09 20:58:45 +0800
• 336b3b1fe0 添加注释 xia-chu 2023-12-09 20:21:05 +0800
• f8f61660f8 完成多track改造 xia-chu 2023-12-09 18:07:33 +0800
• 7735e6c9e3 MultiMediaSourceMuxer支持多track xia-chu 2023-12-09 17:43:29 +0800