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

• c59a7a04c3 nack/rtx支持多次重传，提高抗丢包率 ziyue 2021-07-27 20:37:43 +0800
• 83c4a57d0a add http-ts Alex 2021-07-27 19:02:02 +0800
• e4bc271af7 update http-ts Alex 2021-07-27 18:59:10 +0800
• 3840ff2a3f 修复rtt计算逻辑 ziyue 2021-07-27 10:50:34 +0800
• 10eb063f63 rtp时间戳采用pts ziyue 2021-07-27 10:16:35 +0800
• 42ef41cb58 修复rtp时间戳映射机制相关bug: #998 ziyue 2021-07-22 20:31:02 +0800
• 58d5026191 websocket客户端添加获取http连接的接口，方便设置http请求头 ziyue 2021-07-22 15:48:10 +0800
• 0e27704859 修复编译问题 ziyue 2021-07-22 14:59:23 +0800
• 30840d8200 修复nack/rtx发送时相关bug ziyue 2021-07-21 16:44:40 +0800
• da9d3a3b1f 更新ZLToolKit ziyue 2021-07-20 21:29:46 +0800
• a07addfe38 更新zltoolkit ziyue 2021-07-20 20:59:22 +0800
• 2dcc2c34b2 更新ZLToolKit,提升性能 ziyue 2021-07-20 20:53:19 +0800
• 566a49e227 修复getMediaTracks接口相关功能 ziyue 2021-07-20 13:15:57 +0800
• 46722546a6 Merge remote-tracking branch 'origin/master' ziyue 2021-07-20 12:43:28 +0800
• 4b34e58d3c 移除MultiMuxerPrivate对象，修复rtp发送时无sps pps帧的问题 ziyue 2021-07-20 11:51:26 +0800
• 902c25ae67 删除无效代码 ziyue 2021-07-20 11:48:41 +0800
• 09d5fdaf41
  Merge pull request #994 from lawrencehj/master 夏楚 2021-07-19 10:39:45 +0800
• b6ce03b64f 解决Windows下编译出错问题 lawrencehj 2021-07-19 10:31:24 +0800
• f47e1ecd31
  Merge pull request #993 from ZLMediaKit/feature/update-splitter-usage 夏楚 2021-07-18 20:11:59 +0800
• 49f59fb993 Merge branch 'feature/ps-decoder-cache-buffer' of https://github.com/xia-chu/ZLMediaKit xiongziliang 2021-07-18 19:43:12 +0800
• 6dbad3fb59
  Merge pull request #992 from ZLMediaKit/feature/ignore-hik-ps-0xbd 夏楚 2021-07-18 19:40:38 +0800
• a9de3723df
  Merge pull request #990 from ZLMediaKit/feature/packet-sorter-fix-seq 夏楚 2021-07-18 19:39:38 +0800
