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

#4050

#4050

#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

• f5f58196b5 修改常量命名 ziyue 2021-10-16 16:58:03 +0800
• 8769ea83a9 修复关闭hls相关功能时编译报错问题 ziyue 2021-10-16 16:56:59 +0800
• 9433a0c383 重写webrtc sdp校验逻辑,确保无有效track时抛异常:#1157 ziyue 2021-10-16 16:46:05 +0800
• b10fc52384 CHECK宏支持自定义错误提示 ziyue 2021-10-16 16:24:40 +0800
• 11eb04f094 修复cpu亲和性设置导致FFmpeg进程不能使用多核cpu的问题:#1149 ziyue 2021-10-16 14:41:00 +0800
• daaf73d390 修复cpu亲和性设置导致FFmpeg进程不能使用多核cpu的问题:#1149 ziyue 2021-10-16 14:40:42 +0800
• d2a9878557 删除多余空行 ziyue 2021-10-16 11:04:28 +0800
• 34365a2f8f 新增webrtc echo test双向会话示例 ziyue 2021-10-16 10:52:28 +0800
• f0e896a5e2 双向会话时，确保收发ssrc一致 ziyue 2021-10-16 10:51:48 +0800
• 85fec6da0b 整理WebRtcSession代码 ziyue 2021-10-16 10:29:00 +0800
• 8c1caeff50 合并pr:#1163 ziyue 2021-10-16 10:25:23 +0800
• 25a1434e00 进一步改善 WebRtcTransportImp 的生命周期逻辑。 Johnny 2021-10-15 18:56:49 +0800
• 722097be05 调整 RtspSession::_push_src类型，统一为 RtspMediaSource::Ptr _push_src; Johnny 2021-10-15 18:23:25 +0800
• efa839c60b 确保完全忽略webrtc客户端不支持的rtp ziyue 2021-10-15 17:37:51 +0800
• 82b78f4544 完善webrtc对象追踪相关日志 ziyue 2021-10-15 17:12:39 +0800
• 7f3f47abbb 提取webrtc推流、播放代码为单独的派生类 ziyue 2021-10-15 16:27:17 +0800
• 8531b5e1cb webrtc codec类型不支持时，设置为inactive类型 ziyue 2021-10-15 16:15:23 +0800
• a408197493 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2021-10-15 14:12:41 +0800
• fe450ba2cb
  支持生成 sdp 时指定端口 (#1161) Xiaofeng Wang 2021-10-15 14:10:04 +0800
• 2a2597a874
  初始化内存 (#1162) Xiaofeng Wang 2021-10-15 14:09:32 +0800
• f47f747b26 初始化内存 wxf 2021-10-15 13:42:19 +0800
• ec4643d812 支持生成 sdp 时指定端口 wxf 2021-10-08 13:20:41 +0800
• 702c505a17 合并pr:#1158 ziyue 2021-10-13 20:28:10 +0800
• 638ef8c731 Refine: 调整 WebRtcSession::getPoller 静态函数为 QueryPollerByBuffer 全局函数，以改善其他 getPoller 同名函数可读性。 Johnny 2021-10-13 18:41:17 +0800
• 22c68a297e 调整 RtcpContext 成员函数 Johnny 2021-10-13 17:57:52 +0800
• f64129177e 调整 RtcpContext 成员变量 Johnny 2021-10-13 15:20:03 +0800
• c98e85caec 增加 RtcpContextForSend/RtcpContextForRecv作为RtcpContext子类 Johnny 2021-10-13 15:06:13 +0800
• 290b3f37a5 新增hook回调抛异常处理逻辑 ziyue 2021-10-14 16:35:06 +0800
• e4cdc5f213 webrtc extmap方向匹配失败时，不添加进sdp ziyue 2021-10-14 16:22:13 +0800
• b2bec61932 webrtc rtp扩展(extmap)支持方向设定 ziyue 2021-10-14 16:18:01 +0800
• aaecd74080 rtc answer sdp存在多个ssrc时，确保最后一个不为空 ziyue 2021-10-14 15:10:55 +0800
• 043c1bab72 回复rtc sdp时,不拷贝ssrc相关信息 ziyue 2021-10-14 14:59:37 +0800
• 76ae292ae7 防呆设计 ziyue 2021-10-13 20:56:22 +0800
• dd81497e5c 修复rtp pts 时间戳回退导致ntp时间戳计算异常的bug:#1152 ziyue 2021-10-13 15:52:12 +0800
• 2ec3b0ccea
  增加 WebRtcTransportManager (#1156) johzzy 2021-10-13 14:15:29 +0800
• b8c10eea9a
  Update WebRtcTransport.cpp 夏楚 2021-10-13 14:13:01 +0800
• 25f52af086 增加 WebRtcTransportManager。 Johnny 2021-10-13 13:43:31 +0800
• acbe99cb43 整理优化webrtc ssrc与simulcast相关代码 ziyue 2021-10-12 21:26:01 +0800
• fbc5378058 合并webrtc相关pr:#1154 ziyue 2021-10-12 17:32:22 +0800
• 2a906ad04a 保留 WebRtcTransport::onCheckSdp 接口。 Johnny 2021-10-12 17:04:21 +0800
• 0f4289a584 Refine(webrtc/sdp): 函数 WebRtcTransport::onCheckSdp() 拆分为WebRtcTransport::onCheckAnswer() 和 RtcSession::checkSdp() Johnny 2021-10-12 15:53:30 +0800
• c7633fb5bb Refine(webrtc/sdp): 移除getSdp(SdpType type)。相较而言，直接使用_offer_sdp 和 _answer_sdp 更好。 Johnny 2021-10-12 15:34:36 +0800
• 712bdf7310 添加utf8 bom头，防止windows下编译不过 ziyue 2021-10-11 17:16:26 +0800
• ae57a00116 Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit update code renqingbin 2021-10-11 09:17:14 +0800
• 440d05512b add new restful api, support continuous play multiple video files renqingbin 2021-10-11 09:17:03 +0800
• 8d85e6cee0 修复linux下编译问题 xiongziliang 2021-10-07 16:12:42 +0800
• 645b9c0791 支持twcc动态调整码率 xiongziliang 2021-10-07 15:53:07 +0800
• 438fd952f2 前移时间戳生成逻辑，防止耗时代码干扰时间戳精度 xiongziliang 2021-10-07 15:49:33 +0800
• 29cc6a94f2 初步实现twcc rtcp发送 xiongziliang 2021-10-07 14:22:12 +0800
• ea1fa03f13 修复twcc fci生成相关bug xiongziliang 2021-10-07 13:07:25 +0800
• 0ae1d46892 基本完成twcc rtcp fci的生成 xiongziliang 2021-10-07 12:28:59 +0800
• e02bc9ce67 修复twcc StatusVecChunk生成相关bug xiongziliang 2021-10-07 12:26:16 +0800
• dbc377a1f9 初步添加twcc rtcp发送逻辑 xiongziliang 2021-10-06 22:17:38 +0800
• fc5b09365e 修复rtp ext解析相关bug xiongziliang 2021-10-06 22:10:54 +0800
• b62bd910a2 修复android下编译问题:#1141 xiongziliang 2021-10-03 19:48:09 +0800
• 15edbeac3e 整理http相关代码 ziyue 2021-09-30 16:10:09 +0800
• a548fcd709
  Feature/dev (#1143) 夏楚 2021-09-30 11:27:42 +0800
• 870dd1e761 完善2 ziyue 2021-09-30 11:27:03 +0800
• 1c92c8833d 完善 ziyue 2021-09-30 11:26:43 +0800
• 3b35b07a44 通过编译 ziyue 2021-09-30 11:23:39 +0800
• 65b0d6e31d 防止每次cmake后导致重复编译 ziyue 2021-09-30 11:16:52 +0800
• a83187d25f
  Merge pull request #1142 from mingyuejingque/master 夏楚 2021-09-29 17:24:08 +0800
• 2bb9003ac5
  修正Release 和 Debug编译选项 明月惊鹊 2021-09-29 17:06:11 +0800
• adc6f652bd
  修复zlm推流FMS,修正zlm的RTMP协议 (#1140) haorui wang 2021-09-29 16:57:19 +0800
• 4b85b85adb
  格式化代码 夏楚 2021-09-29 16:56:13 +0800
• 89ad48fb76
  格式化代码 夏楚 2021-09-29 16:54:09 +0800
• bc721a9be8 修复zlm推流FMS,修正zlm的RTMP协议 haorui 2021-09-29 14:45:05 +0800
• 1292ec6d49 未指定编译类型时,强制为Debug编译 xiongziliang 2021-09-29 01:18:58 +0800
• 4ff206fa42 兼容一些不规范的rtsp sdp: #1128 xiongziliang 2021-09-29 01:16:52 +0800
• 892e151063 响应http head命令后不关闭socket:#1136 xiongziliang 2021-09-29 00:46:09 +0800
• 50c45d7897 删除不必要的文件或代码 xiongziliang 2021-09-29 00:41:39 +0800
• 146fdf48d4 新增作者 xiongziliang 2021-09-29 00:41:10 +0800
• 8d2d1e135c 修改rtsp点播ntp时间戳 xiongziliang 2021-09-29 00:25:34 +0800
• b1666eb651 实现媒体源pause/speed接口:#1129 xiongziliang 2021-09-29 00:04:36 +0800
• 507eadf20b Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2021-09-28 22:49:59 +0800
• 7d1b2583e6 优化代码 xiongziliang 2021-09-28 22:42:13 +0800
• 305d9bc259 完善twcc rtcp包相关代码 xiongziliang 2021-09-25 17:34:12 +0800
• 8b1bccdd00 api增加log日志文件参数设置 cgm 2021-09-28 09:52:29 +0800
• 10c4608630 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2021-09-27 20:14:32 +0800
• c09eb48724 修复udp服务器启动失败时访问空指针的bug ziyue 2021-09-27 20:11:39 +0800
• 16411e1af1
  Merge pull request #1137 from ZLMediaKit/feature/add_mute_audio 夏楚 2021-09-27 16:55:19 +0800
• 3bc0769ccb 完善mk_media接口 ziyue 2021-09-27 14:34:26 +0800
• c493f0da1b 完善添加静音音频相关功能 ziyue 2021-09-27 14:12:11 +0800
• e20718fbde 确保静音音频track不影响后续添加的正常音频track ziyue 2021-09-27 13:27:07 +0800
• afec4b62b9 全局自动添加静音音频 ziyue 2021-09-27 13:20:34 +0800
• e9008afca0 addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口 ziyue 2021-09-27 13:12:53 +0800
• 1f99708548 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2021-09-24 18:09:30 +0800
• 00f01afec7 修复webrtc相关漏洞:#1110 ziyue 2021-09-24 11:29:04 +0800
• 07b0536f72
  Merge pull request #1126 from johzzy/feature/ccache 夏楚 2021-09-22 17:46:57 +0800
• 1d648e9ae5 增加ccache编译加速 Johnny 2021-09-22 15:29:22 +0800
• 03aa9290ab
  Merge pull request #1112 from ZLMediaKit/feature/update_rtcsdkdemo 夏楚 2021-09-17 14:08:00 +0800
• ef213f16a7 warning when access rtc demo when http site and auto get url of site to anti mistake operation xgj 2021-09-17 11:59:01 +0800
• e2cc9ecd92 update zlm rtc sdk demo xgj 2021-09-17 11:20:23 +0800
• 2b3d32f6c6
  Merge pull request #1108 from brokensword2018/fix_warning 夏楚 2021-09-16 17:39:55 +0800
• dcb775c6e8 去除非第三方库的编译告警 hejilin 2021-09-16 16:00:46 +0800
• 0514278ce6 修复webrtc播放不能秒开的问题 ziyue 2021-09-16 10:47:49 +0800
• dfa9001ed1 优化代码 ziyue 2021-09-16 10:05:04 +0800
• 3d64f7253c 优化webrtc性能 ziyue 2021-09-16 10:03:28 +0800
• 0aec2ee1c0 修复WebRtcTransport对象使用时释放导致崩溃的问题 ziyue 2021-09-15 20:41:34 +0800
• 2b5cad97cf 完善webrtc相关对象生命周期管理逻辑 ziyue 2021-09-15 20:08:18 +0800