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

• c1f29f989d 修复addStreamProxy添加hls拉流关闭崩溃bug root 2022-06-01 12:14:06 +0800
• 8f5e49bfcf 修复addStreamProxy添加hls拉流关闭崩溃bug root 2022-06-01 12:08:34 +0800
• 4836f90803 修复hls添加拉流后关闭流崩溃的bug root 2022-06-01 11:04:09 +0800
• ddc0a0d6e5 修复hls添加拉流后关闭流崩溃的bug root 2022-06-01 11:03:44 +0800
• b0beea7781 修复笔误 xiongziliang 2022-05-30 12:44:11 +0800
• cea30f8180 修复低版本gcc编译问题:#1667 xiongziliang 2022-05-29 22:13:07 +0800
• fd52ba31b0 忽略SIGHUP信号 xiongziliang 2022-05-29 21:44:53 +0800
• ea6ef2779e 新增url判空逻辑 xiongziliang 2022-05-29 21:36:34 +0800
• 4f05aef245 兼容一些老的c编译器: #1668 xiongziliang 2022-05-29 21:30:06 +0800
• 38e7f03ef8 避免因为NULL导致崩溃 Alex 2022-05-29 11:11:32 +0800
• 57d65e47cf 暂时关闭EPOLLEXCLUSIVE特性 xiongziliang 2022-05-28 10:51:09 +0800
• 0639595d1f 更新zltoolkit, 完善对无ipv6网络环境的支持 xiongziliang 2022-05-28 10:42:57 +0800
• fd4145a622 完善对rtp负载为空处理逻辑：#1661 xiongziliang 2022-05-28 10:34:54 +0800
• 6596eec069 Merge branch 'rtc_audio_delay' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-05-28 10:21:48 +0800
• ff2e4cf152 添加ffmpeg相关cmake文件 xiongziliang 2022-05-28 10:18:40 +0800
• a11289e5f0 集群模式，溯源重试改成最大3次: #1663 xiongziliang 2022-05-28 09:52:31 +0800
• 0c5b3f87e5 优化cmake xiongziliang 2022-05-28 09:48:19 +0800
• 93201f40d3 优化日志提示 xiongziliang 2022-05-28 09:47:48 +0800
• 4e57416be9 修复cmake generate export 和 test工程先后变编译错误问题 baiyfcu 2022-05-27 17:03:49 +0800
• 3110284302 修复rtc单独播放音频延时高问题 cqm 2022-05-27 09:24:11 +0800
• e2908e9775
  cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660) 夏楚 2022-05-26 20:30:43 +0800
• 948b1f925e 完善 ziyue 2022-05-26 20:18:37 +0800
• 2997facdaa 兼容非cmake构建时情况 ziyue 2022-05-26 20:17:01 +0800
• d4ae0fef6f 完善 ziyue 2022-05-26 19:38:52 +0800
• dce77c586c CMAKE添加自动生成mk api export头文件 baiyfcu 2022-05-26 18:27:47 +0800
• e10d39efda 解决msvc下链接问题2 ziyue 2022-05-26 15:21:50 +0800
• 75bf750aab 解决msvc下链接问题 ziyue 2022-05-26 15:17:20 +0800
• 989e7b2e75 解决msvc下编译问题 ziyue 2022-05-26 11:59:19 +0800
• 59ff0a9a1a 添加utf-8 bom头，解决msvc下编译问题 ziyue 2022-05-26 11:00:48 +0800
• d79178d116 解决msvc下编译问题 ziyue 2022-05-26 10:49:44 +0800
• 5f3a46d611 FFmpeg未找到时，忽略player_opencv用例 ziyue 2022-05-25 16:06:30 +0800
• cb0e5c6c57 全面更新整理c sdk ziyue 2022-05-25 15:38:32 +0800
• 9736badcea 优化编解码相关代码 ziyue 2022-05-25 15:11:26 +0800
• 0739b1ddd2 完成FFmpeg相关代码迁移改造 ziyue 2022-05-25 14:50:26 +0800
• fa70af7cce 移动FFmpeg相关代码 ziyue 2022-05-25 14:41:08 +0800
• 6f8ff98afd 更新zltoolkit，并更新作者列表 xiongziliang 2022-05-21 19:55:21 +0800
• d78657b706
  检查sendmmsg相关依赖并设置对应的宏 zhaoyi233 2022-05-21 15:18:51 +0800
