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

#4048

#4048

#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

• 3165a2f81c 修改服务器版本信息声明相关代码 ziyue 2021-06-29 11:16:05 +0800
• 7375889b2e
  Update config.h 6.0 夏楚 2021-06-29 10:39:31 +0800
• dfbfd65ab3 宏定义移至macros.h文件 ziyue 2021-06-28 20:29:56 +0800
• de5cf86050 http最大请求加大到40 KB ziyue 2021-06-28 20:12:35 +0800
• 397c1c7c57 整理宏 ziyue 2021-06-28 20:12:07 +0800
• d4b3036446 add：增加Audio子目录及对应的库 DoubleX69 2021-06-28 17:51:58 +0800
• 0263bb9b50 修改提示信息 DoubleX69 2021-06-28 17:51:08 +0800
• 4edb015d2d add: 增加AudioPlayer播放音频 DoubleX69 2021-06-28 17:34:07 +0800
• 5ac4e3cc72 add: 增加Audio相关代码 DoubleX69 2021-06-28 17:33:26 +0800
• 7e5873d818 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-06-28 16:29:50 +0800
• ded38fc3f6 Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-06-28 16:03:20 +0800
• 48d82daa5c 添加bom头 ziyue 2021-06-28 16:02:13 +0800
• 42d2c1b4c0
  Merge pull request #941 from ZLMediaKit/feature/fix-cmake-prepend Xiaofeng Wang 2021-06-28 14:03:44 +0800
• e1be491d4c
  Merge pull request #940 from ZLMediaKit/feature/fix-cmake-prepend Xiaofeng Wang 2021-06-28 14:03:33 +0800
• f06faa7c02 cmake list PREPEND only from 3.15 support use append linux use link group solve link order error xgj 2021-06-28 11:12:14 +0800
• 8cf58dd843 Revert "调整链接顺序, 修正编译问题" wxf 2021-06-28 13:53:28 +0800
• cd7af6fa4e update ziyue 2021-06-28 11:31:11 +0800
• 89fb4222ce 默认关闭编译webrtc ziyue 2021-06-28 10:46:03 +0800
• 8f730b8dab 整理代码 ziyue 2021-06-28 10:35:08 +0800
• 430229fe94 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev_test ziyue 2021-06-28 10:11:39 +0800
• 02bd01c83b 完善http option命令 ziyue 2021-06-28 10:09:44 +0800
• fae86a9b4b !11 合帧逻辑 加强判断，防止 SPS PPS VPS 作为一帧，rtmp h264/h265 打包 保证帧内必须有VCL Merge pull request !11 from xiongguangjie/dev 夏楚 2021-06-28 02:02:49 +0000
• 3f36a10bee Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-06-26 18:28:31 +0800
• d3f81745fd
  Merge pull request #936 from ZLMediaKit/feature/fix-workflow 夏楚 2021-06-26 18:16:45 +0800
• c733e7af41
  Merge pull request #935 from ZLMediaKit/feature/fix-compile 夏楚 2021-06-26 18:16:05 +0800
• 72e8b6efa4 支持集成 WebRTC 功能 wxf 2021-06-26 17:58:00 +0800
• 0a7acf94d3 明确使用的编译服务器版本 wxf 2021-06-26 17:57:05 +0800
• b026634a3e 未启用 WebRTC 的情况下禁用相关测试用例 wxf 2021-06-26 17:10:42 +0800
• a92b02907d 调整链接顺序, 修正编译问题 wxf 2021-06-26 16:55:30 +0800
• 4609716ba3
  Merge pull request #933 from CharleyWangHZ/master 夏楚 2021-06-26 03:55:17 +0800
