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

• 5b75c024ff
  Merge 42565a6e22 into 8868320301 a839419160 2024-11-21 15:34:41 +0800
• 42565a6e22 新增文件添加bom hao.ma 2024-11-21 15:12:20 +0800
• 1d9a1832f4 删除调试文件 hao.ma 2024-11-19 17:32:51 +0800
• 940cee14ef add FindPCAP.cmake hao.ma 2024-11-19 17:24:12 +0800
• 7d69cbefc7 增加pcap解析 hao.ma 2024-11-15 11:42:00 +0800
• 2c2b030d73 新增文件添加bom hao.ma 2024-11-21 14:53:23 +0800
• 5995a50947 新增文件添加bom hao.ma 2024-11-21 14:53:23 +0800
• a293f536f1
  Merge 610ac62e90 into 8868320301 alex 2024-11-21 14:17:34 +0800
• 8868320301
  Add xr targetbitrate process and update js demo sdk (#4031) master xiongguangjie 2024-11-21 14:17:02 +0800
• 0cfb5a0d66 update comment xiongguangjie 2024-11-20 15:29:29 +0800
• 271a273eea improve code comment xiongguangjie 2024-11-20 15:25:58 +0800
• ab65232406 add xr targetbitrate process and update js demo sdk xiongguangjie 2024-11-19 20:14:09 +0800
• 738422fa2f 删除调试文件 hao.ma 2024-11-19 17:32:51 +0800
• 798a307048 add FindPCAP.cmake hao.ma 2024-11-19 17:24:12 +0800
• 92e1e46642
  Merge 6119ac9c53 into 226b87a633 imp_rayjay 2024-11-18 14:18:18 +0800
• 226b87a633
  优化rtsp ntp时间戳，防止音视频不同步( #4017 #4018) ss002012 2024-11-18 14:08:53 +0800
• 33cef0ccc2
  Merge 7141759d78 into 51f49d3a89 alex 2024-11-18 09:38:52 +0800
• 1805820dc2 增加pcap解析 hao.ma 2024-11-15 11:42:00 +0800
• 853b2b2d80
  Merge 9de09a4f68 into 51f49d3a89 johzzy 2024-11-15 10:10:00 +0700
• 5072ec4852 rtp时间戳可能已被截断，使用未截断的时间戳 shao shuai 2024-11-14 20:42:36 +0800
• 8e9c60741b
  Merge ea263b9205 into 51f49d3a89 alex 2024-11-13 20:08:16 +0800
• 89aee37d4d
  Merge 90bd28249e into 51f49d3a89 alex 2024-11-12 19:04:52 +0800
• 51f49d3a89
  Fix mp4 record segment bug (#4008 #4007) xiongguangjie 2024-11-09 19:33:36 +0800
• 8e823b3b74
  提升rtsp协议兼容性 (#4003) 286897655 2024-11-09 19:32:18 +0800
• ef11c66fb8 新增语音对讲接口(startSendRtpTalk) xia-chu 2024-11-09 19:17:54 +0800
• babd1aa3a3 fix record mp4 segment bug #4007 xiongguangjie 2024-11-08 22:50:18 +0800
• 4385b16248 海康解码器播放RTSP流地址带了?xxx=xxxx&yyy=yyy类似结构SETUP会带着 zhaoj361 2024-11-05 18:31:26 +0800
• 8ccb4e95b3
  update webassist (#3996) mtdxc 2024-11-01 14:07:55 +0800
• 425f70b0fc update webassist cqm 2024-11-01 12:19:34 +0800
• 901c381300
  新增获取推流推流代理列表和ffmpeg源列表接口 (#3992) mtdxc 2024-11-01 10:47:18 +0800
• af6d265018 change getSSRC cqm 2024-10-31 21:54:31 +0800
• eb8e39d897 use ref callback cqm 2024-10-31 21:39:28 +0800
• 6729257eab
  修复时间戳回退导致超大mp4切片问题 (#3991) wuxingzhong 2024-10-31 20:11:34 +0800
• e69c0e648c RtpServer返回更多信息 cqm 2024-10-31 16:21:02 +0800
• 9814992a8e small change cqm 2024-10-31 11:28:06 +0800
• c0febafd52 api返回推流推流代理列表和ffmpeg源列表 cqm 2024-10-30 09:45:26 +0800
• d98092d40c fix: thread safe MiauLightouch 2024-10-30 18:19:55 +0800
• 45d5b5ad61 feat: 新增代理信息列表 HTTP API MiauLightouch 2024-10-30 15:51:44 +0800
• e18d1dab86 fix: 当出现dts回退时,应该取frame->dts(), 即MIN wuxingzhong 2024-10-30 15:49:03 +0800
• 610ac62e90 Translate comments in src/Record/HlsMakerImp.cpp alex 2024-10-28 11:01:24 +0800
• 4d1b39387a
  Merge branch 'ZLMediaKit:master' into master alex 2024-10-28 11:00:46 +0800
• cc590254a6 fix compile error for ci xiongguangjie 2024-10-27 12:05:04 +0800
• b9a1f0d9b5 update zltoolkit fix #3979 xiongguangjie 2024-10-26 21:12:01 +0800
• 65e5402c62 fix compile error for ci xiongguangjie 2024-10-27 12:05:04 +0800
• 61175e95cf update zltoolkit fix #3979 xiongguangjie 2024-10-26 21:12:01 +0800
• efd14aba92
  Merge branch 'ZLMediaKit:master' into master alex 2024-10-26 16:02:14 +0800
• 18d5fb71f3 增强hls点播功能，每个切片文件夹生成一个m3u8索引文件 xia-chu 2024-10-26 14:26:39 +0800
• 34dbbab4bb hls开启点播后，确保媒体注销时写入m3u8文件至当前文件夹 xia-chu 2024-10-26 16:37:04 +0800
• 30c6f975f1 增强hls点播功能，每个切片文件夹生成一个m3u8索引文件 xia-chu 2024-10-26 14:26:39 +0800
• 5c80c75ed9
  修复video stack相关功能bug sbkyy 2024-10-26 09:20:24 +0800
• a41c6a63e4 CPU消耗过高导致卡顿 sbkyy 2024-10-25 14:43:05 +0800
• 04a10d70b3 /index/api/stack/reset 在相同url和通分辨率多次调用channel析构没画面的问题 sbkyy 2024-10-24 17:38:10 +0800
• 4c90a1a95b Instantly enable recording support for GOP caching xia-chu 2024-10-18 22:22:03 +0800
• 6fcf7f81a4 The Docker image removes unnecessary dependencies xia-chu 2024-10-18 21:53:46 +0800
• ea263b9205 Translate comments in api/include/mk_recorder.h alex 2024-10-18 21:49:34 +0800
• fdbf77d46d
  feat: add mk_load_mp4_file c api(#3964) Lidaofu 2024-10-18 21:48:42 +0800
• f0d2bb680b 精简代码 xia-chu 2024-10-18 20:56:11 +0800
• 683d5fb029 feat: C Api增加loadMP4File功能 lidaofu 2024-10-18 15:38:28 +0800
• cb4709e60c feat: C Api增加loadMP4File功能 lidaofu 2024-10-18 15:22:29 +0800
• 61a93fab6a MP4 reader supports loading multi files xia-chu 2024-10-13 00:25:40 +0800
• e4025a6811 Improve timestamp corrector xia-chu 2024-10-13 00:23:34 +0800
• 351e8fbd43 Fixed the compilation issue on macOS15 M platform Xiaofeng Wang 2024-10-11 14:19:27 +0800
• 6b2fcf7943
  Fix the issue where the hls-fmp4 do not flush data in single audio cases (#3935 #3937) xiongguangjie 2024-09-29 11:55:58 +0800
• 59e2e3bcf3 fix bug hls fmp4 only audio not flush data for issue #3935 xiongguangjie 2024-09-28 14:41:36 +0800
• 7141759d78 Translate comments in srt/Packet.cpp alex 2024-09-28 10:11:54 +0800
• 87277ac91a
  Optimaztion code for srt (#3934) xiongguangjie 2024-09-28 10:11:39 +0800
• ec0aa1eae2 optimaztion code for srt xiongguangjie 2024-09-27 19:12:52 +0800
• de7afaf992
  Avoid negative PTS in the RTSP protocol (#3929 #3815) xiongguangjie 2024-09-26 10:59:41 +0800
• faa6c283d7 rtsp audio packet always update timestamp, seq etc xiongguangjie 2024-09-25 19:57:55 +0800
• 72f9557458 optimaztion for issue #3815 ffmpeg rtsp pull stream has negative pts xiongguangjie 2024-09-24 23:31:24 +0800
• aca39bbfaa Support hot-reload of SSL certificates (#2835) xia-chu 2024-09-21 18:15:32 +0800
• 1753cbb81b Add compile options: -Wno-comment xia-chu 2024-09-21 18:14:18 +0800
• 89e21038c2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2 feature/transcode2 cqm 2024-09-22 11:40:39 +0800
• 26345d0d56 Support hot-reload of SSL certificates (#2835) xia-chu 2024-09-21 18:15:32 +0800
• 95e3913892 Add compile options: -Wno-comment xia-chu 2024-09-21 18:14:18 +0800
• 90bd28249e Translate comments in src/Common/MediaSink.cpp alex 2024-09-21 09:44:57 +0800
• c3106d514a Translate comments in src/Common/MediaSink.cpp alex 2024-09-21 09:26:48 +0800
• f03d414e82 Translate comments in src/Common/MediaSink.cpp alex 2024-09-21 09:26:17 +0800
• f3e2a29cbd
  Fix crashes where iterators may be invalid (#3920) Dw9 2024-09-19 20:16:16 +0800
• 31f5c05d21 update dw9 2024-09-19 20:11:17 +0800
• 4cfb6312f1 修复迭代器可能失效的崩溃 dw9 2024-09-19 19:53:03 +0800
• 4152dcd409
  AI automatically translates all comments in the code into English (#3917) alex 2024-09-19 14:53:50 +0800
• acbbcb5fc9 Update ZLToolKit submodule to the latest version Alex 2024-09-19 13:45:50 +0800
• 19df7422a4
  Merge b77515d217 into 046de691cb vvoidon 2024-09-19 03:18:33 +0800
• cbb3098cf6 Merge branch 'patch-94' into translate-01 Merge all translation branches into one branch Alex 2024-09-19 00:34:32 +0800
• 5016e869b0 fixed src/Common/config.h and ext-codec/H265.cpp Alex 2024-09-19 00:34:05 +0800
• 67dcfa0238 Merge branch 'patch-92' into translate-01 Merge all translation branches into one branch Alex 2024-09-19 00:25:00 +0800
• 046de691cb
  Fix the issue of RTP sorting cache crashing when the sequence is reset (#3915) Dw9 2024-09-18 19:09:14 +0800
• 596531ecf5
  Add golang sdk for mk_api (#3914) PioLing 2024-09-18 17:36:06 +0800
• 45603a94ff Add golang mk sdk PioLing 2024-09-18 17:08:40 +0800
• 9f901d0a0a Add golang mk sdk PioLing 2024-09-18 16:53:28 +0800
• b452ce90b8 修复forceflush队列可能为空的崩溃 weishao 2024-09-18 16:01:12 +0800
• fd63018d7a
  Merge c8fedccd78 into 8f03105baa alex 2024-09-18 13:12:29 +0800
• 8f03105baa
  Fix bug #3894 of rtsp over http (#3903) xiongguangjie 2024-09-17 09:44:22 +0800
• 0a482a6540 Translate comments in ext-codec/H265.h alex 2024-09-17 09:43:54 +0800
• b3aeec24d1 Translate comments in ext-codec/H265.cpp alex 2024-09-17 09:43:51 +0800
• 2cc69d1be6
  Fix H.265 multi-PPS frame compatibility issue (#3902) 夏楚 2024-09-17 09:43:37 +0800
• 0061ef09bd fix bug #3894 of rtsp over http xiongguangjie 2024-09-14 22:11:46 +0800
• cadb17e079 修复h265多pps帧兼容性问题 xia-chu 2024-09-14 21:48:44 +0800
• f1b059323e Translate comments in src/Rtsp/RtpReceiver.h alex 2024-09-14 09:55:08 +0800