• b0f0bdb6ae 调整优化webrtc sdp处理相关代码 xiongziliang 2022-05-20 22:14:21 +0800
• 757001ad8a Merge branch 'sdp_munging' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-05-20 21:58:58 +0800
• 30dbac2c70 提高对不规范GB28181流的兼容性，防止视频轨道被忽略 xiongziliang 2022-05-20 21:52:53 +0800
• 557d70eac5 更新ZLToolKit，修复可能缓存多个gop的bug xiongziliang 2022-05-20 21:52:01 +0800
• 6d658f8118 更新zltoolkit，修复环形缓冲相关bug cqm 2022-05-20 18:10:52 +0800
• b61cce85bd
  修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) (#1644) xiongguangjie 2022-05-19 19:01:23 +0800
• 86e412dc1f 修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) xgj 2022-05-19 17:14:05 +0800
• 72c012db9d rtp_ssrc_sim type change 当有rid时, 不返回ssrc-group:SIM cqm 2022-05-18 18:10:38 +0800
• acc94c2f79 设置aac的config cqm 2022-05-17 18:07:10 +0800
• 862b2dbd9e rtc代码观看 cqm 2022-05-13 10:25:18 +0800
• 03d2cb8926 review cqm 2022-05-12 15:37:15 +0800
• ab3d43ca56 测试程序代码观看 cqm 2022-03-28 19:16:32 +0800
• 4994d01098 api及MediaServer入口代码观看 去除std名字空间引入 cqm 2022-03-19 23:46:23 +0800
• 25d6806923 api层去除using namespace std依赖 httpclient增加进度回调 cqm 2022-03-16 14:55:05 +0800
• 17162e424d RTSP代码观看 cqm 2022-04-18 19:00:10 +0800
• b7259a7f07 Rtmp代码观看 cqm 2022-03-09 18:52:42 +0800
• 8c51ee28f4 WebSocket模块代码观看 删除DataType模板参数，建议SocketUtil增加sendBin函数来发送二进制的websocket数据 cqm 2022-03-09 15:39:01 +0800
• e95b0a2dc4 HttpModule review HttpDownloader增加进度回调 url支持format参数 cqm 2022-03-01 12:01:48 +0800
• 8d24d41a08 HlsPlayer代码观看 cqm 2022-03-07 12:05:54 +0800
• ae63249d83 add FFMpegEncoder cqm 2022-03-04 16:41:30 +0800
• 1c9a2fda6b 增加wsPlayer项目 cqm 2022-03-04 16:40:57 +0800
• 9fc721511b Pusher基础代码观看 cqm 2022-03-03 23:44:10 +0800
• dadf95118a Hls代码查看 cqm 2022-04-18 18:38:51 +0800
• 0967f7ac42 add eap cqm 2022-02-18 00:09:10 +0800
• ec8d995bc4 FMp4 codereview cqm 2022-02-18 00:08:33 +0800
• 173701c699 RTMP CodeReview cqm 2022-02-18 00:08:08 +0800
• c92a6c4adb Rtp与TS代码整理 cqm 2022-02-18 00:05:20 +0800
• fc103b0d43 录制回放代码观看 cqm 2022-02-18 00:01:04 +0800
• fddf9ef4c9 webrtc代码观看 增加Echo插件接收rtcp的打印 rtc测试网页默认选中720p分辨率 去除std名字空间依赖 cqm 2022-03-10 17:47:42 +0800
• b1526f11b2 Player观看: 解码，渲染，音频播放，视频显示等 PlayerBase: 播放器接口类 MediaPlayer: 万能媒体播放类 PlayerProxy: 将MediaPlayer代理成MultiMediaSource cqm 2022-02-17 23:39:11 +0800
• 28815cacb0 Extension代码观看: 1. Rtp/Rtmp Encoder 不继承 Rtp/Rtmp Decoder 2. 抽象出AudioSdp基类，共用代码 3. 删除std名字空间引入 4. 头文件调整 cqm 2022-05-16 10:22:19 +0800
• d851dbd2ed Common层代码观看 将Player上的Demuxer移到MediaSink中 cqm 2022-02-17 23:53:01 +0800
• 12d17f4ec6 增加srtp 2.3.0和usrsctp 0.9.5.0库，更新ci脚本 cqm 2021-10-27 17:49:16 +0800
• c7d7999f53 兼容gcc4.8编译器 ziyue 2022-05-18 20:07:54 +0800
• 2b29e58f71 sdp代码重构, 增加addItem和addAttr cqm 2022-05-18 09:56:53 +0800
• 6cab65f7b0
  支持SDP munging方式simulicast (#1639) mtdxc 2022-05-18 11:26:57 +0800
• 9d9315d8c6 支持SDP munging方式simulicast cqm 2022-05-16 12:54:50 +0800
• ee15c571e0 更新zltoolkit，修复环形缓冲相关bug ziyue 2022-05-17 20:06:36 +0800
• e1d4417062 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-05-15 18:02:14 +0800
• d9f552ded9 更新zltoolkit ziyue 2022-05-15 18:01:25 +0800
• 251fe1f77c 优化随机端口分配逻辑 xiongziliang 2022-05-14 23:34:33 +0800
• 8231c5c293 新增GB28181 tcp passive被动发送接口(startSendRtpPassive) xiongziliang 2022-05-14 23:25:22 +0800
• 4f768cacf1 修复编译警告 xiongziliang 2022-05-14 18:46:50 +0800
• b4166d5cfe 修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635 xiongziliang 2022-05-14 17:14:38 +0800
• f1555a5501 防止忽略shutdown事件 xiongziliang 2022-05-13 23:54:04 +0800
• 3e869c1f1d 修复https 302 跳转http相关bug xiongziliang 2022-05-13 23:24:17 +0800
• dd8b4783b7 Merge remote-tracking branch 'origin/master' xiongziliang 2022-05-13 23:22:10 +0800
• fdbfccb32e hls/http-ts播放器在消费完frame时再触发shutdown事件 xiongziliang 2022-05-13 23:22:00 +0800
• ed13cc691c
  新增metaRTC链接 夏楚 2022-05-13 22:52:30 +0800
• d8b99101cf 更新ZLToolKit xiongziliang 2022-05-13 20:48:34 +0800
• 9e6ff0e798 优化头文件引用: #1627 xiongziliang 2022-05-13 20:48:22 +0800
• b0f15c9647 sctp关闭编译时,关闭datachannel相关功能 xiongziliang 2022-05-13 20:45:04 +0800
• 3dd3897ad6 新增部分作者 xiongziliang 2022-05-13 20:22:19 +0800
• 7e58d91a57 修复rtp two byte ext解析相关bug: #1631 xiongziliang 2022-05-13 20:01:57 +0800
• 301cbf0a83
  支持多个rtc候选地址 (#1622) mtdxc 2022-05-12 15:21:09 +0800
• 943deab664
  解决CentOS7下Parse.cpp编译不通过问题 (#1627) starry 2022-05-12 15:12:13 +0800
• 1ca1210e40
  Update CMakeLists.txt starry 2022-05-12 11:19:51 +0800
• f8354bddff
  Update CMakeLists.txt starry 2022-05-12 11:14:19 +0800
• 43b39fdb71 vod等非点播播放完毕后及时断开 Alex 2022-05-12 01:27:32 +0800
• db67013cf3 fixed missing extern_ips check cqm 2022-05-11 14:56:52 +0800
• fb875d8abc 支持多个rtc候选地址 cqm 2022-05-11 10:46:34 +0800
• 845b2ea8d8
  !16 增加长期保存hls切片的功能 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 夏楚 2022-05-11 03:39:59 +0000
• 5bc313bafe 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 WuPeng 2022-05-10 17:32:50 +0800