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

• eeb2eadf0a Optimize index file code format Deepslient 2023-10-24 22:56:55 +0800
• 5e9ddf64c3 统一index文件注释格式 Deepslient 2023-10-24 22:31:50 +0800
• 34425df1c7
  Merge branch 'ZLMediaKit:master' into master Deepslient 2023-10-24 21:38:56 +0800
• b00efb3391 修复startSendRtp成功后udp套接字被快速关闭的问题 (#2468) dongzhou.xie 2023-10-24 21:05:07 +0800
• a871fc1882 websocket服务器支持在创建器中指定消息类型 xia-chu 2023-10-23 20:58:12 +0800
• ebde21a314 修复openRtpServer开启tcp模式后打开端口失败的bug xia-chu 2023-10-23 20:45:58 +0800
• 08d86c498e 修复jemalloc编译问题 xia-chu 2023-10-23 20:41:38 +0800
• d9ea82c800 更新zltoolkit xia-chu 2023-10-23 20:39:10 +0800
• f17f7400a7 Optimization syntax Deepslient 2023-10-22 10:04:07 +0800
• c3994a1f74
  Merge branch 'ZLMediaKit:master' into master Deepslient 2023-10-22 10:00:15 +0800
• 7ee2d66eaa
  统一代码命名风格 (#2910) ljx0305 2023-10-19 17:55:30 +0800
• 87affbe24b
  Create c-cpp.yml ljx0305 2023-10-19 15:51:23 +0800
• 8f8e4c4314
  Update HttpSession.h ljx0305 2023-10-19 15:30:01 +0800
• 372b701a7a
  Update HttpSession.cpp ljx0305 2023-10-19 15:29:29 +0800
• 8e941cf303
  Update RtpServer.cpp ljx0305 2023-10-19 14:11:21 +0800
• 493f7d29bd
  Update WebHook.cpp ljx0305 2023-10-19 14:10:26 +0800
• 2f8086f0d7
  Update config.h ljx0305 2023-10-19 14:09:38 +0800
• bf12065dd6
  Update config.cpp ljx0305 2023-10-19 14:08:56 +0800
• af6c10083b
  Merge pull request #3 from ZLMediaKit/master ljx0305 2023-10-19 14:03:55 +0800
• 1804ad9f08
  Merge branch 'ZLMediaKit:master' into master Deepslient 2023-10-18 17:02:51 +0800
• 9bf48567b2 fixed issue #2874, thanks quxiaohui-debug cqm 2023-10-16 09:32:26 +0800
• b8cb8957e4
  修复WebApi退出清理时重复析构问题 (#2900) Armstrong 2023-10-13 15:26:31 +0800
• caf7c85090 Merge branch 'master' of https://github.com/ixingqiao/ZLMediaKit xingqiao 2023-10-13 09:31:04 +0800
• 10dc77233c 修复WebApi退出清理时重复析构问题 ArmstrongCN 2023-10-13 00:08:08 +0800
• eedf262059
  新增支持mjpeg负载的mp4文件点播 (#2898) imp_rayjay 2023-10-12 17:26:53 +0800
• 170ffbc89e 修改文件编码为utf8 bom renjun 2023-10-12 17:14:03 +0800
• 1dcd8433f5
  增加mjpeg负载的mp4文件点播 imp_rayjay 2023-10-12 16:35:27 +0800
• 9cb5d82b04 Merge branch 'master' into dev xiongguangjie 2023-10-12 16:33:34 +0800
• 67bc0273b4
  Modify the readme description (#2859) Deepslient 2023-10-12 14:38:45 +0800
• 6348e64cdf
  确保hls播放器持续播放 (#2896) PioLing 2023-10-12 11:05:41 +0800
• 6402aca891 优化hls索引查找相关性能 admin 2023-10-11 21:16:26 +0800
• 9aef255ffe
  Merge 3c07123448 into c25e76311f PioLing 2023-10-11 08:14:35 +0000
• 3c07123448 优化hls索引查找相关性能 admin 2023-10-11 16:07:08 +0800
• c25e76311f
  修复相对时间戳模式下时间戳回退导致音视频不同步的问题 (#2894 #2877) fruit Juice 2023-10-11 14:52:16 +0800
• 8c881b9245
  Update Stamp.cpp fruit Juice 2023-10-10 21:44:53 +0800
• fdc00d5a02
  增加jemalloc工具类, 增加jemalloc内存统计分析 (#2885) alexliyu7352 2023-10-10 11:48:56 +0800
• db3f0147be
  升级jemalloc到5.3版本 (#2884) alexliyu7352 2023-10-09 19:37:04 +0800
• 820896e520 add bom Alex 2023-10-09 18:01:34 +0800
• 677be73b7c 增加jemalloc工具类, 增加jemalloc内存统计分析 Alex 2023-10-09 17:55:38 +0800
• 2c23cbaf94 升级jemalloc到5.3版本,相比5.2.1内存稳定许多,去除--without-export编译参数, 解决类似glibc中分配内存却在jemalloc中释放导致崩溃问题 Alex 2023-10-09 17:35:44 +0800
• 261777ebd6 Merge branch 'master' of https://github.com/Deepslient/ZLMediaKit Deepslient 2023-10-06 20:24:06 +0800
• f72358518f Optimize index file Deepslient 2023-10-06 19:16:04 +0800
• 785a52afef
  Merge branch 'ZLMediaKit:master' into master Deepslient 2023-10-06 19:12:21 +0800
• 48f62810c7 更新zltoolkit xia-chu 2023-09-28 16:00:33 +0800
• ba01136f15 更新默认ssl证书 xia-chu 2023-09-28 15:48:51 +0800
• 9f6930390a
  IP白名单支持ipv6 (#2858) 夏楚 2023-09-26 14:48:19 +0800
• cd1fae2acb Modify the readme description Deepslient 2023-09-24 11:50:39 +0800
• e0751f1ac7
  Merge branch 'ZLMediaKit:master' into master Deepslient 2023-09-24 10:13:29 +0800
• d7bdfc871d ip白名单支持ipv6 xia-chu 2023-09-23 21:38:30 +0800
• 3ff373471e 更新zltoolkit xia-chu 2023-09-23 20:34:53 +0800
• d542eca4d7 http-flv拉流客户端支持压测模式 xia-chu 2023-09-23 20:34:43 +0800
• 585f7c3a3a 修复ffmpeg日志保存目录相关bug xia-chu 2023-09-23 20:34:36 +0800
• 8210e099d9 fix some compile error xiongguangjie 2023-09-15 14:19:31 +0800
• 228cbb1127 Merge branch 'master' into dev xiongguangjie 2023-09-15 14:01:34 +0800
• f69f3b3029
  docker 优雅关闭（docker stop graceful） (#2827) xiongguangjie 2023-09-09 10:59:27 +0800
• 1c5066b2c8 SIGTERM exit print xiongguangjie 2023-09-09 00:35:31 +0800
• 6c67c6fc67 process SIGTERM signal xiongguangjie 2023-09-09 00:29:43 +0800
• c62361a6d6 docker stop graceful xiongguangjie 2023-09-09 00:13:17 +0800
• eca8a93e21
  Update dockerfile Wang Jingkai 2023-09-08 11:58:57 +0800
• e5a26248c9
  Update dockerfile Wang Jingkai 2023-09-06 09:58:00 +0800
• 57aa6b7471
  调整启动命令，可自定义日志级别。 Wang Jingkai 2023-09-04 18:00:54 +0800
• f26e25323f 更新作者列表与readme xiongziliang 2023-09-02 19:26:24 +0800
• 6fa4d1b92f Add semicolons to unify JS format Deepslient 2023-09-02 11:24:01 +0800
• c83a3c5639 mk_media_source_broadcast_msg接口添加返回值 xia-chu 2023-09-02 13:06:42 +0800
• 11fdffe84a 新增broadcastMessage接口 xia-chu 2023-09-02 13:00:36 +0800
• 144165d537 新增mk_media_source_broadcast_msg接口 xia-chu 2023-09-02 12:58:20 +0800
• e3e7495c90 新增webrtc播放器datachannel消息广播机制和接口 xia-chu 2023-09-02 12:53:56 +0800
• 39dd886ec1 优化获取播放器列表相关功能 xia-chu 2023-09-02 12:06:35 +0800
• 5d2eb93405 Add semicolons to unify JS format Deepslient 2023-09-02 11:24:01 +0800
• d286ac1d73 NoticeCenter支持安全类型转换，解决监听者参数类型不一致导致的bug xia-chu 2023-09-02 10:52:07 +0800
• c35b5e9215 rtp过滤逻辑限制version字段 xia-chu 2023-09-02 10:50:25 +0800
• fef85da771
  修复调用close_stream同时调用getMediaList引发的崩溃 (#2800) waken 2023-08-31 10:53:46 +0800
• 138b83e5f0 修复调用close_stream同时调用getMediaList引发的崩溃 waken 2023-08-30 17:20:43 +0800
• 81966f2c48
  修复未开启sctp时，webrtc datachannel sdp交换相关bug (#2791) Dw9 2023-08-29 11:22:30 +0800
• db750df79d webrtc application sdp添加candidate相关描述 xia-chu 2023-08-29 11:08:00 +0800
• 17ba5d3813 webrtc application sdp不添加rtcp相关描述 xia-chu 2023-08-29 11:07:28 +0800
• 415ed33405 Merge branch 'master' of github.com:Dw9/ZLMediaKit into master2 xia-chu 2023-08-29 09:59:35 +0800
• 62e9b56403
  合并主线分支 (#2794) feature/transcode 夏楚 2023-08-28 11:01:21 +0800
• 75a3132964
  合并主线分支 (#2793) 夏楚 2023-08-28 11:01:05 +0800
• 6e2b5d9465
  提高http文件服务器安全性 Wang Jingkai 2023-08-28 10:20:06 +0800
• 0844f09e24 addStreamProxy重复拉流时返回错误 (#2773) xia-chu 2023-08-26 23:02:19 +0800
• 06a6d26491 提高http文件服务器安全性 xia-chu 2023-08-26 19:43:11 +0800
• f36ccee3de 更新zltoolkit xia-chu 2023-08-26 11:34:30 +0800
• cb4ab21548 修复rtsp组播遍历迭代器导致崩溃的bug xia-chu 2023-08-26 11:34:22 +0800
• f3f4b49332 修复设置点播速度后时间戳跳跃问题 xia-chu 2023-08-26 11:34:12 +0800
• b4fd445f2d webrtc测试页面不再刷新流列表 xia-chu 2023-08-26 11:33:54 +0800
• f9381a6fef rtc不支持的track,不设置group attribute Dw9 2023-08-25 18:22:31 +0800
• cbb95d2197 修复服务不支持datachannel下 亚马逊sdk rtc推流失败 Dw9 2023-08-25 18:16:44 +0800
• 407b186929
  Merge 52438db96c into 895e93cb6a Dw9 2023-08-21 08:28:34 +0700
• 895e93cb6a 端口池分配端口改成无序分配 xia-chu 2023-08-20 12:07:04 +0800
• 0c80f0c13c 更新zltoolkit xia-chu 2023-08-20 11:22:37 +0800
• 90c164f7f7 rtsp播放器过滤非法的回复 (#2760) xia-chu 2023-08-20 11:19:57 +0800
• 56afb0e76d 避免 rtsp player 请求与回复无法对应 snysmtx 2023-08-14 15:16:05 +0800
• e57463a1ed 静音音轨不参与rtc转码 cqm 2022-11-30 12:05:02 +0800
• f4b2fd9c05 重构 audio_transcode 代码： - 独立出 RtcMediaSource，并只对rtc开放 - 增加Rtc g711转码开关 - 修改说明 cqm 2022-11-29 20:38:59 +0800
• 2adc12c4ab 修复只有aac的Rtmp流无法注册bug cqm 2023-07-27 17:59:50 +0800
• 442df29c83 增加转码配置说明 cqm 2023-05-24 23:32:39 +0800
• 3765873582 处理转码和静音发生器冲突问题： 由于静音发生器产生的音频时间戳不连续，会导致转码出一大堆警告日志，并占用cpu 这变采用opus静音发生器来伪造rtc静音，而不是用转码： cqm 2022-11-17 12:43:30 +0800
• 607d8ba0e7 实现音频转码功能: - 启用rtc:// schecma - 增加音频转码码率配置 - aac转码使用原通道数 cqm 2022-06-01 18:30:40 +0800
• cb1650254f 支持多种类型的静音发生器 cqm 2022-10-27 16:23:20 +0800