• c0f362af33 for linux compile --start-group and --end-group xiongguangjie 2021-06-25 22:03:52 +0800
• 6d8d64caf6 for mergen xiongguangjie 2021-06-25 21:24:53 +0800
• 8c670c652e 提前映射ssrc与rid的关系 ziyue 2021-06-25 18:08:21 +0800
• 0f1d1ded7e rid支持更新 ziyue 2021-06-25 18:08:03 +0800
• 365aead8b6 修复注释 ziyue 2021-06-25 17:24:32 +0800
• edf30a04cf 优化代码 ziyue 2021-06-25 17:17:48 +0800
• 89ef183647 精简代码 ziyue 2021-06-25 17:10:27 +0800
• 423dd454ca 整理代码 ziyue 2021-06-25 17:02:58 +0800
• 76ebf02ced 记录所有rtp的ssrc ziyue 2021-06-25 16:57:38 +0800
• a7f75774e9 整理RtpReceiver相关代码 ziyue 2021-06-25 16:24:44 +0800
• 18b7e45906 整理nack相关代码 ziyue 2021-06-25 15:43:47 +0800
• 7406281c96 抽象RtpExtContext对象 ziyue 2021-06-25 15:31:13 +0800
• 964cf39145 RtcpContext修改时间戳单位、整理WebRTC相关代码 ziyue 2021-06-25 14:59:27 +0800
• 6c01cf336e 抽象MediaTrack与RtpChannel对象 ziyue 2021-06-25 14:37:11 +0800
• 4c08d8e197 feat(rtc): add RtpReceiverImp::handleRtp Johnny 2021-06-25 14:05:04 +0800
• ba672178b4 修复simulcast无法开启主码流的问题 ziyue 2021-06-25 13:23:10 +0800
• 332e8fa180
  Update HttpSession.cpp CharleyWangHZ 2021-06-25 11:17:21 +0800
• 248c9e8f9a
  Update HttpSession.h CharleyWangHZ 2021-06-25 10:59:56 +0800
• e3d17848f6
  Update HttpSession.cpp CharleyWangHZ 2021-06-25 10:59:06 +0800
• e7e7906ecd for firefox ingore ssrc is 0 xgj 2021-06-25 10:08:53 +0800
• ebb947c698 完善simulcast与ssrc相关处理代码 ziyue 2021-06-24 17:54:16 +0800
• 3862c8f1da 删除多余行 ziyue 2021-06-24 17:53:37 +0800
• 74a935a8cd 完善simulcast播放统计功能 ziyue 2021-06-24 13:20:17 +0800
• 7a02d2c8d6 不支持的rtp方向，answer sdp设置为inactive ziyue 2021-06-24 13:09:51 +0800
• e9d28c1386 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev xgj 2021-06-24 11:53:15 +0800
• a91f4d29f2 完善simulcast接收及处理 ziyue 2021-06-24 11:39:55 +0800
• dcb91e3b50 初步支持simulcast流的接收和分流 ziyue 2021-06-23 21:44:04 +0800
• faa43adbbc Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev_test ziyue 2021-06-23 17:32:26 +0800
• 307be4339f Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test ziyue 2021-06-23 17:32:09 +0800
• eece9dc51a
  Create requirement.md 夏楚 2021-06-23 12:03:43 +0800
• 0eecb3be6c
  Merge pull request #927 from ZLMediaKit/feature/fix-compile-el7 夏楚 2021-06-23 11:56:08 +0800
• 8717cd2f3d 优化代码 ziyue 2021-06-23 11:09:53 +0800
• d9de40526d 解决开启rtp推流鉴权导致udp丢包的问题，提升GB28181推流秒开体验 ziyue 2021-06-23 11:02:39 +0800
• 0d4ac4f655 spec: Fix openssl directory wxf 2021-06-23 10:11:30 +0800
• b34226b785 spec: WebRTC requires openssl >= 1.1 wxf 2021-06-23 10:00:46 +0800
• 549b07f598 spec: Enable WebRTC wxf 2021-06-23 09:44:37 +0800
• f5786fcba3 兼容 glibc < 2.18 wxf 2021-06-23 10:34:02 +0800
• e8c9666af0 支持hls直播文件延时删除: #913 ziyue 2021-06-23 10:25:09 +0800
• ce2122d3b6 优化rtmp chunk相关处理代码 xiongziliang 2021-06-22 10:39:16 +0800
• 510d908bc4 rtp服务器支持opus推流 ziyue 2021-06-21 20:32:13 +0800
• c90f348801 RTP服务器支持ES混合流, 同时新增H265/G711的支持 ziyue 2021-06-21 19:58:59 +0800
• caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-21 17:51:15 +0800
• 8375064a90 Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-21 17:50:05 +0800
• 25b2208f34
  Merge pull request #921 from johzzy/johnny/dev Xiaofeng Wang 2021-06-20 09:10:08 +0800
