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

• 4973934f48 some fix codeRATny 2023-05-11 09:57:29 +0700
• 350e262433
  Added support for GCC 13 (#2452) Per-Arne Andersen 2023-05-11 03:58:48 +0200
• c11eb49ce9 fix codeRATny 2023-05-10 14:01:50 +0700
• 03d20e272e Update player constructor, fix setTranslationInfo and small changes codeRATny 2023-05-10 10:54:04 +0700
• c0652a9314 add callback for any connection and disconnection on proxy player, add receiving information about the stream, add ability to change the reconnection time codeRATny 2023-05-10 09:49:28 +0700
• 34b734e1b0 Added support for GCC 13 Per-Arne Andersen 2023-05-09 20:50:42 +0200
• 453ce240ad 添加允许所有跨域请求从配置文件配置 monktan89 2023-05-09 14:44:29 +0800
• 7ef39d1b6f
  修复openRtpServer函数声明不一致问题 (#2445) ljx0305 2023-05-08 15:27:43 +0800
• 2a793c6ac3
  函数参数声明与实现不一致问题 ljx0305 2023-05-08 15:09:13 +0800
• 42ec679497
  Merge pull request #2 from ZLMediaKit/master ljx0305 2023-05-08 14:55:02 +0800
• d4d639d245
  保持头文件中宏声明跟定义相一致 ljx0305 2023-05-08 14:53:05 +0800
• 99eef1c664
  修正openRtpServer函数声明与实现参数不一致问题 ljx0305 2023-05-08 14:51:24 +0800
• b68ad27ebc fixed ffmpeg 6 build error cqm 2023-05-07 20:09:50 +0800
• e97e0d86bd
  修复rtmp多层级url解析异常问题 (#2435) BackT0TheFuture 2023-05-05 17:34:32 +0800
• 1eedd52384 修复rtmp多层级url的问题 #2433 Aven 2023-05-05 16:51:50 +0800
• 75ffbace57 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2 cqm 2023-05-04 12:31:03 +0800
• ffed4b3bb2 format code style for pusher and player xiongguangjie 2023-05-03 21:46:25 +0800
• 7c89c1655f add getProxyPusherInfo and getProxyInfo restful api xiongguangjie 2023-05-03 18:52:11 +0800
• bfec1b1e0e fix typo Johnny 2023-05-02 20:40:40 +0800
• 1dd0c69aa0
  完善英文说明文档 (#2431) alexliyu7352 2023-04-29 09:02:19 +0800
• 85a6430bf8
  Update README_en.md alexliyu7352 2023-04-29 02:00:33 +0800
• 9550fd64e5
  Update README_en.md alexliyu7352 2023-04-29 01:38:28 +0800
• 9a9040ecda
  Merge pull request #2428 from alexliyu7352/patch-56 alexliyu7352 2023-04-28 23:46:22 +0800
• 2708c85d57 修复编译问题 xia-chu 2023-04-28 23:08:59 +0800
• 19c5323633 修复startSendRtp发送mp4文件时崩溃问题：#2429 xia-chu 2023-04-28 23:02:48 +0800
• beb99ee5b5 更新作者列表 xia-chu 2023-04-28 22:45:17 +0800
• ac46f5499e 修复编译错误: #2416 xia-chu 2023-04-28 22:44:57 +0800
• 8c049d4e28 实现whip/whep delete相关功能 xia-chu 2023-04-28 22:06:46 +0800
• d2349f01bd 使用static_pointer_cast优化性能 xia-chu 2023-04-28 22:04:38 +0800
• cdf97e7605 更新zltoolkit,适配最新代码 xia-chu 2023-04-28 22:03:16 +0800
• b3d4188fde 避免服务器端返回content-length=0时,TsPlayer不能正确释放的问题 Alex 2023-04-28 01:33:17 +0800
• 64553797bd h265 rtp pack avoid 1387 size nal fu-a only one end packet and first satrt end not exist try fix #2425 xiongguangjie 2023-04-27 19:54:47 +0800
• c8fedccd78 避免跳过一个正常的ts包 Alex 2023-04-26 09:10:41 +0800
• b8729dc2a5 Merge branch 'master' into dev xiongguangjie 2023-04-24 19:50:47 +0800
• a64383a26b sync media-server to fix #2409 xiongguangjie 2023-04-24 19:49:23 +0800
• 38e05ab8cb
  添加addStreamProxy对非法url异常捕获处理 (#2412) lijin 2023-04-24 14:32:34 +0800
• 7d6358e8cd
  url非法时提前返回 夏楚 2023-04-24 10:49:16 +0800
• 8e375c8aab
  格式化代码 夏楚 2023-04-24 10:48:17 +0800
• 3bf40d9738 增加了异常捕获 确保抛出异常时，原有的代理拉流对象被正常移除 lijin 2023-04-23 23:44:29 +0800
• a37b038af6 docker镜像默认开启trace日志 xia-chu 2023-04-23 14:37:05 +0800
• 41451f6a93 修复不保存日志文件的bug xia-chu 2023-04-23 14:30:41 +0800
• 81d0ba97a1 更新zltoolkit xiongziliang 2023-04-23 00:21:35 +0800
• c8a20f85f6 直接打印SockException类 xiongziliang 2023-04-23 00:10:18 +0800
• de8249592e Session类构造析构跟踪日志统一在底层网络框架打印 xiongziliang 2023-04-22 23:30:22 +0800
• f1037e3767 降低http api debug日志级别为Trace xiongziliang 2023-04-22 23:29:19 +0800
• 38ab3e0df4 添加cpu亲和性设置参数: #2407 xiongziliang 2023-04-22 22:10:35 +0800
• 967fe035ab 日志默认调整为debug级别 xiongziliang 2023-04-22 22:03:30 +0800
• 7a95c87a29 优化代码 xiongziliang 2023-04-22 21:59:26 +0800
• e8a425945d 更新子模块 xiongziliang 2023-04-21 23:14:53 +0800
• b5a0a2e858 新增动态更新rtp server过滤ssrc接口updateRtpServerSSRC(#2390) xiongziliang 2023-04-21 23:08:48 +0800
• c2b8f3e80e 更新zltoolkit,修复Session对象析构时获取ip端口失败的问题 xiongziliang 2023-04-21 22:27:36 +0800
• bb26fead1e rtmp协议metadata设置title字段 xiongziliang 2023-04-21 22:25:06 +0800
• ce16a0a9b6 Fix compile warnings Johnny 2023-04-21 21:12:42 +0800
• 82bc416546 add exchangeSdp Johnny 2023-04-21 20:23:26 +0800
• 5d33e4c9f9 refine: update static_cast in webrtc api Johnny 2023-04-21 19:55:14 +0800
• cb92cd0b89
  修正 iOS 平台编译 Socket_ios.mm 文件找不到问题 (#2404) 朱如洪 2023-04-20 11:04:23 +0800
• fcf4463b60
  修正 iOS 平台编译 Socket_ios.mm 文件找不到问题 朱如洪 2023-04-19 22:25:47 +0800
• 30182701f5 fix vlc can't play mp4 of jpeg #2388 xiongguangjie 2023-04-19 19:40:58 +0800
• fcb0124f29 适配更新zltoolkit,优化增强网络库：#2397 xia-chu 2023-04-19 13:12:39 +0800
• f1438986ad 修复stopSendRtp后无法触发无人观看事件的问题 xia-chu 2023-04-18 10:53:00 +0800
• a93a985ae5 修复静态类型转换错误 xia-chu 2023-04-18 10:38:31 +0800
• 2f075f60ea 修复编译警告，格式化代码 xia-chu 2023-04-18 10:38:12 +0800
• 4bd3fdabfb clang-format列宽调整为160 xia-chu 2023-04-18 10:34:00 +0800
• 9443d68d6c 格式化代码 xia-chu 2023-04-18 10:33:22 +0800
• 43d7479c60 Merge branch 'master' into dev xiongguangjie 2023-04-17 20:02:13 +0800
• f949c6de2a not retry when hook result code is int and !=0 xiongguangjie 2023-04-17 20:01:45 +0800
• 5eee86ade3
  Update README.md 夏楚 2023-04-17 18:09:59 +0800
• 978143c86d
  rtp级联(ps/ts/es)新增支持gop缓存功能 (#2395) Dw9 2023-04-17 12:19:24 +0800
• ff041ad7ad 新增配置文件控制是否提前开启国标级联gop缓存 xia-chu 2023-04-17 12:07:57 +0800
• 90fef000c6 去除rtp从gop开始处发送的逻辑 xia-chu 2023-04-17 11:43:31 +0800
• ee6aa668c1 完善gop起始位定位逻辑 xia-chu 2023-04-17 11:40:01 +0800
• 6251c7e047 接口startSendRtp接口调用时尚未开启gop缓存的问题 xia-chu 2023-04-17 11:13:58 +0800
• 188d6ec103 精简代码，提高线程安全 xia-chu 2023-04-17 10:48:38 +0800
• f612a7b43c 修复崩溃问题 xia-chu 2023-04-17 10:19:06 +0800
• b43bf891a7 优化精简代码 xiongziliang 2023-04-17 00:02:17 +0800
• a9f5ce45ee Merge branch 'rtpsender' of github.com:Dw9/ZLMediaKit xiongziliang 2023-04-16 23:14:19 +0800
• 6841ad3306
  Update README.md 夏楚 2023-04-14 23:07:09 +0800
• bac42b7605 停止推送rtp时webhook通知业务 Dw9 2023-04-14 21:26:43 +0800
• 9f781774fd MultiMediaSourceMuxer支持ringbuffer,保证rtpsender线程安全 Dw9 2023-04-14 21:17:07 +0800
• 32cf985982 fix typo Dw9 2023-04-14 21:10:13 +0800
• 3a6f660619
  新增Assert异常类型，解决国标重复推流不注销问题 (#2393) 王成 2023-04-14 15:10:48 +0800
• a2278a89e9 🎈 perf(异常类型): 新增Assert类型的异常 wangcheng 2023-04-14 11:53:47 +0800
• 24eaaf68fb 初步支持webrtc whip/whep(推拉流)协议 xiongziliang 2023-04-08 21:28:17 +0800
• c090fc3ea0 test_rtp avoid crash when exit xiongguangjie 2023-04-07 23:34:41 +0800
• 749ef33965 use poller input data avoid throw poll check xiongguangjie 2023-04-07 23:09:10 +0800
• 67d8837442 rtp h265 packet like h264 xiongguangjie 2023-04-06 19:54:59 +0800
• 772fccba41 Merge branch 'master' into dev xiongguangjie 2023-04-06 16:41:19 +0800
• 599208dd6a
  修复全局变量构造先后顺序导致启动崩溃的问题 夏楚 2023-04-06 16:16:28 +0800
• 7fcd88d02a
  避免hls拉流时m3u8文件出现问题或直播结束后,无限重试 (#2357) alexliyu7352 2023-04-05 20:36:44 +0800
• edf7961194 优化代码 xiongziliang 2023-04-05 09:56:28 +0800
• 024a12f66f 播放器应该尽快获取pps,sps.所以当识别不出关键帧时应主动插入config帧 Alex 2023-04-04 01:51:13 +0800
• 21691e34e5
  新增知识星球加入方式 夏楚 2023-04-03 14:46:29 +0800
• 35815cbcfe
  Update README.md 夏楚 2023-04-03 14:44:18 +0800
• fb5512bec7
  webrtc页面新增获取在线流列表并直接点击播放功能 (#2359) 明月惊鹊 2023-04-03 10:03:04 +0800
• 668b7b9d05
  www/webrtc/index.html中加入“自动列出已存在的流、支持点击播放”的功能 明月惊鹊 2023-04-03 09:25:44 +0800
• de89c8705b 避免m3u8文件出现问题或直播结束后,无限重试 Alex 2023-04-02 22:15:14 +0800
• 744c1427e8 gcc/clang编译环境下c sdk api导出默认可见 xiongziliang 2023-04-02 20:58:52 +0800
• 8a9d7fc5bf 更新作者列表 xiongziliang 2023-04-02 00:00:01 +0800
• 23f9a42f72 格式化与精简代码 xiongziliang 2023-04-01 23:54:11 +0800
• 384c8677ea startSendRtp接口在发送ps时支持只发送音频: #2217 xiongziliang 2023-04-01 23:48:57 +0800