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

• 89959ef02f
  支持webrtc over tcp模式 夏楚 2022-11-18 22:58:29 +0800
• 47530ce830
  新增支持webrtc over tcp模式 (#2092) Dw9 2022-11-18 22:52:57 +0800
• eef2b1fb7a c sdk支持webrtc tcp ziyue 2022-11-18 22:52:37 +0800
• 82b72fe718 webrtc tcp模式支持线程安全 ziyue 2022-11-18 22:43:29 +0800
• f05425825f webrtc tcp模式支持Firefox ziyue 2022-11-18 17:00:43 +0800
• b6f902fbe4 Merge branch 'master' of github.com:Dw9/ZLMediaKit ziyue 2022-11-18 16:53:10 +0800
• fc433de9ac 适配webrtc AV1编码: #2091 ziyue 2022-11-18 16:47:02 +0800
• 255ccb4265 精简rtp服务器相关代码 ziyue 2022-11-18 16:42:40 +0800
• afde1ec9bd 完善webrtc over tcp ziyue 2022-11-18 16:36:31 +0800
• 6ce6b63a2c 处理rtc tcp 分片 宣伟 2022-11-17 17:10:57 +0800
• 8f712d88f3 接受和发送的数据处理tcp 2字节头 宣伟 2022-11-17 17:00:43 +0800
• 55b5e573a9 先屏蔽检查isCurrentThread 宣伟 2022-11-17 16:51:37 +0800
• a3f505ccc5 webrtc server/session/cadidate 改为tcp 宣伟 2022-11-17 16:46:46 +0800
• df14924a99 优化rtmp服务器兼容性: #2078 ziyue 2022-11-15 20:53:24 +0800
• 034e29b25a 修复rtsp basic鉴权相关bug: #2087 ziyue 2022-11-15 20:52:27 +0800
• 87353534af fix rtp server process removed server not clear xiongguangjie 2022-11-14 14:04:57 +0800
• 228fa17327 windows平台默认开启wepoll(iocp) xiongziliang 2022-11-13 00:38:56 +0800
• a65cc8bbfa 修复Android编译问题 xiongziliang 2022-11-13 00:37:45 +0800
• 3fdd5a86c9 MediaServer -v 打印代码日期 xiongziliang 2022-11-13 00:13:02 +0800
• 9bb6a2f828 全面整理转协议相关配置文件 xiongziliang 2022-11-12 23:54:35 +0800
• 946945ce7b 优化代码 整理代码 xiongziliang 2022-11-12 21:59:48 +0800
• 6ffbcbfde5
  优化Ehome协议兼容性 (#2063) samosirl 2022-11-12 21:03:54 +0800
• b54f50c7c0 修复hls流注销时相关bug:#2082 xiongziliang 2022-11-12 09:57:47 +0800
• a37268f003 格式化代码 夏楚 2022-11-12 01:52:49 +0000
• bc63142712 add rtp server timeout hook xiongguangjie 2022-11-10 16:58:02 +0800
• af554bc376
  update media-server (#2075) Aven 2022-11-09 17:44:38 +0800
• 653caf6821 update media-server to 357ef88 Aven 2022-11-09 15:53:15 +0800
• e7d7a022dd fix c2065 and c2051 error on windows, and the head file mpeg-ts-proto.h is also deprecated Aven 2022-11-07 10:34:58 +0800
• 25a9e51b00 添加编译问题上报模版 Xiaofeng Wang 2022-11-07 10:28:36 +0800
• c8d95617a0 更新ZLToolKit xiongziliang 2022-11-06 00:51:15 +0800
• 44fd6b86bc 完善版本信息 xiongziliang 2022-11-06 00:38:14 +0800
• 04e2952d12 更新zltoolkit xiongziliang 2022-11-05 23:59:00 +0800
• 0053148139 优化MultiMediaSourceMuxer相关代码 xiongziliang 2022-11-05 20:47:33 +0800
• 7e95bd2078 修复MSVC编译问题 monktan89 2022-11-03 10:51:49 +0800
• c617e5d8c2 Ehome消息头解析优化，解决主码流无法播放问题，第二个及之后通道无法播放问题 liyanwei 2022-11-01 22:50:32 +0800
• 2b804514e1 修复mp4点播流线程安全检查失败bug ziyue 2022-11-01 22:02:28 +0800
• 5877d3942e RtpServer确保超时回收 ziyue 2022-11-01 17:54:41 +0800
• 2cdeddeb2c RtpServer支持udp与tcp模式并存 ziyue 2022-11-01 17:27:27 +0800
• 60d96f4f3b 优化FrameDispatcher相关代码 ziyue 2022-11-01 16:52:52 +0800
• d04761c2c6 Merge branch 'FrameDispatcher_addDelegate_refactor' of github.com:mtdxc/ZLMediaKit ziyue 2022-11-01 16:36:43 +0800
• bfe118d94e 修复RtpProcess析构导致的线程问题 ziyue 2022-11-01 16:05:23 +0800
• f5a032c9a0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-11-01 14:08:36 +0800
• dde352542b private FrameWriterInterfaceHelper cqm 2022-11-01 11:44:50 +0800
• ac3d7bd21f add addDelegate with std::function, remove FrameWriterInterfaceHelper cqm 2022-11-01 08:54:56 +0800
• 520945c2e9 提高线程安全性 ziyue 2022-10-31 17:53:20 +0800
• d2c64b1f09 Merge remote-tracking branch 'origin/master' xiongguangjie 2022-10-31 19:04:04 +0800
• 613aae8bc3 rtp server only tcp mode is none use udp server xiongguangjie 2022-10-31 18:47:42 +0800
• 918b1fce6c 修复hls/ts拉流崩溃问题：#2057 ziyue 2022-10-30 23:50:20 +0800
• 9498b96b95 确保rtp推流线程安全性 xiongziliang 2022-10-30 21:36:35 +0800
• 80eb6dc402 协议解析最大支持4MB分包: #2026 xiongziliang 2022-10-29 22:57:32 +0800
• c25e93fee3 解决启动ffmpeg进程导致shell终端假死的问题：#1662 xiongziliang 2022-10-29 17:44:55 +0800
• 9bb4b55924 修复mk_media_start_send_rtp相关bug: #2044 xiongziliang 2022-10-29 16:48:37 +0800
• 3d7fc44a9b update media-server for ts muxer add pat pmt before every video key frame xiongguangjie 2022-10-27 17:15:02 +0800
• 1012a5b08a 支持arm64 docker xiongziliang 2022-10-25 23:00:13 +0800
• cc9b1ae1f8 尝试支持arm64 docker 17 ziyue 2022-10-20 11:01:18 +0800
• b3fd74ccf0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-10-20 11:01:18 +0800
• 7d251e15b3 on_publish hook兼容非标准回复 ziyue 2022-10-20 10:59:43 +0800
• 16886b9de5 on_play回调添加状态码，可选择返回未授权或未找到状态码 huangxiuqi 2022-10-20 09:36:28 +0800
• 0a71e06d4a united some code style xiongguangjie 2022-10-19 14:55:39 +0800
• 7b87985f74 Merge remote-tracking branch 'origin/master' xiongguangjie 2022-10-19 14:27:49 +0800
• 0d2e035215 rtsp and rtp h264 lowlatency mode config xiongguangjie 2022-10-19 14:20:53 +0800
• 5bc0f306b7 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit ziyue 2022-10-18 19:24:26 +0800
• ff6e9f4fc7 修复流注销时，hls无法播完最后一个切片的问题: #1955 ziyue 2022-10-18 19:23:20 +0800
• 4a51d6b488 修复第三方引用ZLM编译webrtc避免生成dll文件 baiyfcu 2022-10-17 10:53:39 +0800
• eac5a5b1dc 使用submodule方式添加jsoncpp源码 ziyue 2022-10-16 21:10:18 +0800
• 8d80582f89 删除jsoncpp源码 ziyue 2022-10-16 21:08:03 +0800
• ac1abb34da 新增媒体流flush机制：#1996 ziyue 2022-10-16 19:49:56 +0800
• 80eef693c6 精确mp4录制时长：#1795 ziyue 2022-10-16 16:40:21 +0800
• bbdcc44eb0 mute audio maker avoid uint32_t cycle and 8k aac a frame is 128ms xiongguangjie 2022-10-11 16:53:27 +0800
• 2b64245c14 优化代码 ziyue 2022-10-08 10:47:09 +0800
• c790254f46 修复关闭mp4录制不能触发无人观看事件问题：#2010 xiongziliang 2022-10-06 13:06:54 +0800
• 5854a26047 修复未开启宏编译失败问题 xiongziliang 2022-10-06 12:59:12 +0800
• a916760ac3 整理webrtc c接口 xiongziliang 2022-10-06 12:33:48 +0800
• 426d76f05c 增加通过offer获取answer的接口，不依赖http模块 gongluck 2022-09-19 10:46:06 +0800
• d066d70e34
  Merge branch 'ZLMediaKit:master' into master gongluck 2022-09-30 02:50:53 -0500
• 34838b1b26 rtmp点播采用简单握手，发送心跳包，兼容fms服务器: #2007 ziyue 2022-09-30 13:34:56 +0800
• 63745acef0
  Merge branch 'ZLMediaKit:master' into master gongluck 2022-09-29 21:17:57 -0500
• bfebcd62c7 rtp packet sort set init seq xiongguangjie 2022-09-28 15:29:11 +0800
• 69736fdb63
  Merge pull request #1999 from ZLMediaKit/feature/gbsendpassive_random_port_return_immediately 夏楚 2022-09-26 16:16:15 +0800
• 9f716dd8b8 fix gb startsendpassive use random port return immediately not wait xiongguangjie 2022-09-26 15:50:02 +0800
• 718a18558a
  Merge pull request #1993 from leo94666/master 夏楚 2022-09-26 14:11:04 +0800
• cf5527ed62
  Update README.md 夏楚 2022-09-26 10:32:27 +0800
• 037dd646d1
  Merge pull request #1994 from Dw9/master 夏楚 2022-09-26 10:27:30 +0800
• 6f1a45db8a 修复推rtsp L16崩溃 Dw9 2022-09-25 12:13:09 +0800
• 9b8f2c5f3d 修复assert路径错误 Dw9 2022-09-25 12:12:23 +0800
• edf2341496 android webrtc player leo94666 2022-09-25 10:51:43 +0800
• b9a4b3e71a
  消除编译警告 夏楚 2022-09-24 19:07:45 +0800
• 79916ca6a4 消除编译警告 xiongziliang 2022-09-24 17:26:21 +0800
• 2f9b3e187b
  Merge pull request #1984 from Dw9/master 夏楚 2022-09-23 14:29:12 +0800
• c363b30360 srt optimize ack send logic ignore too many ack packet xiongguangjie 2022-09-23 09:35:10 +0800
• 43bf7c7918 c api support srt server Dw9 2022-09-22 21:18:34 +0800
• b782832a74 fix typo Dw9 2022-09-22 21:16:56 +0800
• 02aad5d256 srt avoid ack time map memory not release xiongguangjie 2022-09-22 19:21:14 +0800
• a74a9ec0d7 remove srt debug log xiongguangjie 2022-09-22 12:03:53 +0800
• 801f705628 fix srt ack packet packet buf length error xiongguangjie 2022-09-22 12:00:02 +0800
• 642ca4997a add more dump xiongguangjie 2022-09-22 01:07:10 +0800
• 533f35dac4 copy srt estimated link capacity algorithm xiongguangjie 2022-09-22 00:34:42 +0800
• ea35002be8 copy srt official packet recve rate algorithm xiongguangjie 2022-09-21 19:21:49 +0800
• a226794cd2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-09-20 16:13:14 +0800
• 6fad6f591f 开启第三方mpeg库编译宏开关，兼容某些国标流 ziyue 2022-09-20 16:00:13 +0800