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

#4042

#4043

#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

• 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
• 4c1f0c9b7f 修复Windows下绑定端口可能失败的问题 ziyue 2022-05-10 17:28:48 +0800
• 5b51d7cb93 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-05-10 16:49:42 +0800
• 3c72917ea0 修复bind socket在Windows下失败导致的问题 ziyue 2022-05-10 16:49:08 +0800
• a9d7874467
  Update README.md 夏楚 2022-05-10 15:31:36 +0800
• 9861091b18 优先使用ipv4地址 ziyue 2022-05-10 14:48:05 +0800
• 45494c020b bug fixed ziyue 2022-05-10 10:44:12 +0800
• d037acbf62 完善ipv6支持 ziyue 2022-05-08 17:06:10 +0800
• a44334acaf 全面支持ipv6 ziyue 2022-05-08 16:33:33 +0800
• a95bf960e0 完善ipv6支持 xiongziliang 2022-05-08 09:25:47 +0800
• c14bf7d8b1 修复编译问题 xiongziliang 2022-05-08 00:39:52 +0800
• d66845425c 完善ipv6网络适配 xiongziliang 2022-05-08 00:26:01 +0800
• 3062ea0e7c 初步支持ipv6: #576, #1406 ziyue 2022-05-07 20:06:08 +0800
• 5e08e43e9a
  webrtc测试网页新增datachannel echo显示框 (#1613) Dw9 2022-05-05 16:34:49 +0800
• 7649eaf3a9 datachannel echo显示 Dw9 2022-05-05 14:37:45 +0800
• 5844b61880
  Merge pull request #1607 from Dw9/master Xiaofeng Wang 2022-05-05 09:38:44 +0800
• fb003714e9 新增webrtc datachannel功能: #1216 xiongziliang 2022-05-04 22:15:21 +0800
• d507b76097
  Update CMakeLists.txt Dw9 2022-05-01 12:19:23 +0800
• 200a193c04 openRtpServer新增ssrc参数修改为追加至函数末尾, 确保代码逻辑一致无歧义: #1572 ziyue 2022-04-28 17:44:35 +0800
• 85399015f9 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-04-28 17:26:05 +0800
• c1d2adebae
  rtmp拉流的兼容性改进 (#1595) alexliyu7352 2022-04-28 14:13:09 +0800
• ba8a67bc5b add bom Alex 2022-04-28 12:10:59 +0800
• 09cf3d7f90
  修改MSG_AGGREGATE的时间戳处理逻辑 alexliyu7352 2022-04-26 01:36:22 +0800
• 9bd5669bd9
  修复play指令的bug alexliyu7352 2022-04-26 01:32:42 +0800
• 5e729d6153 溯源集群模式支持边沿服务器选择开启转hls: #1588 xiongziliang 2022-04-23 18:40:20 +0800
• c31d44d680
  Merge pull request #1584 from Dw9/master 夏楚 2022-04-19 19:45:01 +0800
• 56e72b1191
  ci支持pull request 夏楚 2022-04-19 19:31:22 +0800
• d06b4cdd3a
  ci支持pull request 夏楚 2022-04-19 19:30:55 +0800
• 824f1d2a47
  ci支持pull request 夏楚 2022-04-19 19:30:14 +0800
• 67bb53746e
  Update CMakeLists.txt Dw9 2022-04-19 18:07:03 +0800
• c82cc587c8
  fix typo (#1578) Dw9 2022-04-18 11:48:56 +0800
• 050026ed2a
  Update mk_common.cpp Dw9 2022-04-18 11:36:21 +0800
• 97952bdf0f 更新第三方库，修复mp4录制相关问题：1507 xiongziliang 2022-04-16 22:23:26 +0800
• 974055fd17 确保推流器主动断开时，不开启断连续推特性: #1559 xiongziliang 2022-04-16 21:37:07 +0800
• ebe4141026
  c api和测试范例新增webrtc功能 (#1574) Dw9 2022-04-16 15:57:02 +0800
• e712639e33
  openrtpserver接口新增ssrc参数，强制过滤不属于本端口的视频流，以解决视频串流问题 (#1572) wangcker 2022-04-16 15:12:49 +0800
• fdf305bc3b rtp tcp服务器支持ssrc过滤 xiongziliang 2022-04-16 15:04:39 +0800
• 06f4c50644 整理完毕 xiongziliang 2022-04-16 14:51:28 +0800
• 7c457179cd
  Update RtpServer.cpp 夏楚 2022-04-16 14:42:27 +0800
• cb3c3e71bd
  Update WebApi.cpp 夏楚 2022-04-16 14:41:08 +0800
• a47c1af0af
  Update RtpProcess.h 夏楚 2022-04-16 14:40:34 +0800
• efd159bbe2
  Update WebApi.cpp 夏楚 2022-04-16 14:39:33 +0800
• 2b460c97ed 更新第三方库 xiongziliang 2022-04-16 14:38:38 +0800
• 24472ee346 修复aac adts头大于7个字节时的兼容性问题 xiongziliang 2022-04-16 14:13:55 +0800
• 21b851f83d
  Merge branch 'ZLMediaKit:master' into master Dw9 2022-04-15 20:51:29 +0800
• 89083b0143 c sdk 增加rtc服务器 Dw9 2022-04-15 20:09:51 +0800
• a82d04971f 对rtc http请求的处理 Dw9 2022-04-15 20:09:05 +0800
• 888a248a3c mk_api增加json库 Dw9 2022-04-15 20:07:01 +0800
• d85a7180ad c sdk识别到enable_webrtc Dw9 2022-04-15 20:02:31 +0800
• dac085093a 修复视频串流 wangcker 2022-04-15 16:27:43 +0800
• 5144b84ee7 添加bom头 ziyue 2022-04-10 23:58:56 +0800
• f128b35b18
  解决多pps问题 alexliyu7352 2022-04-10 23:43:44 +0800
• 08de795220
  Update H264.h alexliyu7352 2022-04-10 23:38:42 +0800
• a0c1bc13cc
  修复多次调用onShutdown的bug (#1552) alexliyu7352 2022-04-10 19:09:16 +0800
• 56c0c2e60f
  第二个方案 alexliyu7352 2022-04-10 18:57:42 +0800
• 4acaf5acd6
  Update PlayerProxy.h alexliyu7352 2022-04-10 18:49:09 +0800
• cea433164b
  修复多次调用onShutdown的bug alexliyu7352 2022-04-10 18:36:21 +0800
• e065b1dfba 子进程重启失败时，不应通知守护进程退出，确保子进程重启成功 xiongziliang 2022-04-09 21:02:54 +0800
• c334dcfd38 Revert "子进程重启失败时，不断重试，避免重启失败 (#1545)" xiongziliang 2022-04-09 20:57:00 +0800
• 471a8b7735
  子进程重启失败时，不断重试，避免重启失败 (#1545) alexliyu7352 2022-04-09 20:37:36 +0800
• a1b350c9f0 startSendRtp接口udp发送不指定端口时，从端口池获取端口 xiongziliang 2022-04-09 10:33:27 +0800
• a6e82799f5 openRtpServer接口新增re_use_port参数 xiongziliang 2022-04-09 10:26:15 +0800
• 6073175e75 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-09 10:23:33 +0800
• 78d32702e2
  修复由于识别不出关键帧而导致hls不能切片. (#1551) alexliyu7352 2022-04-09 10:22:41 +0800
• eaca6d6637 1.修复由于识别不出关键帧而导致hls不能切片. 2.修复由于丢弃sei帧导致ffplay不能正常播放 Alex 2022-04-08 22:39:41 +0800
• 6c0fea4c46 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit xiongziliang 2022-04-07 20:39:34 +0800
• 81de71fd37
  双重保险, 避免重启失败 alexliyu7352 2022-04-06 17:42:52 +0800
• b1f3be1ae9
  Update main.cpp alexliyu7352 2022-04-06 17:39:07 +0800
• 75b17b3a6a
  避免m3u8文件为chunked时崩溃 (#1543) alexliyu7352 2022-04-06 14:16:48 +0800
• e4262222f4
  hls拉流时应该适当重试 (#1541) alexliyu7352 2022-04-05 19:49:22 +0800
• 5adeba46b4
  Update HttpChunkedSplitter.cpp 夏楚 2022-04-05 19:45:29 +0800
• efc3e78ba0
  使用emplace_back优化代码 (#1542) alexliyu7352 2022-04-05 19:32:02 +0800
• ac843d9c5c
  避免m3u8文件为chunked时崩溃 alexliyu7352 2022-04-05 14:12:30 +0800
• 0df48f006e
  Update HttpChunkedSplitter.h alexliyu7352 2022-04-05 14:05:43 +0800
• 17e1c9e954
  为什么不用emplace_back? alexliyu7352 2022-04-05 05:30:38 +0800
• c8a24fef84
  Update HlsPlayer.cpp alexliyu7352 2022-04-05 05:20:27 +0800
• 14b8298b29
  hls拉流时应该适当重试 alexliyu7352 2022-04-05 05:17:13 +0800
• 8da23da35c 添加utf-8 bom头 xiongziliang 2022-04-03 18:38:07 +0800
• 2818e371b8 完善startSendRtp接口 xiongziliang 2022-04-03 18:25:36 +0800
• de0738b1d1 Merge branch 'feature/rawrtpsend' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-03 17:34:51 +0800
• 7ed8429759
  Merge pull request #1537 from alexliyu7352/alexliyu7352-patch-19 夏楚 2022-04-03 17:33:38 +0800
• 007164ac9b
  崩溃重启时间改成3秒 (#1536) alexliyu7352 2022-04-03 17:32:38 +0800
• f25487a00c
  进程重启时间改成3秒 夏楚 2022-04-03 17:31:56 +0800
• 9ea6faa9ce Merge remote-tracking branch 'origin/master' xiongziliang 2022-04-03 17:27:59 +0800
• 949bfd3922 Merge branch 'js_datachannel' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-03 17:12:58 +0800
• 1ed793fe97 初步实现webrtc datachannel sdp握手 xiongziliang 2022-04-03 17:12:23 +0800
• 03dfcbad36 优化webrtc sdp处理相关代码 xiongziliang 2022-04-03 17:10:39 +0800
• a7476e436a
  修复HlsPlayer播放器BUG alexliyu7352 2022-04-01 20:59:58 +0800
• bdc7845024
  重启子进程太快了 alexliyu7352 2022-04-01 20:55:10 +0800
• 29ceddd23d fix startsendrtp pt error xgj 2022-04-01 19:15:35 +0800