• f0c5633bfb Http/HttpRequestSplitter: 添加使用注意事项 wxf 2021-07-18 16:38:15 +0800
• 2f82c89278 忽略海康 PS 流中的 0xBD 包 wxf 2021-07-18 17:28:11 +0800
• 9dd602c242 GB28181Process: 不再需要缓存未处理完的 PS/TS 帧 wxf 2021-07-18 15:04:56 +0800
• 5172b846d3 PSDecoder: 缓存未处理完的数据 wxf 2021-07-18 15:02:48 +0800
• b891fc5654 _rtp_sort_cache_map -> _pkt_sort_cache_map, 不依赖于 RTP wxf 2021-07-17 19:58:29 +0800
• ac01dc97af 修正对非 uint16_t 序号的支持 wxf 2021-07-17 19:57:14 +0800
• 892b2d2ef9 修复对象同名导致的bug ziyue 2021-07-16 15:54:43 +0800
• 8548753c28 修正SDES rtcp对象命名 ziyue 2021-07-15 17:38:04 +0800
• c25da5a222 修复H265 vlc帧判断逻辑bug ziyue 2021-07-15 17:36:44 +0800
• bfdb4027bb rtcp: 删除各 SdesItem 的大小对齐 wxf 2021-07-15 10:34:46 +0800
• 8d5f29d94c Merge branch 'feature/find-async-by-session' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-07-15 11:50:10 +0800
• 54dae13177 Merge branch 'feature/extract-test-case-name' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-07-15 11:45:02 +0800
• c8f00cefa0 完善获取flv是否包含音视频相关逻辑 ziyue 2021-07-15 11:29:21 +0800
• ece7186e6c 改为按 Session 查找媒体源以支持 TCP/UDP Session wxf 2021-07-15 11:25:06 +0800
• fe42ea30fc 整理flv复用器 ziyue 2021-07-15 11:16:11 +0800
• e679404701 tests: 调整测试程序名称获取方式 wxf 2021-07-15 10:32:40 +0800
• 0d48275115 更新zltoolkit库，优化打印日志性能 ziyue 2021-07-14 21:41:46 +0800
• b12bd6e7ff 格式化代码 ziyue 2021-07-14 21:41:26 +0800
• 09d7670fdf 收到sender report包前，通过系统时间戳产生ntp时间戳 ziyue 2021-07-14 21:41:13 +0800
• 6ddd420f1c 修复webrtc rtx包计入receiver report统计导致simulcast推流失效的问题 ziyue 2021-07-14 21:39:30 +0800
• 6bc39058ab 加大时间戳跳变容忍度，防止网络抖动时导致音视频不同步 ziyue 2021-07-13 17:30:54 +0800
• 77283f3973 优化ntp时间戳获取性能 ziyue 2021-07-13 10:10:23 +0800
• 1cf79e886b 新增rtp时间戳大幅跳跃处理逻辑 ziyue 2021-07-12 21:39:47 +0800
• 298f6e3864 rtp使用ntp时间戳作为时间戳,用于实现rtsp音视频同步 ziyue 2021-07-12 21:18:22 +0800
• eba3758b30 支持设置、获取线程名 xiongziliang 2021-07-10 23:54:08 +0800
• b9e4350dd2 支持线程帮核 xiongziliang 2021-07-10 22:02:59 +0800
• 99a8154fa5 修复webrtc单track功能异常的问题 xiongziliang 2021-07-10 20:36:32 +0800
• 76d6e68ecc 修复windows下编译问题：#978 xiongziliang 2021-07-10 19:14:53 +0800
• 9a4c179b0d 修复windows下编译问题：#978 xiongziliang 2021-07-10 19:13:54 +0800
• f29c44cc07
  Merge pull request #974 from xyyangkun/master 夏楚 2021-07-09 15:25:26 +0800
• 03f6f4c4c0 fix publish type yangkun 2021-07-09 14:58:58 +0800
• 9217a5dbcd 精简代码 ziyue 2021-07-09 14:04:34 +0800
• 4b0d0efdfb 修复笔误 ziyue 2021-07-09 14:02:25 +0800
• 35d9321b93 整理H264/H265 Frame对象及相关代码 ziyue 2021-07-09 13:38:20 +0800
• 4fb4471647 修复265 rtmp/flv相关bug:#965 ziyue 2021-07-08 17:09:42 +0800
• d62cdd81b8 webrtc不支持的mline设置为inactive ziyue 2021-07-07 17:58:29 +0800
• 4b694ccde8 http-ts直播减少一次内存拷贝 ziyue 2021-07-07 16:15:42 +0800
• 6220db77e8 修复webrtc纯音频推流时不能注册流的bug:#963 ziyue 2021-07-07 14:47:41 +0800
• 039be5444e 修复m3u8中extinf不准的问题：#816 ziyue 2021-07-07 11:51:44 +0800
• 03addaf0b7 由于frame merge时已经过滤无效帧，所以移除多余代码 ziyue 2021-07-07 11:37:22 +0800
• 59131e3b0a 修复ts/ps解析后组帧逻辑bug：#964 ziyue 2021-07-07 11:02:05 +0800
• 8529581031 修复粘帧的问题 Alex 2021-07-07 09:33:21 +0800
• c335fe25f3 加快track ready的速度 Alex 2021-07-07 09:26:40 +0800
• b332a95852
  Merge branch 'ZLMediaKit:master' into master alexliyu7352 2021-07-07 09:17:54 +0800
