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

• a09de23271 修复调用mk_media_stop_send_rtp函数导致崩溃的bug ziyue 2021-06-16 10:14:24 +0800
• 4d0db1b7c1 兼容时间戳不规范的H265流：#894 ziyue 2021-06-15 12:55:55 +0800
• 98d9dcd009 when link ssl with static library add ld link like this cmake .. -DCMAKE_BUILD_TYPE=Release -DOPENSSL_ROOT_DIR=/usr/local/ssl -DOPENSSL_USE_STATIC_LIBS=TRUE xgj 2021-06-11 11:57:55 +0800
• 5b8b5c0ed5 for ssl static link add ld library link xgj 2021-06-11 11:04:43 +0800
• 24ab876fdb 修复重连时，创建多个mp4解复用器导致内存增长的bug:#895 ziyue 2021-06-10 14:45:26 +0800
• 92f879d703 完善PlayerProxy关闭机制,重试次数超限后自动关闭 ziyue 2021-06-09 15:01:45 +0800
• ad2cd11eec 优化判断h265是否为关键帧的代码 ziyue 2021-06-09 10:18:47 +0800
• ca192a4286 H265 I帧多slice情况下导致花屏问题 baiyfcu 2021-06-09 09:51:28 +0800
• b0af056356 删除过多的日志 ziyue 2021-06-08 21:06:14 +0800
• 55c2b08c57 rtsp播放器在udp情况下超时时间延长4倍(防止vlc超时) ziyue 2021-06-08 20:51:54 +0800
• 98dc9bc78e ssrc切换时间改为3秒:#899 ziyue 2021-06-08 20:05:45 +0800
• 40c1cb239d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-08 17:52:44 +0800
• 6ccf512367 完善内存统计 ziyue 2021-06-08 17:48:52 +0800
• 9c3ec4b4ed 更新zltoolkit,修复Windows下编译问题 ziyue 2021-06-08 17:45:59 +0800
• 868fb6e587 更新zltoolkit,修复RtpServer在tcp模式下崩溃的bug ziyue 2021-06-08 17:33:23 +0800
• 0593f65fcb 完善代码 ziyue 2021-06-08 14:50:12 +0800
• e88281b2ff 删除无效代码 ziyue 2021-06-08 14:49:48 +0800
• 89d0a9dedf 屏蔽动态添加配置文件的特性 ziyue 2021-06-08 14:49:32 +0800
• 9de39de88c Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev ziyue 2021-06-08 14:41:52 +0800
• edf9129f7e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-06-08 14:40:51 +0800
• 511aa2207f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-06-08 14:27:10 +0800
• c4817c6d5f GB28181单端口接收流支持多线程 ziyue 2021-06-08 14:03:25 +0800
• 92736db5b2 适配zltoolkit ziyue 2021-06-08 11:29:32 +0800
• 8721c5a62b for joy4 rtmp push onMetaData compatibility xgj 2021-06-08 10:07:51 +0800
• bb37bce3ac update zlmrtcclient.js xgj 2021-06-07 18:40:47 +0800
• 0f3a8f4a9d fix webrtc to rtmp multi slice on frame error xgj 2021-06-07 17:32:28 +0800
• d74779dc02 set server config can dynamic add config for add multi ffmpeg cmd template xgj 2021-06-04 18:06:40 +0800
• 2ee7f67b5b 修复windows set FD 1024未生效BUG#898 baiyfcu 2021-05-31 16:51:43 +0800
• c3354a3df6 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-05-31 14:18:48 +0800
• 5eb00d5fab 修复windows下获取errno失败导致崩溃的bug:#889 ziyue 2021-05-26 16:26:09 +0800
• 8f62365847 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev ziyue 2021-05-26 10:43:52 +0800
• 3b4e7619ad
  Merge pull request #865 from yapingcat/master 夏楚 2021-05-22 11:04:50 +0800