• 89d8f005f8 fix: fix typo. Johnny 2021-06-19 23:56:17 +0800
• 9b111fac62 add to do for h265 rtmp xiongguangjie 2021-06-19 02:01:28 +0800
• d215502ff5 rtmp packet must has vlc when flush xiongguangjie 2021-06-19 01:54:57 +0800
• a28aeb2148 for frame merge must has vlc(video codec layer) data and flush rtmp a frame must has vcl xiongguangjie 2021-06-19 01:27:13 +0800
• e3708e744e
  Merge pull request #918 from ZLMediaKit/feature/fix-sdp-candidate-parse 夏楚 2021-06-18 17:07:08 +0800
• 05c9a842a9 !10 对h264 一帧多slice （多nal）fmp4播放卡顿（vlc） Merge pull request !10 from xiongguangjie/dev 夏楚 2021-06-18 07:27:52 +0000
• 2335043cdf drop SEI and AUD for h264 and h265 avoid sei as a frame xgj 2021-06-18 15:19:21 +0800
• 5fc5a9ef5f webrtc: 修正 sdp 中 candidate 解析问题 wxf 2021-06-18 13:36:25 +0800
• a6e9652da8 for h264/h265 judge a frame start more safe(h264 is first_mb_in_slice h265 is first_slice_segment_in_pic_flag) and for h265 only idr is key frame xgj 2021-06-18 12:40:42 +0800
• 3429690d75 for h264 pps sps aud sei not check first_mb_in_slice xgj 2021-06-17 19:26:58 +0800
• 1920802764 for h264 multi slice on frame compatibility xgj 2021-06-17 18:08:35 +0800
• e0d162c460 Merge remote-tracking branch 'origin/dev' into dev xgj 2021-06-17 16:15:51 +0800
• f8467f21fb 推流失败时打印日志 ziyue 2021-06-17 11:34:24 +0800
• 60a2346819 媒体源注销后不做无谓推流重试 ziyue 2021-06-17 11:32:57 +0800
• e4172b4ab1 更新postman api配置文件 ziyue 2021-06-17 11:03:11 +0800
• 752590f804 完善addStreamPusherProxy相关功能并修复自动删除相关的bug ziyue 2021-06-17 10:59:58 +0800
• aa39680c69 addStreamPusherProxy接口修改key唯一性规则,新增rtsp推流类型、超时参数 ziyue 2021-06-17 10:41:26 +0800
• eef0c31d7b addStreamProxy新增重试次数参数 ziyue 2021-06-17 10:39:22 +0800
• 936c6f7965 调整代码细节 ziyue 2021-06-17 10:12:34 +0800
• 06023f1770
  Merge pull request #916 from ZLMediaKit/dev-monk 夏楚 2021-06-17 09:52:49 +0800
• cd7ae27276 添加推流代理器 monktan 2021-06-16 19:40:08 +0800
• fadef1cac3 完善添加track日志打印 ziyue 2021-06-16 11:39:46 +0800
• 807f9626d5 webrtc新增对av1的支持 ziyue 2021-06-16 11:14:10 +0800
• a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-16 10:40:17 +0800
• d67060e97b mk_media_stop_send_rtp支持关闭单路流 ziyue 2021-06-16 10:36:53 +0800
• 14d70426ed 加快GB28181推流时注册速度 ziyue 2021-06-16 10:26:17 +0800