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

• f8f61660f8 完成多track改造 xia-chu 2023-12-09 18:07:33 +0800
• 7735e6c9e3 MultiMediaSourceMuxer支持多track xia-chu 2023-12-09 17:43:29 +0800
• 3ca6b17718 确保Track Index不丢失 xia-chu 2023-12-09 17:36:43 +0800
• edb9dd3045 srt去除相对时间戳逻辑 xia-chu 2023-12-09 17:30:41 +0800
• 878a442b94 统一命名 xia-chu 2023-12-09 17:24:17 +0800
• 92589f4cda mpeg/ts打包支持多track xia-chu 2023-12-09 17:22:02 +0800
• 5b95cd1f5a MP4录制支持多track xia-chu 2023-12-09 17:13:04 +0800
• db86e4a76c MP4解复用支持多track xia-chu 2023-12-09 16:52:49 +0800
• e3a01a580a ps/ts解析支持多track xia-chu 2023-12-09 16:48:21 +0800
• bbe8f4a018
  release 8.0 夏楚 2023-12-09 16:23:51 +0800
• 6bfc32270a 添加配置文件说明 xia-chu 2023-12-09 16:22:40 +0800
• b49b9c86f6 add bom xia-chu 2023-12-09 16:03:21 +0800
• f9505251ee c sdk与codec解耦 xia-chu 2023-12-09 15:45:04 +0800
• 16fb117102 整理协议 xia-chu 2023-12-09 15:17:41 +0800
• 2ac54248f4 release 8.0 xia-chu 2023-12-09 14:51:22 +0800
• 6c4d04cae7 回退配置文件 xia-chu 2023-12-09 14:50:53 +0800
• b80601e020 修复 mpeg extra data相关bug xia-chu 2023-12-09 14:49:53 +0800
• 02b296c85c add bom xia-chu 2023-12-09 09:52:18 +0800
• ca83987f14 Fix buf xia-chu 2023-12-09 09:42:26 +0800
• e461cfd882 精简代码2 xia-chu 2023-12-09 09:34:59 +0800
• 630b5d75d9 精简代码 xia-chu 2023-12-09 03:18:57 +0800
• 7d4a930162 解耦代码 xia-chu 2023-12-09 02:07:43 +0800
• fbe159db0e 重构代码 xia-chu 2023-12-08 21:45:24 +0800
• 44c82752b3
  修正回环时计算前后包距错误 (#3089) 7.0 ljx0305 2023-12-07 22:05:42 +0800
• d21bdc35c9
  修复addstreamproxy拉流瞬间超时的问题 (#3093) Dw9 2023-12-07 22:05:20 +0800
• af1c916ed9 修复addstreamproxy拉流瞬间超时的问题 Dw9 2023-12-07 18:01:54 +0800
• 74b964dd59
  修正回环时计算前后包距错误 ljx0305 2023-12-07 10:18:17 +0800
• 8682a655d7
  Update README.md (#3075) luna 2023-12-05 01:58:45 +0800
• 6ff5556b71 优化平滑发送逻辑，解决时间戳跳变导致发送不平滑问题 xiongziliang 2023-12-04 23:18:02 +0800
• a0c4569475
  Update README_en.md luna 2023-12-04 20:25:21 +0800
• cbbd575ec6 update: 使用双循环队列作为缓冲 KkemChen 2023-12-04 11:58:56 +0800
• 37c92d8077
  Update README.md luna 2023-12-03 12:47:16 +0800
• 22732ea3f4 确保deleteRecordDirectory接口忽略正在录制的mp4文件 (#3032) xiongziliang 2023-12-02 21:12:26 +0800
• 527d9b9e64 优化http目录索引相关代码 xiongziliang 2023-12-02 20:56:39 +0800
• fd52470fc9 修复http文件服务器未设置charset的bug xiongziliang 2023-12-02 20:55:53 +0800
• a3a563ed41 修复http虚拟目录相关bug xiongziliang 2023-12-02 20:54:34 +0800
• 3137b95406 修复hls快速重连时，延迟删除文件夹相关bug (#3039) xiongziliang 2023-12-02 19:51:44 +0800
• c12a6f0aed 适配ZLToolKit xiongziliang 2023-12-02 19:49:28 +0800
• d555f6038a http文件索引改用英文 xiongziliang 2023-12-02 16:43:06 +0800
• 76aebd74c6
  整理MediaSource协议类型 夏楚 2023-12-02 16:31:40 +0800
• 8dde0f2069 整理MediaSource协议类型 xiongziliang 2023-12-02 16:30:39 +0800
• 10c2197e76
  新增downloadFile接口，支持下载限定目录下任意文件 (#3073) 夏楚 2023-12-02 15:58:40 +0800
• 51f0411827 限制downloadFile接口可访问区域 xiongziliang 2023-12-02 15:53:00 +0800
• e1f199c986 deleteRecordDirectory接口忽略正在录制的mp4文件 (#3032) xiongziliang 2023-12-02 15:22:16 +0800
• 10663fd3b4 删除无效的hook api xiongziliang 2023-12-02 15:04:02 +0800
• 380887c5d3 http api回复改成英文 xiongziliang 2023-12-02 15:02:00 +0800
• a47c5d2ec0 http api不区分大小写 xiongziliang 2023-12-02 14:56:59 +0800
• e2321354f7 更新作者列表 xiongziliang 2023-12-02 14:11:54 +0800
• 23b785b263 修复编译警告问题 xiongziliang 2023-12-02 10:22:45 +0800
• 21c03f772f
  新增平滑发送逻辑 (#3072) 夏楚 2023-12-02 10:20:06 +0800
• 09b2a4d9f5 完善平滑发送机制 xiongziliang 2023-12-02 10:13:17 +0800
• 0d28edb424 Merge branch 'feature/paced_sender' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2023-12-02 09:35:32 +0800
• 8420dc8057 新增downloadFile接口，支持下载任意文件 (#3069) xia-chu 2023-12-01 22:04:02 +0800
• 00e6ca3f79
  还原之前的自动化集成 (#3071) alexliyu7352 2023-12-01 20:20:42 +0800
• 30a680736f
  还原之前的自动化集成 alexliyu7352 2023-12-01 20:05:07 +0800
• 4648c156c8
  优化hls播放器,使用持久化连接 (#3070) alexliyu7352 2023-12-01 17:56:08 +0800
• 2c1be7df63 优化持久化连接 Alex 2023-12-01 17:38:37 +0800
• c119623b52
  Merge branch 'ZLMediaKit:master' into patch-72 alexliyu7352 2023-12-01 17:09:37 +0800
• 1e029a6a5c update openapi.json alexliyu7352 2023-12-01 07:57:05 +0000
• 50281513d9
  hls播放器优化 (#3064) alexliyu7352 2023-12-01 14:43:35 +0800
• c379bbab82
  Merge branch 'master' into patch-72 夏楚 2023-12-01 14:35:53 +0800
• 86029d08af
  addStreamProxy支持透传参数并设置MediaPlayer (#3063) alexliyu7352 2023-12-01 14:33:07 +0800
• c49343bcf5 放弃自动生成openapi, 这样会产生一些问题. Alex 2023-12-01 14:23:54 +0800
• ed454861d7 update openapi.json alexliyu7352 2023-12-01 06:15:54 +0000
• dd5486fba9 放弃自动生成openapi, 这样会产生一些问题. Alex 2023-12-01 13:59:12 +0800
• af65c1c582 完善hls播放器持久化连接相关处理 Alex 2023-12-01 13:44:01 +0800
• c42a11b2b4
  Merge branch 'ZLMediaKit:master' into master alexliyu7352 2023-12-01 12:15:04 +0800
• 792e59925c 1. 连续切片下载失败后关闭播放器, 这种适用于源端服务器出现故障导致m3u8索引正常,但切片文件不正常时,尽快的能关闭播放器并通过web hook上报业务系统,而不是仍旧不停的拉取ts切片2. Alex 2023-12-01 12:05:15 +0800
• 57fcb2e429 完善http proxy Alex 2023-12-01 11:33:38 +0800
• a8e2d602cb
  RTC: 修复TWCC feedback rtcp解析status chunk错误的问题 (#3059) yujitai 2023-12-01 10:45:24 +0800
• 586bb73912
  兼容webrtc offer sdp中重复行的情况 (#3038) LeiZhi.Mai 2023-12-01 10:44:59 +0800
• b1fa9e3000 RtcSsrc解析时重复插入返回失败说明对象重复 blueskiner 2023-12-01 09:46:13 +0800
• b3441f800a update openapi.json alexliyu7352 2023-11-30 14:08:35 +0000
• 57395d8c99 RTC: 修复TWCC feedback rtcp解析status chunk错误的问题 于吉太 2023-11-30 20:28:22 +0800
• 72b239c002 update: 开启ENABLE_FFMPEG和ENABLE_X264 KkemChen 2023-11-30 18:59:44 +0800
• 644a333ec3
  通过持续集成自动生成openapi相关文件 (#3042) alexliyu7352 2023-11-30 17:58:28 +0800
• 34695ab1b8
  兼容旷世智能分析系统RTSP拉流客户端相关Bug (#3045) JiaHao 2023-11-30 17:53:47 +0800
• 1cbfcd96e2
  新增hls快速注册相关配置，提高hls打开速度 (#3024) zjx94 2023-11-30 17:47:22 +0800
• e893e7d2fd firstTSOneGOP修改为fastRegister zjx94 2023-11-30 15:43:56 +0800
• b275b09598
  Update linux.yml alexliyu7352 2023-11-30 14:04:33 +0800
• 1b67fea2a2
  Update linux.yml alexliyu7352 2023-11-30 12:58:35 +0800
• 4100ed635d
  兼容旷世智能分析系统RTSP拉流兼容性问题 Nashira 2023-11-29 18:17:22 +0800
• 3abdfff5f7 IDE忘记指定项目下的clang-format了, 重新格式化代码 Alex 2023-11-30 11:25:28 +0800
• f5d78c7fb1 Merge branch 'master' into dev xiongguangjie 2023-11-30 10:31:52 +0800
• 8e1470777e 1. 配合zltoolkit自定义socket缓冲区大小.2. 修复http keepalive引发的bug Alex 2023-11-29 18:03:28 +0800
• 1136bf4a00
  完善相对时间戳逻辑, 完善同步机制, 解决相对时间戳不同步的问题 Nashira 2023-11-29 15:48:37 +0800
• f2f59e45c1
  兼容旷世智能分析系统RTSP拉流兼容性问题 Nashira 2023-11-29 14:58:00 +0800
• 2e4c3ff2ef update: 1.添加不同帧率视频通过复用上一帧或丢帧来统一帧率 2.将存储参数的vector展平为一维 KkemChen 2023-11-29 14:36:42 +0800
• ce707235a9 test Alex 2023-11-29 14:31:13 +0800
• 54bb61a8de auto generate openapi Alex 2023-11-29 14:13:56 +0800
• ded80544af auto generate openapi Alex 2023-11-29 14:04:47 +0800
• 3a9613979a auto generate openapi Alex 2023-11-29 13:53:17 +0800
• 018f9c2e3b auto generate openapi Alex 2023-11-29 13:42:50 +0800
• 320ed63c69 auto generate openapi Alex 2023-11-29 13:17:08 +0800
• 721492be9d 兼容重复ssrc的情况 LeiZhi.Mai 2023-11-28 17:56:10 +0800
• 278418a3ea cmake最小版本为3.5 Waken 2023-11-28 10:46:52 +0800
• 6f834863ed
  Merge branch 'ZLMediaKit:master' into master waken 2023-11-28 10:45:06 +0800
• e81ff307c7 防止发送时间戳都为0的sr rtcp包 xia-chu 2023-11-25 21:43:16 +0800
• 0f4e0e1076 完善相对时间戳逻辑, 完善同步机制, 解决相对时间戳不同步的问题 xia-chu 2023-11-25 10:43:51 +0800
• 0716f02b1d 防止发送时间戳都为0的sr rtcp包 xia-chu 2023-11-25 21:43:16 +0800