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

• 5fadd2665d 非windows平台，才忽略静态库链接顺序 xiongziliang 2021-04-11 11:44:16 +0800
• bbe67e928e Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev xiongziliang 2021-04-11 11:42:45 +0800
• e094a0bcae Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-04-11 11:41:27 +0800
• 65f072a82b Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit xiongziliang 2021-04-11 11:40:22 +0800
• 271b180004 修复流注册事件track和regist字段缺失的bug xiongziliang 2021-04-11 11:39:49 +0800
• 1739980989 Merge remote-tracking branch 'china/dev' into dev xgj 2021-04-11 09:15:22 +0800
• 012f58d27c 添加rtp 调试接口 xiongziliang 2021-04-11 01:15:02 +0800
• 33da2e28ec 修复pt覆盖失败的bug xiongziliang 2021-04-11 01:14:41 +0800
• ebf650cf4f fix static library link order xgj 2021-04-10 22:24:26 +0800
• e495dfca64 修复忽略g711a(pt=0)的bug xiongziliang 2021-04-10 21:58:27 +0800
• 5b7974a522 添加版权信息 xiongziliang 2021-04-09 20:42:36 +0800
• b180ea0609 删除测试代码 xiongziliang 2021-04-09 20:42:05 +0800
• f1c22c478f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-04-09 20:19:59 +0800
• 9b57edff09
  webrtc supported 夏楚 2021-04-09 20:10:57 +0800
• e899064b2a
  添加webrtc相关描述 夏楚 2021-04-09 19:58:40 +0800
• 7378650620 修复windows下获取ssrc失败的bug xia-chu 2021-04-09 12:15:32 +0800
• 38894097ae Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev xia-chu 2021-04-09 10:47:14 +0800
• 67eb75048c
  Update README.md 夏楚 2021-04-08 18:11:21 +0800
