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

• 3034f19a66 完善http直播url解析逻辑 ziyue 2021-09-15 15:31:00 +0800
• 704ea59502 修复无人观看主动关闭webrtc推流线程安全的问题 ziyue 2021-09-15 14:56:58 +0800
• 3c4285a056 提高webrtc代码健壮性 ziyue 2021-09-15 11:50:15 +0800
• 869a707c04 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2021-09-14 16:27:50 +0800
• 83ee396405 全局关闭音频时，加快单视频流注册速度 ziyue 2021-09-14 16:27:11 +0800
• 57d30b7797
  Merge pull request #1104 from ZLMediaKit/feature/k8s-build 夏楚 2021-09-14 09:55:27 +0800
• 004c62bea4 添加k8s部署相关说明 monktan 2021-09-13 21:16:22 +0800
• 4c2b323731
  Merge pull request #1102 from ZLMediaKit/xia-chu-patch-1 夏楚 2021-09-13 15:38:02 +0800
• b28d3ad9ae
  Update README.md 夏楚 2021-09-13 15:37:35 +0800
• 8af98817e1 修复低版本sdl,test_player编译问题 ziyue 2021-09-13 10:38:32 +0800
• fec1307a9d 修复连接迁移时，重复创建UdpSession的bug xiongziliang 2021-09-10 22:59:54 +0800
• 684cd21ba1 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2021-09-10 22:40:53 +0800
• d2a0b1e3e6 基本完成webrtc单端口改造 xiongziliang 2021-09-10 22:31:44 +0800
• 7ba44d1ac8 webrtc单端口模式支持线程安全，支持链接迁移 ziyue 2021-09-10 18:37:32 +0800
• e17192d332
  Merge pull request #1093 from Dw9/patch-1 夏楚 2021-09-08 20:17:01 +0800
• e0491bc133
  硬解支持nv12渲染 Dw9 2021-09-08 20:06:28 +0800
• c025b5092d 防止访问空指针 ziyue 2021-09-08 18:06:40 +0800
• 02da99e285 初步实现webrtc单udp端口模式 ziyue 2021-09-08 18:00:55 +0800
• 8352f119f2 修复webrtc MediaTrack对象循环引用导致内存泄露的问题 ziyue 2021-09-07 16:33:57 +0800
• 209d47cf3b 修复webrtc simulcast推流崩溃的bug ziyue 2021-09-07 16:22:34 +0800
• 0fd44f13d9
  Merge pull request #1087 from zqsong/patch-1 夏楚 2021-09-04 09:43:25 +0800
• 23ae6911ab
  Update GB28181Process.cpp zqsong 2021-09-04 09:38:23 +0800
• ad1ae2ac66
  修复ntp时间戳计算精度导致的bug:#1086 夏楚 2021-09-04 09:28:41 +0800
• c2bf2928d0 完善key-value解析代码 ziyue 2021-09-03 18:11:20 +0800
• 246f446142 确保http请求合法 ziyue 2021-09-03 18:02:31 +0800
• 5f2e4ff2c0 修复http文件目录相关bug:#1083 ziyue 2021-09-03 17:58:23 +0800
• 6456ba4bfa
  Update README.md 夏楚 2021-09-03 14:19:43 +0800