• 9f9b3a5a64 提高http-ts直播性能：#961 xiongziliang 2021-07-06 23:57:39 +0800
• c393cc7c0e 修复GB28181粘帧导致花屏的问题: #964,#954 xiongziliang 2021-07-06 23:37:04 +0800
• 756b6a4cff Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev xiongziliang 2021-07-06 23:12:52 +0800
• ea39ffe558
  Merge pull request #966 from johzzy/master 夏楚 2021-07-06 23:13:05 +0800
• 986e9511a2 完善rtt相关代码 xiongziliang 2021-07-06 23:09:56 +0800
• 4c296488f1 修复rtcp rr/sr时间戳转换相关问题,计算rtt ziyue 2021-07-06 21:48:51 +0800
• 849a2a0de8 整合rtp ext相关定义. Johnny 2021-07-06 17:54:10 +0800
• 80ca2e8651
  修复某些TS流粘帧问题 alexliyu7352 2021-07-06 16:23:31 +0800
• bf8642d62f 修复笔误：#955 ziyue 2021-07-06 11:16:59 +0800
• 0838db5326 修复tcp server循环引用的问题 ziyue 2021-07-06 10:34:00 +0800
• 4ef1fe2a1f 修复tcp服务器负载均衡机制失效的问题 xiongziliang 2021-07-05 22:33:21 +0800
• 477dd17b5f Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-07-05 21:15:24 +0800
• 4a6c164d83 更新网络框架,解决负载不够均衡的问题 ziyue 2021-07-05 21:14:08 +0800
• 1e4963b8fc 修正 Nack 回环检查 wxf 2021-07-02 15:56:35 +0800
• b9fad1e5f3 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-07-02 14:56:21 +0800
• 77ba24b59c 修改错误代码 ziyue 2021-07-02 14:55:22 +0800
• c97678af0a webrtc播放触发流未找到事件，实现按需生成流 ziyue 2021-07-02 14:50:48 +0800
• c426c702df Fix error: cannot bind packed field to T& wxf 2021-07-01 22:05:47 +0800
• 81c5f5030a 新增作者 ziyue 2021-07-01 11:03:28 +0800
• 1dd88fceaa Merge branch 'master' of https://github.com/lawrencehj/ZLMediaKit ziyue 2021-07-01 11:02:17 +0800
• 1485be266a 查找MediaSource时，app与stream id不能为空 ziyue 2021-07-01 10:56:59 +0800
• f1d89b5297 修正Windows下宏替换编译错误问题 lawrencehj 2021-07-01 10:39:28 +0800
• 09fa6b7aae 精简代码 xiongziliang 2021-06-30 23:35:19 +0800
• c470016316 优化MediaSource遍历性能 xiongziliang 2021-06-30 23:03:27 +0800
• 69c3b24d06 优化遍历MediaSource接口性能 ziyue 2021-06-30 21:06:29 +0800
• 4ec311652a 未找到依赖库时，关闭编译test_player ziyue 2021-06-29 18:37:09 +0800
• ebb7aeef9b 播放器沿用之前名称 ziyue 2021-06-29 18:26:03 +0800
• d8f75aee55 新增作者 ziyue 2021-06-29 18:20:18 +0800
• 11e993d870 修改接口 ziyue 2021-06-29 18:19:05 +0800
• 013109796d 确保线程安全 ziyue 2021-06-29 17:53:26 +0800
• 1b674a6ac2 播放器新增支持音频:#945 ziyue 2021-06-29 17:44:35 +0800
• 66f28f52b4 添加Ptr定义 ziyue 2021-06-29 17:42:32 +0800
• df377fc1f4 修改宏定义，防止频繁重新全量编译 ziyue 2021-06-29 17:41:56 +0800
• 509930ff0a Merge branch 'master' of https://github.com/DoubleX69/ZLMediaKit ziyue 2021-06-29 11:50:24 +0800