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

#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

• 0764e48f6c
  兼容安卓平台，to_string模板处理pt值 gongluck 2022-08-18 19:13:22 +0800
• 30984d2076
  mp4录制支持作为观看者参与播放人数统计 (#1880) Dw9 2022-08-16 11:47:24 +0800
• 1307e26e6f 完善mp4 as player相关功能 ziyue 2022-08-16 11:15:19 +0800
• 343f4f0480 Merge branch 'master' of github.com:Dw9/ZLMediaKit ziyue 2022-08-16 10:49:59 +0800
• aafcdcac7b 更新变量和函数名称 Dw9 2022-08-15 21:30:41 +0800
• c19fa29e75 更新zltoolkit，修复绑定ipv6地址可能失败的问题 ziyue 2022-08-15 11:59:09 +0800
• 41224a9afc 更新c api录制相关接口 Dw9 2022-08-14 18:44:35 +0800
• 90b611e217 mp4录制支持作为观看者 Dw9 2022-08-14 16:51:43 +0800
• a1000da71f add get version restful api xiongguangjie 2022-08-12 18:09:44 +0800
• 6382fcb3be 确保on_publish事件回调时线程安全 ziyue 2022-08-11 18:36:17 +0800
• 4e8c56e2be
  使用wepoll iocp模拟epoll api,实现在windows下支持iocp (#1871) 紫耀风 2022-08-11 10:18:16 +0800
• b544dea1f4 格式化代码 ziyaofeng 2022-08-10 18:42:43 +0800
• 8b6d8767d7 wepoll增加平台判断 ziyaofeng 2022-08-10 17:49:22 +0800
• 06259500fd 添加bom头,互斥锁 ziyaofeng 2022-08-10 17:43:21 +0800
• a199d0a45a 增加出错判断 ziyaofeng 2022-08-10 17:08:47 +0800
• 34d2ea8617 增加出错判断 ziyaofeng 2022-08-10 17:06:58 +0800
• 3265df0582 wepoll default off ziyaofeng 2022-08-10 16:53:34 +0800
• 121017db7b add wepoll to support windows iocp ziyaofeng 2022-08-10 16:49:44 +0800
• 4a12d6e727 add wepoll to support windows iocp ziyaofeng 2022-08-10 16:48:07 +0800
• b34db64961 修复非法aac rtp包导致的除0崩溃问题: #1869 ziyue 2022-08-10 10:44:34 +0800
• 795b4dbbd3 修复http文件服务器对特殊字符文件不兼容的bug:#1866 ziyue 2022-08-10 10:37:49 +0800
• 099845b329 FMP4Packet时间戳类型改成64位 ziyue 2022-08-08 17:57:29 +0800
• 35791aac89 优化代码，去除编译警告，修复拼写错误 ziyue 2022-08-08 17:36:07 +0800
• 9c3b8a6a95 时间戳改为64位 ziyue 2022-08-08 17:13:39 +0800
• 143580d780 修复编译警告 ziyue 2022-08-08 15:28:43 +0800
• b42a9e8e84 新增作者 ziyue 2022-08-05 18:11:46 +0800
• 663d167837 格式化代码 ziyue 2022-08-05 17:55:48 +0800
• ba947cb6b5 调整switch case语句缩进 ziyue 2022-08-05 17:42:17 +0800
• f85de2e108 精简复用rtp encoder创建相关代码 ziyue 2022-08-05 17:36:51 +0800
• d3ac296228 调整switch case代码风格 ziyue 2022-08-05 17:23:46 +0800
• fe3f9e3cff 更新zltoolkit ziyue 2022-08-05 16:01:43 +0800
• 7458a67c66 修正deleteRecordDirectory接口拼写错误并精简代码 ziyue 2022-08-05 16:01:31 +0800
• e5f215660a optimization logic CharleyWang 2022-08-05 12:13:19 +0800
• 024c3e1a28
  Merge pull request #1856 from Dw9/master Dw9 2022-08-04 22:29:34 +0800
• 73d2cd4ff7 修复pr1885 删除文件判断逻辑错误 Dw9 2022-08-04 22:00:44 +0800
• db70aec690
  增加webapi deleteRecordDirectroy(删除录像文件夹) (#1851) dreamisdream 2022-08-04 10:15:07 +0800
• 1491770dba 生成的文件放到当前模块的目录下 Xiaofeng Wang 2022-08-03 22:27:54 +0800
• df464f4f07
  Update WebApi.cpp 夏楚 2022-08-03 21:01:44 +0800
• f1bc4665f7
  Update WebApi.cpp 夏楚 2022-08-03 21:00:33 +0800
• 5e317b1914
  API目录支持安卓编译，输出libmk_api.a (#1854) 明月惊鹊 2022-08-03 20:57:16 +0800
• dd64b314d8
  update ndk version 夏楚 2022-08-03 20:22:11 +0800
• e3812180ed API目录支持安卓编译，输出libmk_api.a[参考 wasphin大佬的指导改进了一些地方] mingyuejingque 2022-08-03 12:37:00 +0800
• 3dcdad887c API目录支持安卓编译，输出libmk_api.a mingyuejingque 2022-08-03 09:30:32 +0800
• ec3fe4350a 修复开启时间戳覆盖后崩溃的bug: #1848 ziyue 2022-08-02 11:06:33 +0800
• 5aea072403 调整frame std::move顺序 weishao 2022-08-02 11:04:30 +0800
• 71f3e29cf6 增加webapi deleteRecordDirectroy(删除录像文件夹) 赵恺亮 2022-08-02 09:42:50 +0800
• 70c7a7aa57 依赖 ZLMediaKit 的模块需要继承宏定义以及依赖 Xiaofeng Wang 2022-08-01 17:48:11 +0800
• 32a6126a4b 修正docker编译问题 ziyue 2022-08-01 17:33:58 +0800
• 2bd52fa93d 隐藏c sdk中webrtc相关代码 ziyue 2022-08-01 17:27:34 +0800
• 3aa21389cc 删除Android openssl库 ziyue 2022-08-01 17:22:53 +0800
• 13dd8c699b 整理cmake ziyue 2022-08-01 16:12:52 +0800
• 98f158bf31 修正 OpenSSL 未开启问题 Xiaofeng Wang 2022-08-01 12:28:16 +0800
• 4c52dc9c9c 修复ZLToolKit开启openssl以及mysql失败问题 custompal 2022-08-01 12:03:34 +0800
• 316301e910 确保rtsp直接拉流代理支持GOP缓存: #1843 ziyue 2022-08-01 11:34:47 +0800
• 25e9cd07db 避免其他模块查找过程污染基础环境 Xiaofeng Wang 2022-07-30 11:26:48 +0800
• d9d33b8522
  Merge pull request #1842 from wasphin/feature/apple-m1 Xiaofeng Wang 2022-07-29 19:59:07 +0800
• be3cc33800 Fix build on apple M1 Xiaofeng Wang 2022-07-29 19:37:51 +0800
• bdd83cf61a cpp测试程序添加必要编译宏 ziyue 2022-07-29 18:14:10 +0800
• afcf247464 完善mpegts/ps容器对aac音频的兼容: #1801 ziyue 2022-07-29 18:05:16 +0800
• ace989d378 完善rtp server日志打印 ziyue 2022-07-29 17:57:52 +0800
• 24db0454a8 不支持的协议直接抛异常, 防止非法推拉流：#1725 ziyue 2022-07-29 17:31:55 +0800
• 54f400a6e9 确保MediaServer主函数可以多次调用: #1838 ziyue 2022-07-29 16:23:35 +0800
• 3cb0f66093 修复Android ci编译问题 ziyue 2022-07-29 15:55:16 +0800
• fbe6f8e09d 修改录像文件名 taojun01 2022-07-29 15:54:00 +0800
• 5babe63cdb 修复Windows编译问题 ziyue 2022-07-29 14:19:16 +0800
• 7d8b212a3c 修复rtmp汇报窗口太小导致循环递归的bug：#1839 ziyue 2022-07-29 12:02:00 +0800
• 9ea98642c1
  Merge pull request #1837 from wasphin/feature/cmake-fix-sctp Xiaofeng Wang 2022-07-29 08:05:14 +0800
• b1ccbcc4ae Linux CI 中开启 SCTP Xiaofeng Wang 2022-07-28 23:18:23 +0800
• c14a777598 修正启用 SCTP 后编译问题 Xiaofeng Wang 2022-07-28 23:15:22 +0800
• d0f0c69f93
  Merge pull request #1836 from CharleyWangHZ/master 夏楚 2022-07-28 19:57:16 +0800
• 2685f3cdc2
  Update MediaSource.h CharleyWangHZ 2022-07-28 16:43:03 +0800
• 3fbe461fda
  Merge branch 'ZLMediaKit:master' into master CharleyWangHZ 2022-07-28 15:49:19 +0800
• cf2c7f7886
  Update MediaSource.h CharleyWangHZ 2022-07-28 15:47:23 +0800
• 76df34de81
  Merge pull request #1825 from wasphin/feature/cmake 夏楚 2022-07-28 14:27:44 +0800
• 6fd207118a
  Merge pull request #1829 from dcan123/master 夏楚 2022-07-28 14:17:18 +0800
• a3e00a7f27
  Merge branch 'ZLMediaKit:master' into master CharleyWangHZ 2022-07-28 13:19:55 +0800
• 8cb73e1bc3 修正 Windows 编译问题 Xiaofeng Wang 2022-07-28 00:25:50 +0800
• 23e0abde04 Update RtpProcess.cpp dingcan 2022-07-27 14:13:54 +0800
• 0a678661e3 Update RtpProcess.cpp dingcan 2022-07-27 10:02:15 +0800
• 532932fd2d Update RtpProcess.h dingcan 2022-07-26 14:44:32 +0800
• b8d17565d7 修改代码格式 dingcan 2022-07-26 14:42:42 +0800
• 310b60276c cmake: try to disable compile warning of C4819 Xiaofeng Wang 2022-07-26 13:24:22 +0800
• 8f679831bc camke: fix server compile definitions Xiaofeng Wang 2022-07-26 13:23:58 +0800
• a35134a5ca cmake: fix version.h path Xiaofeng Wang 2022-07-26 13:09:25 +0800
• c1b4ccd041 Update RtpProcess.cpp dingcan 2022-07-26 11:57:09 +0800
• ed6c80cf07 新增rtp udp收流增加丢包率 dingcan 2022-07-26 11:21:19 +0800
• 0fb0cc29e5 设置依赖以便推导编译依赖 Xiaofeng Wang 2022-07-26 00:17:59 +0800
• ac378eaaf1 使用统一的编译参数 Xiaofeng Wang 2022-07-26 00:11:31 +0800
• 0fc38bbadb 避免对外传递 srtp 依赖 Xiaofeng Wang 2022-07-26 00:04:03 +0800
• 388bf71813 Fix finding mmsghdr Xiaofeng Wang 2022-07-25 23:49:38 +0800
• 0b33769ee9 cmake: 库列表名称变更 Xiaofeng Wang 2022-07-25 13:54:24 +0800
• d850846612 cmake: 检查 target 来确认功能是否已启用 Xiaofeng Wang 2022-07-25 13:52:20 +0800
• e7cb05d3b4
  Merge pull request #1822 from Dw9/master 夏楚 2022-07-25 10:33:29 +0800
• 9d3ead61de 整理 CMakeLists.txt Xiaofeng Wang 2022-07-25 00:22:30 +0800
• 8192b37cd4 修正 ENABLE_RTPPROXY 的处理 Xiaofeng Wang 2022-07-24 22:30:59 +0800
• 40099df3c0 c api支持从mp4推送rtp Dw9 2022-07-24 08:51:11 +0800
• 0f47abd3ac 更新zltoolkit ziyue 2022-07-22 16:25:29 +0800
• ec7fe5cc9a 整理frame相关代码，完善FrameStamp重载函数 ziyue 2022-07-22 16:20:47 +0800
• 6514b4f7f2 录像文件名修改 taojun01 2022-07-19 16:55:20 +0800
• 7b3968d949
  Merge pull request #1809 from Dw9/master 夏楚 2022-07-19 11:15:41 +0800