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

• 8e63b7fefa 完善test_player Dw9 2022-07-18 22:30:28 +0800
• 305722e5d6 docker开启ffmpeg相关功能 ziyue 2022-07-18 16:54:38 +0800
• 44d9d04053 新增代码分析ci ziyue 2022-07-18 16:54:20 +0800
• 5a9c6c7460 linux ci 开启FFmpeg相关功能 ziyue 2022-07-18 16:54:03 +0800
• b19574cea7 防止内存越界 ziyue 2022-07-18 15:41:18 +0800
• d703ec29c6
  Merge pull request #1805 from ZLMediaKit/feature/fix_rtsp_player_pt_error 夏楚 2022-07-18 11:25:16 +0800
• b53ad2cc2d for rtsp sdp pt more check xiongguangjie 2022-07-17 00:30:12 +0800
• 3eaf7897a7 rtsp player trust sdp pt ,ingore other pt compatible hik nvr record xiongguangjie 2022-07-17 00:26:07 +0800
• 7db7d5bec0
  Merge pull request #1803 from custompal/cus_pr xiongguangjie 2022-07-15 21:20:18 +0800
• 1291bf1d21 添加bom头 custompal 2022-07-15 20:01:00 +0800
• d3b37b76bd getMp4RecordFile接口可使用自定义的录像保存根目录来搜索文件 custompal 2022-07-15 19:53:10 +0800
• a0de7577fe Merge branch 'master' into cus_pr 同步代码 custompal 2022-07-15 19:24:44 +0800
• d4ad44c83e 更新zltoolkit ziyue 2022-07-15 11:15:34 +0800
• 6aa1c239b8
  webrtc支持 rtcp xr(#1796) 夏楚 2022-07-15 11:11:30 +0800
• cffc0743d7 format code use clang-format xiongguangjie 2022-07-14 22:49:31 +0800
• 602b475a3c for rtc send can receive rtcp xr, player can calculate rtt , for metaRTC player send rtcp xr xiongguangjie 2022-07-12 19:26:17 +0800
• 14da5ab2d8
  when start send rtp wait key rtp previous drop (#1789) xiongguangjie 2022-07-09 22:30:43 +0800
• 4f7d3d820f
  Merge pull request #1790 from ZLMediaKit/feature/getnameinfo xiongguangjie 2022-07-09 22:24:37 +0800
• 53d580dfab 解决msvc下getnameinfo链接失败问题 xiongziliang 2022-07-09 22:07:45 +0800
• b02816e9e5 完善配置文件'externIP'说明 xiongziliang 2022-07-09 21:48:14 +0800
• 576056c465
  get ip from env, for externIP in file 'config.ini' (#1786) Haibo Chen 2022-07-09 21:44:57 +0800
• b62d0cc1c3 refine 2 xiongziliang 2022-07-09 21:43:14 +0800
• 31426dc29a refine xiongziliang 2022-07-09 21:41:43 +0800
• d855295487 update zltoolkit xiongziliang 2022-07-09 21:35:54 +0800
• 278e5a16bb fix audio not send xiongguangjie 2022-07-09 01:07:30 +0800
• 3ff3755c2d when start send rtp wait key rtp other drop xiongguangjie 2022-07-09 00:45:14 +0800
• 09a8d53150 Merge remote-tracking branch 'origin/master' xiongguangjie 2022-07-07 17:46:37 +0800
• 4108e81d2f avoid multi rtmp player metadata xiongguangjie 2022-07-07 17:44:19 +0800
• c4988e7cfc 修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 ) Dw9 2022-07-07 16:48:35 +0800
• 7b0a36933a
  Merge branch 'ZLMediaKit:master' into master Dw9 2022-07-07 16:47:50 +0800
• 2e1a45895a
  修改webrtc码率带宽约束字段 (#1771, #1768) bin-work 2022-07-07 16:44:42 +0800
• 8d4c9fe634 get ip from env, for externIP in file 'config.ini' 陈海博 2022-07-07 15:42:20 +0800
• 9776d32aae [c api]屏蔽旧版创建track接口 Dw9 2022-07-06 23:24:47 +0800
• 16e791b83c srt use reference value xiongguangjie 2022-07-06 21:40:24 +0800
• 9354b6fbd5 [c api]测试工程使用新版本mk接口 Dw9 2022-07-06 20:13:38 +0800
• b4d28d702e [c api]修改track生成 Dw9 2022-07-06 20:12:25 +0800
• 33654c47b4 js rtc player support play audio and video xiongguangjie 2022-07-04 19:58:51 +0800
• 121b78e5dd 推流器主动断开时，避免开启断流续推功能 xiongziliang 2022-07-02 15:36:32 +0800
• 7a24a22661 完善推流判断逻辑 xiongziliang 2022-07-02 13:13:16 +0800
• 87dd1c7f7f avoid loopback ffmpeg push stream exit receive deleteStream message after broken pipe xiongguangjie 2022-07-02 12:33:32 +0800
• f96da3d166 格式化时遵循 C++ 11 标准 Xiaofeng Wang 2022-07-02 10:14:42 +0800
• 356c9b4cd7 #1768增加视频带宽约束 huzb 2022-07-01 17:10:01 +0800
• 9314a6699b
  兼容ffmpeg4.x (#1758) alexliyu7352 2022-06-29 11:02:43 +0800
• 28350c0d05
  Optimize Decoder inheritance relationship (#1760) CharleyWangHZ 2022-06-29 11:01:16 +0800
• 07982b7243
  静态连接到jemalloc库: #1759 alexliyu7352 2022-06-29 10:59:44 +0800
• 7796aa9bae
  Update TSDecoder.cpp CharleyWangHZ 2022-06-29 10:21:37 +0800
• 49cc430a69
  Update TSDecoder.h CharleyWangHZ 2022-06-29 10:21:01 +0800
• fa899ee4bd
  Update PSDecoder.cpp CharleyWangHZ 2022-06-29 10:20:01 +0800
• 0884dd083e
  Update PSDecoder.h CharleyWangHZ 2022-06-29 10:19:16 +0800
• 198ac1c993
  Update Decoder.cpp CharleyWangHZ 2022-06-29 10:18:23 +0800
• 8c1c045ae9
  Update Decoder.h CharleyWangHZ 2022-06-29 10:17:29 +0800
• e4bcfadd53 cmake文件中新增选项, 是否直接静态连接到jemalloc库 Alex 2022-06-29 00:15:38 +0800
• cbd0d1f82e 兼容ffmpeg4.x Alex 2022-06-28 19:33:58 +0800
• d622481619 fix multi aac frame in one frame result flv.js play audio error xiongguangjie 2022-06-26 00:54:31 +0800
• ea57cb6888 macos -> macOS Xiaofeng Wang 2022-06-25 11:31:30 +0800
• 14ce2448f3 Fix link and add workflow action status Xiaofeng Wang 2022-06-25 11:28:51 +0800
• 1a7df682ff 统一 CI 命名方式 Xiaofeng Wang 2022-06-25 11:25:07 +0800
• 62569db9a2
  Merge pull request #1745 from ZLMediaKit/feature/check-utf8-bom Xiaofeng Wang 2022-06-25 11:05:08 +0800
• cacba11090 Add workflow action to validate BOM Xiaofeng Wang 2022-06-24 23:26:14 +0800
• 37af5462cd Fix condition ... Xiaofeng Wang 2022-06-25 10:53:28 +0800
• 137ca4cf8f Dump diff details Xiaofeng Wang 2022-06-25 10:51:04 +0800
• 2afbe3d998 Remove BOM test Xiaofeng Wang 2022-06-25 10:44:03 +0800
• 75c951fea9 Add workflow action to validate BOM Xiaofeng Wang 2022-06-24 23:26:14 +0800
• 2c4fd9779b Fix check condition Xiaofeng Wang 2022-06-25 10:24:35 +0800
• 7b9fffbe85 Dump output details Xiaofeng Wang 2022-06-25 10:22:49 +0800
• 64cc67e020 Remove BOM of C++ source file Xiaofeng Wang 2022-06-25 10:17:30 +0800
• 3cdfd1373f Remove BOM of C source file Xiaofeng Wang 2022-06-25 10:16:59 +0800
• 7e7a0a3bcf Add workflow action to validate BOM Xiaofeng Wang 2022-06-24 23:26:14 +0800
• b526dacd7c srt media source evnet override getOwnerPoller xiongguangjie 2022-06-24 21:43:02 +0800
• 0916a72db7 fix flow report hook player or pusher judge error xiongguangjie 2022-06-24 16:28:16 +0800
• 266aaf9e0b fix rtsp and rtmp on_flow_report player or pusher judge error xiongguangjie 2022-06-24 09:06:46 +0800
• 9acd1c2b36 修复on_flow_report player状态 baiyfcu 2022-06-23 18:08:21 +0800
• 5162cf6112 more debug info for srt xiongguangjie 2022-06-22 18:41:51 +0800
• dea848610a more detail printf for handshake xiongguangjie 2022-06-22 18:26:37 +0800
• 90874b2b04 dump unsupport handshake xiongguangjie 2022-06-22 18:11:20 +0800
• 70aecffe91
  Update README.md 夏楚 2022-06-22 17:03:57 +0800
• 82f6bfc77a Merge branch 'master' into cus_pr 同步代码 custompal 2022-06-22 11:19:36 +0800
• fde6b436cc 封装rtp server创建和关闭 baiyfcu 2022-06-22 10:31:53 +0800
• 9030547583 同步修复toolkit编译和线程安全问题 baiyfcu 2022-06-21 21:01:00 +0800
• 65a91d1acc
  Update README.md 夏楚 2022-06-20 16:50:12 +0800
• d98f0badbd Merge branch 'master' into cus_pr 同步代码 custompal 2022-06-20 09:40:31 +0800
• 67606050dc 更新docker镜像 xiongziliang 2022-06-19 19:39:48 +0800
• 160b3a67bd Android编译屏蔽openssl xiongziliang 2022-06-19 19:12:43 +0800
• aacd6416ba 修正多线程编程线程数异常相关问题 xiongziliang 2022-06-19 19:01:40 +0800
• 9ab5ea2b36 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-06-19 18:15:58 +0800
• 0eacda5327 新增docker ci并全面整理ci xiongziliang 2022-06-19 15:54:30 +0800
• 9fd0db55c4
  Merge pull request #1730 from Dw9/patch-1 夏楚 2022-06-19 18:14:18 +0800
• 1c5380eead
  Update MP4Recorder.cpp Dw9 2022-06-19 17:27:03 +0800
• ca66858da2 新增Android ci xiongziliang 2022-06-19 14:40:51 +0800
• ea53da64ca 同步代码 custompal 2022-06-19 14:26:47 +0800
• 67305b1f9f Android工程开启openssl相关功能 xiongziliang 2022-06-19 14:09:58 +0800
• a44b770d9d 完善Android工程 xiongziliang 2022-06-19 01:12:14 +0800
• d30869d0c9 支持获取http反向代理真实客户端ip: #1388 xiongziliang 2022-06-18 22:10:46 +0800
• 6291ee704c http文件服务器修复访问安全漏洞 xiongziliang 2022-06-18 21:44:16 +0800
• d5570ad9b3 忽略udp socket的相关错误 xiongziliang 2022-06-18 21:27:07 +0800
• d72af3e61a 兼容不规范的rtsp url: #904 xiongziliang 2022-06-18 21:19:26 +0800
• 53135131a0 更新zltoolkit xiongziliang 2022-06-18 21:10:12 +0800
• 2490fd2115 MS_ASSERT改成抛异常 xiongziliang 2022-06-18 21:09:57 +0800
• ba0eaf26fc 时间戳跳变最大阈值调整为3秒 xiongziliang 2022-06-18 21:08:34 +0800
• b351f4c7e5 优化日志提示 xiongziliang 2022-06-18 21:06:18 +0800