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

#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

#397

#4

#4

#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

• 073700b6bc
  Merge 6119ac9c53 into 6b2fcf7943 imp_rayjay 2024-10-01 13:05:53 +0700
• f1c09a9ac0
  Merge 90bd28249e into 6b2fcf7943 alex 2024-09-29 15:30:14 +0800
• ae90ee6802
  Merge 7141759d78 into 6b2fcf7943 alex 2024-09-29 11:56:24 +0800
• 6b2fcf7943
  Fix the issue where the hls-fmp4 do not flush data in single audio cases (#3935 #3937) master xiongguangjie 2024-09-29 11:55:58 +0800
• 59e2e3bcf3 fix bug hls fmp4 only audio not flush data for issue #3935 xiongguangjie 2024-09-28 14:41:36 +0800
• 7141759d78 Translate comments in srt/Packet.cpp alex 2024-09-28 10:11:54 +0800
• 87277ac91a
  Optimaztion code for srt (#3934) xiongguangjie 2024-09-28 10:11:39 +0800
• ec0aa1eae2 optimaztion code for srt xiongguangjie 2024-09-27 19:12:52 +0800
• 02480ac7f6
  Merge 9de09a4f68 into de7afaf992 johzzy 2024-09-27 11:45:34 +0800
• de7afaf992
  Avoid negative PTS in the RTSP protocol (#3929 #3815) xiongguangjie 2024-09-26 10:59:41 +0800
• faa6c283d7 rtsp audio packet always update timestamp, seq etc xiongguangjie 2024-09-25 19:57:55 +0800
• 72f9557458 optimaztion for issue #3815 ffmpeg rtsp pull stream has negative pts xiongguangjie 2024-09-24 23:31:24 +0800
• aca39bbfaa Support hot-reload of SSL certificates (#2835) xia-chu 2024-09-21 18:15:32 +0800
• 1753cbb81b Add compile options: -Wno-comment xia-chu 2024-09-21 18:14:18 +0800
• 89e21038c2 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2 feature/transcode2 cqm 2024-09-22 11:40:39 +0800
• 26345d0d56 Support hot-reload of SSL certificates (#2835) xia-chu 2024-09-21 18:15:32 +0800
• 95e3913892 Add compile options: -Wno-comment xia-chu 2024-09-21 18:14:18 +0800
• 90bd28249e Translate comments in src/Common/MediaSink.cpp alex 2024-09-21 09:44:57 +0800
• c3106d514a Translate comments in src/Common/MediaSink.cpp alex 2024-09-21 09:26:48 +0800
• f03d414e82 Translate comments in src/Common/MediaSink.cpp alex 2024-09-21 09:26:17 +0800
• f3e2a29cbd
  Fix crashes where iterators may be invalid (#3920) Dw9 2024-09-19 20:16:16 +0800
• 31f5c05d21 update dw9 2024-09-19 20:11:17 +0800
• 4cfb6312f1 修复迭代器可能失效的崩溃 dw9 2024-09-19 19:53:03 +0800
• 4152dcd409
  AI automatically translates all comments in the code into English (#3917) alex 2024-09-19 14:53:50 +0800
• acbbcb5fc9 Update ZLToolKit submodule to the latest version Alex 2024-09-19 13:45:50 +0800
• 19df7422a4
  Merge b77515d217 into 046de691cb vvoidon 2024-09-19 03:18:33 +0800
• cbb3098cf6 Merge branch 'patch-94' into translate-01 Merge all translation branches into one branch Alex 2024-09-19 00:34:32 +0800
• 5016e869b0 fixed src/Common/config.h and ext-codec/H265.cpp Alex 2024-09-19 00:34:05 +0800
• 67dcfa0238 Merge branch 'patch-92' into translate-01 Merge all translation branches into one branch Alex 2024-09-19 00:25:00 +0800
• 046de691cb
  Fix the issue of RTP sorting cache crashing when the sequence is reset (#3915) Dw9 2024-09-18 19:09:14 +0800
• 596531ecf5
  Add golang sdk for mk_api (#3914) PioLing 2024-09-18 17:36:06 +0800
• 45603a94ff Add golang mk sdk PioLing 2024-09-18 17:08:40 +0800
• 9f901d0a0a Add golang mk sdk PioLing 2024-09-18 16:53:28 +0800
• b452ce90b8 修复forceflush队列可能为空的崩溃 weishao 2024-09-18 16:01:12 +0800
• fd63018d7a
  Merge c8fedccd78 into 8f03105baa alex 2024-09-18 13:12:29 +0800
• 8f03105baa
  Fix bug #3894 of rtsp over http (#3903) xiongguangjie 2024-09-17 09:44:22 +0800
• 0a482a6540 Translate comments in ext-codec/H265.h alex 2024-09-17 09:43:54 +0800
• b3aeec24d1 Translate comments in ext-codec/H265.cpp alex 2024-09-17 09:43:51 +0800
• 2cc69d1be6
  Fix H.265 multi-PPS frame compatibility issue (#3902) 夏楚 2024-09-17 09:43:37 +0800
• 0061ef09bd fix bug #3894 of rtsp over http xiongguangjie 2024-09-14 22:11:46 +0800
• cadb17e079 修复h265多pps帧兼容性问题 xia-chu 2024-09-14 21:48:44 +0800
• f1b059323e Translate comments in src/Rtsp/RtpReceiver.h alex 2024-09-14 09:55:08 +0800
• e145282564 Translate comments in src/Rtsp/RtpReceiver.h alex 2024-09-14 09:53:14 +0800
• d85eae0bd0 Translate comments in src/Rtsp/RtpReceiver.h alex 2024-09-14 09:48:40 +0800
• e35a26d203 AI automatically translates all comments in the code into English Alex 2024-09-14 01:16:54 +0800
• c2351ae54d AI automatically translates all comments in the code into English Alex 2024-09-14 00:33:32 +0800
• 7c914666f2
  Fix issue where when RTP timestamp does not change and packet loss occurs, the rtp parser's CommonRtpDecoder never outputs again (#3891) Talus 2024-09-13 17:44:30 +0800
• 9a38e56016
  Merge branch 'ZLMediaKit:master' into master Talus 2024-09-13 16:40:38 +0800
• 2cff9d1c28 修复当RTP时间戳不变化且发生丢包，rtp解析永远不再输出的问题 TalusL 2024-09-13 15:38:36 +0800
• 68c1bbba50 修复当RTP时间戳不变化且发生丢包，rtp解析永远不再输出的问题 TalusL 2024-09-13 15:38:11 +0800
• e2ac6dc176
  Accelerate the ready speed of certain media that actually only have a single video track but the metadata contains an audio track (#3885) Talus 2024-09-13 14:59:46 +0800
• 7ab6ec48e2 测试修改工作流文件 shuang.tang 2024-09-13 14:33:59 +0800
• 112c34a2ef 格式化 TalusL 2024-09-13 14:23:48 +0800
• 23a4f8229b AI automatically translates all comments in the code into English Alex 2024-09-13 11:59:07 +0800
• 6d9631868f AI automatically translates all comments in the code into English Alex 2024-09-13 11:18:24 +0800
• 694d473768 AI automatically translates all comments in the code into English Alex 2024-09-13 10:27:41 +0800
• c5e8008925 AI automatically translates all comments in the code into English Alex 2024-09-13 10:22:50 +0800
• f3d9d4f7cc AI automatically translates all comments in the code into English Alex 2024-09-13 10:09:01 +0800
• 9fe52e1bbd AI automatically translates all comments in the code into English Alex 2024-09-13 09:51:08 +0800
• 9e420f2ebe addFFmpegSource接口增加可选参数ffmpeg_extra_args，用于添加ffmpeg命令中间额外的输入参数、滤镜参数等 shuang.tang 2024-09-12 20:22:04 +0800
• dd88283137 加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度，比如GB28181 PS流 TalusL 2024-09-12 18:29:38 +0800
• 26c4119815 加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度，比如GB28181 PS流 liangzhuohua 2024-09-12 17:27:15 +0800
• 09ff72a099 加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度，比如GB28181 PS流 liangzhuohua 2024-09-12 17:24:54 +0800
• 1c92893889 加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度，比如GB28181 PS流 liangzhuohua 2024-09-12 17:21:43 +0800
• 4e4c617a5b 加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度，比如GB28181 PS流 liangzhuohua 2024-09-12 17:20:49 +0800
• 1b43626b88 加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度，比如GB28181 PS流 liangzhuohua 2024-09-12 17:14:31 +0800
• 7c5ba5a099
  Add pps structure and parsing function (#3875) alex 2024-09-10 10:59:44 +0800
• 13b85c0f68 Add pps structure and parsing function Alex 2024-09-07 23:44:38 +0800
• e322db0a04 兼容seq计数器重置不规范的rtp流 (#3860) 老衲不出家 2024-09-05 15:29:02 +0800
• 6c52f0cdb9 兼容rtp seq计数器重置不规范流, 精简代码 monktan89 2024-09-05 15:26:44 +0800
• 77cdab639a 兼容rtp seq计数器重置不规范流 monktan89 2024-09-05 15:20:16 +0800
• ab22cac85b
  新增兼容whip接口http头的 Authorization 的Bearer令牌 (#3849) PioLing 2024-08-29 10:58:51 +0800
• ef89209396 新增兼容whip接口http头的 Authorization 的Bearer令牌 转成 webhook 的 params的参数（即也支持whip Bearer令牌rtc推流鉴权 PioLing 2024-08-28 17:13:13 +0800
• df9dd3d17a
  修复startSendRtp接口开启收流时vhost设置错误的问题 (#3848) waken 2024-08-28 12:28:01 +0800
• 5857c449fb
  修复vhost没有被记录 waken 2024-08-28 12:02:43 +0800
• c409fc5754
  确保start_send_rtp相关c api线程安全，同时新增多个接口支持指定配置参数 (#3838) Lidaofu 2024-08-22 21:12:06 +0800
• f03d6ca687 feat: 增加recv app stream vhost绑定 lidaofu 2024-08-22 20:37:40 +0800
• b79a3a0097 feat: 增加recv app stream vhost绑定 lidaofu 2024-08-22 20:29:42 +0800
• bd40c24745
  startSendRtp接口支持指定接收流的app和vhost参数 (#3841) wEnchanters 2024-08-22 19:50:29 +0800
• 018ef8e9e9 强制同步发送流和接收流的app和vhost参数 wEnchanters 2024-08-22 13:20:19 +0800
• cb1821cf88
  Fix addStreamProxy retry bug (#3830 #3810 #3837) xiongguangjie 2024-08-22 11:11:04 +0800
• af20e8233b fix the openRtpServer interface app will be empty wEnchanters 2024-08-22 10:39:40 +0800
• 9910930c20 feat: 修复被动tcp发送rtp问题 修改默认tcp send 5s超时设置 增加start_send更多参数配置 lidaofu 2024-08-22 10:01:13 +0800
• 8df7688cd7 fix add stream proxy replay bug for #3830 #3810 xiongguangjie 2024-08-21 22:07:43 +0800
• 270edac284 Merge branch 'master' of https://github.com/lidaofu-hub/ZLMediaKit lidaofu 2024-08-21 11:11:37 +0800
• d329f76edf Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into transcode2 cqm 2024-08-19 17:39:50 +0800
• 6889afbc76
  修复弱网丢包场景下rtp解码器可能不会输出配置帧的问题 (#3818) yujitai 2024-08-14 20:11:24 +0800
• d83ba1d3da rtp解码器遇到sps/pps配置帧要立即输出(此时不受gop_dropped限制) yujitai 2024-08-13 21:10:28 +0800
• c904019d7d 更新ZLToolKit xia-chu 2024-08-10 11:12:42 +0800
• ba1a88f202
  修复ffmpeg5以上默认不合并帧导致解码失败的bug (#3809 #3794) xiongguangjie 2024-08-10 11:09:54 +0800
• 4d8b000198
  player_opencv.c中brg24变量的内存对齐 (#3800) Weng, Qiang 2024-08-10 11:06:33 +0800
• 6750c1b3b4 compatible for ffmpeg 5 above default merge frame fix the issue #3794 xiongguangjie 2024-08-09 22:34:30 +0800
• 57a56c1070
  player_opencv.c中brg24变量的内存对齐 Weng, Qiang 2024-08-08 14:32:47 +0800
• da704ab2f1 更新并适配ZLToolKit xia-chu 2024-08-04 20:46:05 +0800
• 47b8435d7c
  修复addStreamProxy拉流代理同协议下开关问题 (#3779 #3770) xiongguangjie 2024-08-02 21:32:32 +0800
• b0fbd00c6e fix add stream proxy setDirectProxy check option for issue #3770 xiongguangjie 2024-08-01 23:31:32 +0800
• e3cad7f8fa
  支持绑定到指定网卡 (#3760) u7ko4 2024-08-01 11:03:26 +0800
• 564dfa9d90 Merge branch 'master' of https://github.com/lidaofu-hub/ZLMediaKit lidaofu 2024-07-30 15:08:33 +0800
• 0194c7b7f3 更改绑定网卡ip参数，支持热加载 u7ko4 2024-07-30 12:01:57 +0800
• 37b1b7e75a
  Merge b5d073f7f9 into 81aef25583 baiyfcu 2024-07-29 07:05:52 +0000