• 67e1b1f194 媒体注册hook添加编码等信息 xia-chu 2021-04-08 17:34:13 +0800
• b2afae0e8a 暂时屏蔽一些日志 xiongziliang 2021-04-07 21:02:28 +0800
• 1650f63af5 生成answer sdp失败时，立即销毁对象 xiongziliang 2021-04-07 20:41:17 +0800
• fb9eefca69 完善日志 xiongziliang 2021-04-07 20:40:42 +0800
• 87e1209d0a 修复某些平台下，udp connect后sendto时指定对端地址发送失败的问题 xiongziliang 2021-04-07 20:33:53 +0800
• a22a6bafb7 添加流量统计事件 xia-chu 2021-04-07 18:35:38 +0800
• 0c5fa36e4d rtc推流添加媒体事件相关接口 xia-chu 2021-04-07 18:18:27 +0800
• 155c59e17e 添加rtc类型的推流 xia-chu 2021-04-07 18:17:49 +0800
• b96052d387 完善rtc异常管理 xia-chu 2021-04-07 17:51:06 +0800
• d354c9466c rtc添加对rtcp bye支持 xia-chu 2021-04-07 17:21:59 +0800
• f374f72312 添加rtcp bye相关代码 xia-chu 2021-04-07 16:45:50 +0800
• 79267ae551 比对codec失败时，先关闭profile比对，再关闭codec比对 xiongziliang 2021-04-06 23:47:54 +0800
• b5e6c12ee8 H264 profile比对不区分大小写 xiongziliang 2021-04-06 23:46:45 +0800
• c9a20eda16 profile匹配失败时，优先选择相同编码格式的方案 xiongziliang 2021-04-06 23:22:22 +0800
• 204ef6e204 匹配H264 profile xiongziliang 2021-04-06 23:21:46 +0800
• a42b56ba94 兼容Firefox xiongziliang 2021-04-06 22:51:16 +0800
• b5bf930467 调整cmake ziyue 2021-04-06 18:30:36 +0800
• 9c552128a7 修复sdp中没ssrc时触发的bug ziyue 2021-04-06 18:29:14 +0800
• 8edd093d68 添加bom头 ziyue 2021-04-06 17:23:13 +0800
• 50ca789c0c 预留同时推流拉流的接口 xiongziliang 2021-04-05 11:32:38 +0800
• 606f251311 修复音频相关的bug xiongziliang 2021-04-05 11:07:41 +0800
• ce04a7279c 优化代码 xiongziliang 2021-04-05 00:12:46 +0800
• 3c935e7fdd 优化代码 xiongziliang 2021-04-05 00:06:21 +0800
• 6070654860 rtc播放时，比对采样率等信息 xiongziliang 2021-04-04 23:58:59 +0800
• fe02f2cf1c rtc推流和播放添加事件触发 xiongziliang 2021-04-04 23:20:10 +0800
• 49d8e2f825 http请求最大允许40KB数据 xiongziliang 2021-04-04 23:17:11 +0800
• 09add8d351 修改为捕捉摄像头 xiongziliang 2021-04-04 23:14:42 +0800
• 5f0aeaa32a 区分推流和播放 xiongziliang 2021-04-04 23:13:01 +0800
• f33d3ba175 还原配置文件 xiongziliang 2021-04-04 23:12:35 +0800
• c70721a520 修改rtp pt时，确保不影响其他播放器 xiongziliang 2021-04-04 21:42:11 +0800
• 2abb5078f9 实现rtc转rtsp xiongziliang 2021-04-03 09:34:49 +0800
• 130a06897f 整理并注释代码 xiongziliang 2021-04-03 08:45:18 +0800
• cfda7d8ba6 整理代码并完善rtcp相关功能 xiongziliang 2021-04-03 08:32:20 +0800
• e9c963dc82 添加部分rtcp代码 xiongziliang 2021-04-03 00:04:52 +0800
• a176cb83a8 预留rtcp相关代码 xiongziliang 2021-04-02 23:12:37 +0800
• 8c460bfcff 基本完成rtc转rtsp xiongziliang 2021-04-02 23:01:58 +0800
• dc485c6211 支持根据情况选择是否发生rtp xiongziliang 2021-04-02 21:08:40 +0800
• c42b678cab 完成rtc发送 xiongziliang 2021-04-02 20:35:43 +0800
• 4a62314be9 完善 ziyue 2021-04-02 18:36:33 +0800
• 9a2f2cbf2e 完善rtsp sdp匹配 ziyue 2021-04-02 18:28:01 +0800
• ee072191e0 开始对接rtsp源 ziyue 2021-04-02 17:56:24 +0800
• 7110dc75ae 整理代码 ziyue 2021-04-02 17:08:11 +0800
• 33d2e71368 合并代码，去除冗余代码 ziyue 2021-04-02 16:23:40 +0800
• a328520c9c buf fixed xiongziliang 2021-04-01 22:24:35 +0800
• 2434470fb8 G711强制规格 xiongziliang 2021-04-01 22:20:29 +0800
• d2fec801c9 兼容不规范的rtmp推流器：#764 xiongziliang 2021-04-01 21:56:21 +0800
• 075756c4c6 提升兼容性：#789 xiongziliang 2021-04-01 21:46:02 +0800
• 5539050f06 更新第三方库 xiongziliang 2021-04-01 21:44:10 +0800
• f217467699 Merge remote-tracking branch 'origin/master' xiongziliang 2021-04-01 20:14:44 +0800
• 9a26ba9f8a 修复android下编译问题 xiongziliang 2021-04-01 20:14:07 +0800
• 1978748f2e 接收到rtp包 ziyue 2021-04-01 14:16:42 +0800
• 9ffa5c2135 恢复检查dtls证书 ziyue 2021-04-01 14:07:48 +0800
• 6a95562dca 稍微调整 ziyue 2021-04-01 11:59:35 +0800
• fd23a87cfb answer sdp通过chrome校验 ziyue 2021-04-01 11:42:40 +0800
• 4853a5af48 完善answer代码 ziyue 2021-04-01 11:02:09 +0800
• 83208b0b31 完善 ziyue 2021-04-01 10:35:31 +0800
• 868b379a12 完善answer sdp代码 ziyue 2021-04-01 10:09:50 +0800
• 356a8d1596 实现部分answer代码 ziyue 2021-03-31 18:32:43 +0800
• 7e5cb33395 开始对接js ziyue 2021-03-31 17:15:26 +0800
• 978917b465 添加接口 ziyue 2021-03-30 18:34:17 +0800
• 45b8f83131 删除测试代码 ziyue 2021-03-30 13:53:45 +0800
• e296ebae6e bug fixed ziyue 2021-03-30 13:11:59 +0800
• c6a5471a23 完成sdp转string ziyue 2021-03-30 13:09:02 +0800
• 6d16ae91e6 添加rtc配置类 ziyue 2021-03-30 11:51:39 +0800
• 2065b6fea8 去掉最大枚举定义 ziyue 2021-03-30 11:51:19 +0800
• a7a94f0885 sdp相关的代码移动到主目录 ziyue 2021-03-30 10:59:15 +0800
• a3d0d3b7ad 忽略大小写拼写 ziyue 2021-03-30 09:58:53 +0800
• daef7051ad sdp完整性检查，与忽略大小写拼写 ziyue 2021-03-30 09:53:58 +0800
• a1b2aa9abb 整理与校验 xiongziliang 2021-03-29 23:55:29 +0800
• 87c53dab92 完成sdp的分析 xiongziliang 2021-03-29 23:03:55 +0800
• 62036d0f5d 完善sdp提取 ziyue 2021-03-29 18:31:56 +0800
• 9d2498a694 candidate foundation改为string类型 ziyue 2021-03-29 12:28:47 +0800
• ba06def4d8 开始提取汇总sdp信息 ziyue 2021-03-29 12:00:42 +0800
• b714dfddda 添加辅助方法 ziyue 2021-03-29 11:39:58 +0800
• 2643269581 添加部分对象定义 ziyue 2021-03-29 10:54:18 +0800
• 7726caa7f2 修复bug与编译警告 ziyue 2021-03-29 09:53:54 +0800
• 1228d07ff3 extmap支持方向 xiongziliang 2021-03-29 00:12:20 +0800
• e670099192 完善sdp相关 xiongziliang 2021-03-28 23:52:26 +0800
• 7722564ad8 添加注释 xiongziliang 2021-03-28 23:36:11 +0800
• 6fa385f3a1 sdp 支持ssrc-group属性 xiongziliang 2021-03-28 23:31:21 +0800
• 81f29fea61 基本完成sdp的解析和生成 xiongziliang 2021-03-28 17:32:53 +0800
• f4746d161c 添加sdp自动化解析机制 xiongziliang 2021-03-28 09:49:34 +0800