• 41f8d7fbd2 修复webrtc模块循环引用导致的内存泄露问题：#1024 ziyue 2021-09-03 11:46:36 +0800
• 08e74256da 修复编译警告 ziyue 2021-09-03 11:45:44 +0800
• 415bc95dda 完善ntp时间戳计算逻辑 ziyue 2021-09-02 21:17:59 +0800
• 72c2df057a 改成异步解码，并修复内存泄露问题 ziyue 2021-09-02 16:35:54 +0800
• 895dc04fcc 修复sdl音频重采样内存越界的bug以及修复重采样爆音bug ziyue 2021-09-02 15:47:08 +0800
• 186c15364a 精简Frame对象实例化相关代码 ziyue 2021-09-02 10:56:21 +0800
• 57e91054af 合并日志相关pr: #1077 ziyue 2021-08-30 20:43:03 +0800
• 7d456a0513 Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit kevin cheng 2021-08-30 19:04:50 +0800
• 5bd169e6de 新增C API 广播日志到上层应用 kevin cheng 2021-08-30 19:03:20 +0800
• b9a699588e Merge remote-tracking branch 'origin/master' ziyue 2021-08-30 18:05:46 +0800
• 04bf829540 非rtsp协议减少一帧延时 ziyue 2021-08-30 18:05:21 +0800
• d2f02c0a0c 修复rtsp sdp解析的bug xiongziliang 2021-08-28 13:02:53 +0800
• 2242577661 优化解析复杂数据结构配置项时的性能 ziyue 2021-08-27 11:05:26 +0800
• e044d5cef9 修复配置文件http虚拟目录名 ziyue 2021-08-26 19:56:19 +0800
• 848774271f 合并并完善http虚拟目录相关代码 ziyue 2021-08-26 19:36:38 +0800
• 03e9c09c42 修复FullUrl()未url转义导致的bug ziyue 2021-08-26 19:10:04 +0800
• 626bf3dcf9 添加http文件服务可挂载物理目录，新增ENABLE_API_STATIC_LIB baiyfcu 2021-08-25 14:30:31 +0800
• 4a063bee43 更新推荐项目与作者列表 ziyue 2021-08-24 12:00:23 +0800
• bb63273c73 计算dts逻辑兼容一些奇怪的rtsp流:#1031 ziyue 2021-08-23 21:48:30 +0800
• 07c5341fb0 兼容一些奇怪的rtsp流:#1031 ziyue 2021-08-23 21:15:19 +0800
• 8b1d1d6e24 修复可能访问空指针的问题 ziyue 2021-08-23 11:00:20 +0800
• b3ad0891e6 修复除0的bug ziyue 2021-08-22 15:13:20 +0800
• 10afab77f3 Merge branch 'feature/keep_alive_monk' of https://gitee.com/xia-chu/ZLMediaKit xiongziliang 2021-08-21 19:11:20 +0800
• 41c09757a7 解决GB28181推流无ntp时间戳导致的问题 xiongziliang 2021-08-21 18:52:52 +0800
• ce41fa268e
  Merge pull request #1053 from johzzy/master 夏楚 2021-08-20 16:03:41 +0800
• a60ce1b1c9 添加serverkeepalive hook接口 monktan 2021-08-20 14:52:48 +0800
• 94a6dc66c9 修复生成rtmp包时间戳错误的问题 ziyue 2021-08-19 19:52:55 +0800
• 6f3f69b459 fix stun packet memory leak. Johnny 2021-08-19 19:14:58 +0800
• 4a7b922dad
  Update YuvDisplayer.h xianghan228 2021-08-19 17:26:45 +0800
• 57d7291a1d
  Update CMakeLists.txt xianghan228 2021-08-19 16:10:01 +0800
• 1cddc2227b 修复h265关键帧判断逻辑bug ziyue 2021-08-18 22:26:24 +0800
• 821b0e4bb6 兼容最后一帧时间戳等于sps pps时间戳的的异常流 ziyue 2021-08-18 22:19:36 +0800
• 1b4f5313f2 修复异步http api相关bug ziyue 2021-08-18 20:37:10 +0800
• 10522e4ea5 完善getOriginUrl接口 ziyue 2021-08-16 17:31:13 +0800
• 232263669c 修复回放速度回调事件user_data指针错误的问题 ziyue 2021-08-16 16:42:09 +0800
• 7885777429
  Merge pull request #1041 from ZLMediaKit/feature/workflow-windows 夏楚 2021-08-16 14:53:56 +0800
• a93bba95c1 更新 Toolkit 统一使用 cmake 查到的 ssl wxf 2021-08-16 11:25:14 +0800
• 870e71d2ce
  Merge pull request #1040 from holychaos/master Xiaofeng Wang 2021-08-14 17:48:10 +0800
