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

• e6506a96d4
  Update h264_pusher.c, fix build issue (#3444) Dw9 2024-04-08 10:16:45 +0800
• 353c635852 对外暴露zlm生成目录 baiyfcu 2024-04-07 14:08:50 +0800
• eab1dbc606 补提rtp app名称自定义相关文件修改 baiyfcu 2024-04-07 14:08:05 +0800
• 3f60e55dfe
  Update h264_pusher.c Dw9 2024-04-07 14:02:13 +0800
• d771530316 添加rtp server支持自定义app名称 baiyfcu 2024-04-07 13:59:57 +0800
• edca662208
  fix webrtc echo error (#3442) Dw9 2024-04-05 22:11:50 +0800
• 071f008108
  add c api for MediaSource (#3433) lidaofu-hub 2024-04-05 22:09:40 +0800
• 2159e90f78 Add demo of reading H.264 file and pushing RTSP/RTMP stream xiongziliang 2024-04-05 22:07:09 +0800
• 6356684ad9 fix webrtc echo error Dw9 2024-04-03 19:31:20 +0800
• e7eae11891 rtsp点播恢复时不带range baiyfcu 2024-04-03 15:46:02 +0800
• 6b1b9f3e35 添加track在创建后input frame前回调，避免track订阅错过配置帧数据，MP4Demuxer接口添加virtual可派生扩展 baiyfcu 2024-04-03 14:46:33 +0800
• 584944d777 屏蔽使用自定义WebSocketSessionBase创建http server时ws收数据崩溃问题（原因未定位） baiyfcu 2024-04-03 14:35:13 +0800
• e9887c6cd9 增加checkHost参数判断 baiyfcu 2024-04-03 14:27:18 +0800
• 66b18bc7f8 添加非windows使用iconv转码 baiyfcu 2024-04-03 14:26:15 +0800
• 4d57f413cf add: 补充MediaSource C API _strdup moved to api/include/mk_common.h 李道甫 2024-04-02 08:55:26 +0800
• 5926160289 add: 补充MediaSource C API _strdup in linux 李道甫 2024-04-01 18:34:09 +0800
• 5b850375ac add: 补充MediaSource C API extra useless white space 李道甫 2024-04-01 18:20:46 +0800
• 9741eb7272 add: 补充MediaSource C API 李道甫 2024-04-01 17:55:40 +0800
• 24689fefd1
  Fix compilation error (#3432) ljx0305 2024-04-01 17:31:04 +0800
• 51199bcc17
  Fix compilation error ljx0305 2024-04-01 16:19:17 +0800
• b54c46705c
  Merge pull request #2 from ZLMediaKit/master ljx0305 2024-04-01 16:15:47 +0800
• af3ef996b0 Avoid build warnings in the main code xia-chu 2024-03-30 14:59:28 +0800
• 0602cc0c0b Add 'params' field to MediaSource tuple information xia-chu 2024-03-30 14:46:39 +0800
• 390c374086 Optimize the code xia-chu 2024-03-30 14:41:20 +0800
• ecc05dae28 BugFix: fix the issue where modifying the default secret resulted in HTTP api authentication failures xia-chu 2024-03-30 14:04:32 +0800
• 6119ac9c53 rtp推流增加PCM音频的处理 rayjay 2024-03-28 11:21:23 +0800
• a33c1d5a08 Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit rayjay 2024-03-28 11:15:19 +0800
• 861be27ef8
  Fix compilation error issues (#3412) ljx0305 2024-03-26 15:05:14 +0800
• 78924ad8e2
  Fix compilation error issues ljx0305 2024-03-25 19:03:44 +0800
• 5428ba1d31
  Merge pull request #1 from ZLMediaKit/master ljx0305 2024-03-25 18:59:03 +0800
• 3e13e69724 BufFix: avoid may change data in splitter xiongziliang 2024-03-24 22:01:56 +0800
• f9685df3be
  Merge 1e0bbe803a into 208f57e2cd dennis-zheng 2024-03-24 21:29:28 +0800
• 208f57e2cd
  Fix macOS compile error by rename version.h -> ZLMVersion.h (#3411 #3410) Jacob Su 2024-03-24 17:18:18 +0800
• f21eb470db issue 3410: fix macOS compile error by rename version.h -> ZLMVersion.h Jacob Su 2024-03-24 14:20:11 +0800
• 7aaafa18e7 Format code xiongziliang 2024-03-23 23:08:10 +0800
• d8893877b2 Delete invalid code xiongziliang 2024-03-23 22:52:40 +0800
• 029813402d
  feat: update negotiateSdp and WebRtcArgs (#3371) johzzy 2024-03-23 11:46:30 -0300
• 73678a6e69 优化代码 xiongziliang 2024-03-23 22:43:09 +0800
• f81f62c8ff Merge branch 'master' of github.com:johzzy/ZLMediaKit xiongziliang 2024-03-23 20:49:25 +0800
• 2e2823d4cf
  VideoStack: move sws execution to WorkThread and optimization interface (#3407) KkemChen 2024-03-23 20:47:38 +0800
• d638754364 Update authors xiongziliang 2024-03-23 20:44:25 +0800
• 2114746aca VideoStack: move sws execution to WorkThread and optimization interface response KkemChen 2024-03-23 15:02:32 +0800
• 013ef3f63e feat: update negotiateSdp and WebRtcArgs Johnny 2024-03-03 16:39:40 +0800
• b05f515ccc Revert "Fix the issue of failing to push streams to FMS 3.0 server" xia-chu 2024-03-22 20:37:51 +0800
• f5ca61d235 Enhance compatibility with non-compliant RTMP AAC streams xia-chu 2024-03-22 20:37:27 +0800
• 49ddde28c0 Refactor code xia-chu 2024-03-22 20:36:09 +0800
• e972ec5a22 Remove deprecated code xia-chu 2024-03-22 20:35:11 +0800
• cfac61e55b BugFix: prevent the player's configuration from being overridden in addStreamProxy xia-chu 2024-03-22 20:34:07 +0800
• db4c570d19 WebRTC audio preferred PCMA xia-chu 2024-03-22 20:30:48 +0800
• 5036aa5ec5 BugFix: crashes when exceptions are thrown during destruction #3402 xia-chu 2024-03-22 20:29:22 +0800
• 66a6253160
  Fix compilation error issues (#3385) ljx0305 2024-03-22 20:42:02 +0800
• 12d9351666
  Fix compile error for enable_webrtc is off ( #3393 #3397) xiongguangjie 2024-03-22 20:41:14 +0800
• 3edc671483 Revert "Fix the issue of failing to push streams to FMS 3.0 server" xia-chu 2024-03-22 20:37:51 +0800
• 2bf1798e01 Enhance compatibility with non-compliant RTMP AAC streams xia-chu 2024-03-22 20:37:27 +0800
• cd12b456d7 Refactor code xia-chu 2024-03-22 20:36:09 +0800
• 8eeae84600 Remove deprecated code xia-chu 2024-03-22 20:35:11 +0800
• 48a58b95bf BugFix: prevent the player's configuration from being overridden in addStreamProxy xia-chu 2024-03-22 20:34:07 +0800
• ae433e7fe0 WebRTC audio preferred PCMA xia-chu 2024-03-22 20:30:48 +0800
• 1a3a30dd63 BugFix: crashes when exceptions are thrown during destruction #3402 xia-chu 2024-03-22 20:29:22 +0800
• 24e695824f fix rtmp bug xiongguangjie 2024-03-22 18:11:39 +0800
• 949a525bf0 Merge branch 'master' into dev xiongguangjie 2024-03-22 18:09:26 +0800
• 4a64a96f8c
  去除无用函数声明 ljx0305 2024-03-21 14:50:28 +0800
• 8272352f0d add marcro define for rtc callback xiongguangjie 2024-03-21 09:41:33 +0800
• 52cb2247fb add marcro define check for include file xiongguangjie 2024-03-21 09:31:44 +0800
• 42c2963d00 fix compile error for enable_webrtc is off xiongguangjie 2024-03-21 00:14:30 +0800
• 1e0bbe803a Implement size limits on HTTP header number, header size and body size dennis 2024-03-20 11:02:49 +0800
• 0c32c9aea7
  Update VideoStack.cpp ljx0305 2024-03-19 09:39:33 +0800
• 5a137f8b8e Update submodule xia-chu 2024-03-17 10:28:10 +0800
• 437ae778c0
  feat: VideoStack (#3373) KkemChen 2024-03-16 22:56:32 +0800
• 51521ed33f chore: VideoStack code adds bom header KkemChen 2024-03-16 22:23:35 +0800
• ff43fa5075
  Fix the issue of abnormal timestamps during MP4 recording. (#3363) 百鸣 2024-03-16 22:01:06 +0800
• 3b7f16b755
  Fix the issue of failing to push streams to FMS 3.0 server. (#3362) haorui wang 2024-03-16 21:58:33 +0800
• 69738ad24e BugFix: configuration of downloadRoot cannot use absolute paths xia-chu 2024-03-15 22:24:45 +0800
• 50f65c4ba4 Random port pool ensures that both UDP and TCP modes are available simultaneously xia-chu 2024-03-15 22:24:33 +0800
• 1930d909f9 Fix the thread safety issue caused by poller thread switching when paced sender enabled xia-chu 2024-03-15 22:24:20 +0800
• c9c2706843 avoid addstreamproxy rtsp user or pass contain + xiongguangjie 2024-03-16 19:34:06 +0800
• af155ef87a no track throw error avoid addstreamproxy already exist xiongguangjie 2024-03-16 18:56:35 +0800
• 06d3ea6cb6 avoid addstreamproxy rtsp user or pass contain + xiongguangjie 2024-03-16 19:34:06 +0800
• 8dc0c8939a no track throw error avoid addstreamproxy already exist xiongguangjie 2024-03-16 18:56:35 +0800
• f0e3cb300d build: When FFmpeg and x264 are not enabled, VideoStack is not compiled KkemChen 2024-03-16 11:03:56 +0800
• 7504c6088b BugFix: configuration of downloadRoot cannot use absolute paths xia-chu 2024-03-15 22:24:45 +0800
• 29b3f00a43 Random port pool ensures that both UDP and TCP modes are available simultaneously xia-chu 2024-03-15 22:24:33 +0800
• 401d0ca2eb Fix the thread safety issue caused by poller thread switching when paced sender enabled xia-chu 2024-03-15 22:24:20 +0800
• 4ec31dbfd7 feat: VideoStack KkemChen 2024-03-14 20:00:17 +0800
• 4f633ad7c8 [what][style] 格式处理 haorui 2024-03-13 19:18:05 +0800
• 8e16a698b6
  降低webrtc握手未结束，数据先到的日志等级 (#3368) 小强先生 2024-03-13 10:57:43 +0800
• 69800632fe
  feat(html): update webrtc page (#3361) johzzy 2024-03-12 23:48:17 -0300
• e2939aebdb 降低webrtc握手未结束，数据先到的日志等级 linshangqiang 2024-03-12 16:35:16 +0800
• 62bca29edf 降低webrtc握手未结束，数据先到的日志等级 linsq@wiclass.net 2024-03-12 14:16:02 +0800
• 1355172fa2 修复视频流存在b帧时，时间翻转导致的切片精度偏差很大的问题 xingqiao 2024-03-11 17:41:38 +0800
• 1356bdda47 [what][bugfix][live] 修复向某些 FMS3.0 推流失败问题 haorui 2024-03-11 16:33:55 +0800
• 7df189c555 Merge branch 'master' of https://github.com/ixingqiao/ZLMediaKit xingqiao 2024-03-11 14:06:42 +0800
• 4226c9e8dc feat(html): update webrtc page Johnny 2024-03-03 18:53:57 +0800
• 1e39594335
  fix for https://bugs.chromium.org/p/webrtc/issues/detail?id=15845 (#3360) johzzy 2024-03-10 10:34:03 -0300
• 4d205b1384 fix for https://bugs.chromium.org/p/webrtc/issues/detail?id=15845&q=msid&can=1 Johnny 2024-03-10 18:05:54 +0800
• 2f50344e7b
  Add ServiceController to manage PlayerProxy/PusherProxy/FFmpegSource/RtpServer services (#3337) johzzy 2024-03-10 05:31:20 -0300
• b0258efcef 防止clear时崩溃问题 xiongziliang 2024-03-10 16:30:12 +0800
• 288ffd9859 Merge branch 'master' of github.com:johzzy/ZLMediaKit xiongziliang 2024-03-10 16:26:02 +0800
• 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