• f034dbf1fa Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-05-22 10:26:21 +0800
• 9f223bc7a2 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-05-22 10:25:05 +0800
• 975c11b74c 支持http响应无content-length字段的情况:#850 xiongziliang 2021-05-22 10:22:56 +0800
• 7067472a18 转协议支持全局关闭音频:#883 xiongziliang 2021-05-22 10:17:52 +0800
• b7e6bfb574 hook接口在http头中附带vhost:#872 xiongziliang 2021-05-22 09:53:31 +0800
• 7641db4225 getMediaList等接口返回录制状态:#876 xiongziliang 2021-05-22 09:31:59 +0800
• f54e02f511 修复http文件服务器相关bug xiongziliang 2021-05-22 09:28:19 +0800
• 8cbec43ee8 合并代码 xiongziliang 2021-05-22 09:26:49 +0800
• a391d1e289 修复rtsp推流带参相关的bug:#840 xiongziliang 2021-05-22 09:25:24 +0800
• 08d4edddb0 修复http文件服务器相关bug xiongziliang 2021-05-22 09:13:00 +0800
• d74589945a 还原 ziyue 2021-05-19 18:39:23 +0800
• 52146a1afe 测试 cr ziyue 2021-05-17 11:56:34 +0800
• 3c49b3737e fix bug rtcp sr包的 ssrc 和rtp包中的一致 yapingcat 2021-05-17 09:20:03 +0800
• 5b57b9d6ae 确保rtc播放不强引用rtsp直播源 xiongziliang 2021-05-16 22:13:08 +0800
• 44b0e13ba7 完善打印svc tid xiongziliang 2021-05-16 22:12:26 +0800
• c6d2b41d97 完善rtp ext相关处理方法 xiongziliang 2021-05-16 21:49:46 +0800
• 5f05df98b0 添加获取类型方法 xiongziliang 2021-05-16 21:17:55 +0800
• a84bcec4aa 完善rtp ext处理相关逻辑 xiongziliang 2021-05-16 20:56:03 +0800
• bda378c340 完善发送rtx rtp处理 xiongziliang 2021-05-16 18:06:34 +0800
• 7cdd5ed9df 修复rtx包未修改rtp ext id的问题 xiongziliang 2021-05-16 16:59:12 +0800
• d4ff84e447 完善ssrc相关处理 xiongziliang 2021-05-16 16:12:10 +0800
• f6eb84b413 添加ssrc相关方法 xiongziliang 2021-05-16 12:28:50 +0800
• d395d23eeb 由于在RtspSession类确保了函数执行顺序，所以回滚多余代码也能确保单track流迅速注册 xiongziliang 2021-05-15 10:05:47 +0800
• 4cd618899b Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-05-15 10:02:58 +0800
• 259e9dab07 更新ZLToolKit xiongziliang 2021-05-15 09:59:36 +0800
• 125b703ea9 Merge remote-tracking branch 'origin/master' xiongziliang 2021-05-15 09:57:21 +0800
• e807a08f2e 单track rtsp推流加快媒体注册速度 xiongziliang 2021-05-15 09:56:35 +0800
• a7cd4d0719 rtp ext不做内存拷贝 ziyue 2021-05-13 01:29:55 +0800
• 0e968a2d5e 更新ZLToolKit xiongziliang 2021-05-12 23:48:13 +0800
• 5f13335166 关闭丢包测试代码 ziyue 2021-05-12 20:53:37 +0800
• 8fdfc14f6f 整理 nack/rtx/ssrc ziyue 2021-05-12 20:51:51 +0800
• 12be56493e 优化代码 ziyue 2021-05-12 15:40:40 +0800
• cb280e1eeb rtc推流支持nack/rtx重传 xia-chu 2021-05-11 15:48:01 +0800
• 0d61de758e 完善nack与丢包重传2 xia-chu 2021-05-11 12:12:28 +0800
• 5c90a1e137 完善nack与丢包重传 xia-chu 2021-05-11 11:18:55 +0800
• cbafdbabc6 防止拷贝 xia-chu 2021-05-11 09:09:35 +0800
• 7ad361b22d rtc播放支持nack重传 xiongziliang 2021-05-11 00:54:33 +0800
• e8d3dec050 getBitArray方法返回nack第一个包状态 xiongziliang 2021-05-11 00:34:17 +0800
• ec8e518180 完善fci相关代码 xiongziliang 2021-05-10 23:27:11 +0800
• c57f31d3d0 代码优化 xia-chu 2021-05-10 18:14:51 +0800
• a42e5f6470 完善ssrc处理逻辑 xia-chu 2021-05-10 18:11:12 +0800
• d4ce5b0091 添加ssrc相关的方法 xia-chu 2021-05-10 17:35:22 +0800
• 985fe310b6 extmap改回vector存放 xia-chu 2021-05-10 10:14:42 +0800
• 45abc23e87 放宽fci长度校验 xia-chu 2021-05-10 10:14:00 +0800
• 7f917211e4 fix gcc for linux compile error xgj 2021-05-08 22:25:56 +0800
• 783321e74e 关闭调试日志 xiongziliang 2021-05-08 21:47:17 +0800
• d74f2ff155 修复remb和twcc开关相关bug xiongziliang 2021-05-08 21:43:27 +0800
• 60a6d4af0b 拷贝后再修改rtp，防止修改共享数据 xiongziliang 2021-05-08 21:16:51 +0800
• 47dc661bb2 初步兼容simulcast xiongziliang 2021-05-08 20:27:46 +0800
• 826ec33c2c rtx ssrc不强制指定 xiongziliang 2021-05-08 19:45:53 +0800
• 0377796c03 修复clang下编译警告和错误 xiongziliang 2021-05-08 19:33:51 +0800
• e81d91988d 完善sdp对ssrc的处理 xia-chu 2021-05-08 18:39:35 +0800
• 26762b6a6f 添加offer simulcast sdp xia-chu 2021-05-08 15:15:05 +0800
• 16fa359cc5 默认不添加无效的codec plan xia-chu 2021-05-08 15:05:13 +0800
• e84d16213c sdp中添加msid属性 xia-chu 2021-05-08 15:01:30 +0800
• 1403923138 设置rtx ssrc xia-chu 2021-05-08 15:01:14 +0800
• c10296d432 未选中的plan也返回到sdp中 xia-chu 2021-05-08 14:50:19 +0800
• 0d8a3ef790 完善代码 xia-chu 2021-05-08 11:40:18 +0800
• f625b3fbf3 无法处理的rtp ext清空 xia-chu 2021-05-08 11:37:54 +0800
• d5eb486f54 修改rtp的ext id xia-chu 2021-05-08 10:49:09 +0800
• 9f95f743e7 解析rtp ext时不再赋值类型 xia-chu 2021-05-08 10:32:08 +0800
• 5756ed46e0 添加ext调试代码 xia-chu 2021-05-07 18:34:04 +0800
• e9f11a89fd 支持修改ext id xia-chu 2021-05-07 18:33:45 +0800
• cdbd210a10 默认关闭mediasoup的日志 xia-chu 2021-05-07 17:58:10 +0800
• 0b8eb6a76f 完善rtp ext解析代码 xia-chu 2021-05-07 17:47:53 +0800
• f263dd5d9d 优化rtp ext相关代码 xia-chu 2021-05-07 14:56:01 +0800
• c5fff23040 extmap改用map存放 xia-chu 2021-05-07 14:08:43 +0800
• cd96267dc8 extmap相关设置改成枚举 xia-chu 2021-05-07 14:02:03 +0800