• c18c870a1b 添加 MSVC CI wxf 2021-08-14 15:01:24 +0800
• da25ce9b83 修改Nakc.cpp在Windows下编译报错的Bug Xinghua Zhao 2021-08-14 10:42:32 +0800
• 6a32354d8a
  Merge pull request #1035 from ZLMediaKit/feature/coding-style 夏楚 2021-08-13 23:45:04 +0800
• b8aabb5eab
  Merge branch 'master' into master baiyfcu 2021-08-13 16:14:49 +0800
• 1d161bcdc2 修复webrtc srtp相关功能在大端64位系统崩溃的问题 ziyue 2021-08-13 16:07:27 +0800
• 6269ce1f19 添加默认代码风格配置 .clang-format wxf 2021-08-13 13:39:36 +0800
• 8fd9853bc9 完善http断开时日志 ziyue 2021-08-13 10:59:13 +0800
• ec9b8c6471 降低http链接断开日志级别 ziyue 2021-08-13 10:57:04 +0800
• 0f6d1135eb 优化http调试日志性能 ziyue 2021-08-12 21:02:07 +0800
• 7b60f8b093 优化完善代码 ziyue 2021-08-12 20:55:11 +0800
• 4dbe0a1d3e 合并pr：#1025 ziyue 2021-08-12 16:07:31 +0800
• 30b139eaf0 Merge branch 'feature_bafc' of https://github.com/xia-chu/ZLMediaKit ziyue 2021-08-12 11:18:34 +0800
• e3d519dde6 无人观看自动关闭流时才打印日志 ziyue 2021-08-12 10:54:57 +0800
• 094f7553c9 合并pr(rtp最大大小可配置)：#1028 ziyue 2021-08-12 10:43:12 +0800
• 7ed7e5386c rtp包最大大小可配置 monktan 2021-08-11 15:48:15 +0800
• 0ed902509a player增加speed，pause扩展，seek支持秒级定位，MP4按时间戳生成文件 baiyfcu 2021-08-09 18:28:43 +0800
• 9e5d325e43 Merge remote-tracking branch 'origin/master' ziyue 2021-08-05 14:52:05 +0800
• 018fa40946 打印codec信息时,打印url信息 ziyue 2021-08-05 14:49:52 +0800
• d08958acbe
  Merge branch 'ZLMediaKit:master' into master alexliyu7352 2021-08-04 21:08:17 +0800
• d786aed2f3
  Merge pull request #1019 from ZLMediaKit/feature/fix-#1018 夏楚 2021-08-04 17:05:08 +0800
• e03d15053d 调整结构, 清理关系, 取消继承 MP4FileDisk, 改为成员 wxf 2021-08-03 21:48:19 +0800
• f833bfb031 修复编译问题 ziyue 2021-08-02 17:12:59 +0800
• f5842f8c1f 新增读取h264文件转流媒体范例 ziyue 2021-08-02 15:54:51 +0800
• 91f370e925 新增remainData接口 ziyue 2021-08-02 15:53:26 +0800
• acee2fad01 清理不必要的代码和注释 Alex 2021-07-30 16:53:38 +0800
• 6df0ee69e0 修复rtsp aac config兼容性bug: #1011 ziyue 2021-07-30 16:52:13 +0800
• a9a29025ef add http-ts pull Alex 2021-07-29 21:44:44 +0800
• 3c2ee2f101 Merge branch 'master' of https://github.com/alexliyu7352/ZLMediaKit Alex 2021-07-29 21:42:10 +0800
• 4baa265d84 add http-ts pull Alex 2021-07-29 21:41:20 +0800
• 9107dad6bd
  Merge branch 'ZLMediaKit:master' into master alexliyu7352 2021-07-29 21:34:03 +0800
• b952ca0a8c pull Alex 2021-07-29 21:32:46 +0800
• 375d36b4c8 确保rtp丢包时，丢弃gop后续所有帧，防止丢包花屏 ziyue 2021-07-29 16:22:43 +0800
• cafa7043fd 修复bug Alex 2021-07-28 16:28:45 +0800
• 55fc598d4c 修复nack fci相关bug ziyue 2021-07-28 12:20:16 +0800
• 5c52c636a3 完善nack/srtp相关代码 ziyue 2021-07-28 11:18:09 +0800