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

• b35d41b4b7
  Merge pull request #1969 from wasphin/feature/fix-link-flags Xiaofeng Wang 2022-09-20 11:05:57 +0800
• ec1942fa81 srt connection transfer support xiongguangjie 2022-09-20 00:39:42 +0800
• 0c882d4d79 cmake: fix include directory for assert.h Xiaofeng Wang 2022-09-19 21:15:20 +0800
• 11dfcf3bdb cmake: -Wl linking flags Xiaofeng Wang 2022-09-19 21:02:51 +0800
• c282775205 cmake: fix linking asan Xiaofeng Wang 2022-09-19 21:00:48 +0800
• 94d0505ea6 增加通过offer获取answer的接口，不依赖http模块 gongluck 2022-09-19 10:46:06 +0800
• b77c19c969 更新ssl证书 ziyue 2022-09-18 21:13:01 +0800
• 0b355759de 整理webrtc相关代码命名空间 ziyue 2022-09-18 21:03:05 +0800
• 15affeff1d 优化关闭媒体源相关逻辑: #1963 ziyue 2022-09-18 20:36:47 +0800
• daafe62f35 更新功能一览图 xiongziliang 2022-09-17 23:27:42 +0800
• 99b8be9051 更新第三方库，兼容大华某些设备国标流 xiongziliang 2022-09-17 09:58:52 +0800
• 12551be33c 提炼ProtocolOption赋值相关逻辑 xiongziliang 2022-09-16 23:30:55 +0800
• 0e4c3276dc
  add arm64 docker image 夏楚 2022-09-14 14:39:37 +0800
• c094751f17
  Merge pull request #1958 from amani-lei/patch-1 老衲不出家 2022-09-14 11:06:04 +0800
• c552d8c1bf
  使用docker buildx, 用于支持跨平台build He Lei 2022-09-14 10:08:18 +0800
• 08789454c3
  rtsp支持指定播放单一track (#1937) custompal 2022-09-13 16:27:00 +0800
• 01a0c4e2c5
  Update RtspSession.cpp 夏楚 2022-09-13 16:09:39 +0800
• d04a6d4355 rtc receive sr reset alive ticker xiongguangjie 2022-09-09 23:04:28 +0800
• 6977de6a42 优化rtp发送逻辑 custompal 2022-09-09 22:13:11 +0800
• 098bd319ab
  Android ci fixed (#1952) 夏楚 2022-09-09 18:06:18 +0800
• e3c367f463 Merge branch 'master' into cus_pr custompal 2022-09-09 18:02:00 +0800
• 234ccdb5a7
  Update build.gradle 夏楚 2022-09-09 17:58:20 +0800
• 4e92753fd2
  Update build.gradle 夏楚 2022-09-09 17:52:18 +0800
• 1e67d0ee49
  Update build.gradle 夏楚 2022-09-09 17:49:30 +0800
• f0c9d224b2 update ndkversion for ci cqm 2022-09-09 16:11:53 +0800
• 4a35ddbddb
  Merge pull request #1942 from mtdxc/reduce_code 夏楚 2022-09-09 11:10:55 +0800
• 97320a264d
  修复c sdk获取视频帧flags信息不对的问题 (#1947) Mr. shengge 2022-09-09 11:05:42 +0800
• f15b6c4380
  Merge branch 'ZLMediaKit:master' into master Mr. shengge 2022-09-09 11:04:59 +0800
• 0187bf93f5
  异或操作改成或操作 夏楚 2022-09-09 11:03:51 +0800
• d853075175
  RtpServer新增tcp主动模式支持 (#1938) custompal 2022-09-09 10:56:28 +0800
• 258a4dd166
  C API和WebHook未找到流回调添加直接关闭机制 (#1948) huangxiuqi 2022-09-09 10:55:35 +0800
• 0481f09f9b C API和WebHook未找到流回调添加直接关闭机制 huangxiuqi 2022-09-09 09:30:33 +0800
• 4d8a8424f9
  修复获取视频帧信息不对的问题 Mr. shengge 2022-09-08 23:55:27 +0800
• 2f02d06019 _rtp_socket添加onErr监听 custompal 2022-09-08 11:42:26 +0800
• 7f86299c80 rtc stop push unregister mediasource xiongguangjie 2022-09-07 19:10:06 +0800
• 2fa71f4589 主动停止webrtc推流，不延迟注销 weishao 2022-09-07 16:53:20 +0800
• ddfe07dce4 openRtpServer接口兼容老版本规范 ziyue 2022-09-07 15:40:07 +0800
• 54100c1ba1 优化精简代码 ziyue 2022-09-07 15:32:38 +0800
• f5d35bc327 Merge branch 'cus_pr2' of github.com:custompal/ZLMediaKit ziyue 2022-09-07 15:20:10 +0800
• 6ca736f88a
  Merge pull request #1940 from AlphaWu/master 夏楚 2022-09-07 15:09:24 +0800
• 96c19ac85f 修复webrtcsession getIdentifier 为空的bug,导致GetAllSession webrtcsession的id 为空 xiongguangjie 2022-09-07 13:58:26 +0800
• 999e0b274e 简化代码: - MediaSource引入shortUrl和getUrl来简化日志输出 - WebApi引入fillSockInfo cqm 2022-09-07 11:06:39 +0800
• f765e5365b 修正在指定配置文件forwarded_ip_header的值后，无法获取不通过代理播放的客户端IP。 WuPeng 2022-09-06 21:13:11 +0800
• 206697e5c9 RtpServer新增tcp主动模式支持 custompal 2022-09-06 11:29:56 +0800
• 77f3d77788 rtsp支持指定播放单一track custompal 2022-09-05 19:18:23 +0800
• 2a6520122b 增加RtpServer TCP主动模式支持 custompal 2022-09-05 19:02:58 +0800
• ae8a3f59b9 rtsp支持指定播放单一track custompal 2022-09-05 14:41:13 +0800
• 4f47b7a5fe 修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题 ziyue 2022-09-05 14:59:46 +0800
• 00c9749b5d 防止多个track时获取rtp推流丢包率失败 xiongziliang 2022-09-03 16:47:37 +0800
• 5825f8b469 修复错误注释 xiongziliang 2022-09-03 16:31:43 +0800
• 06c6654ed5 精简代码 xiongziliang 2022-09-03 16:27:30 +0800
• c8ea6490cd 修复直接拉流代理时同协议流无法注册的问题 xiongziliang 2022-09-03 16:07:53 +0800
• 20f1275c58 rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877 xiongziliang 2022-09-03 15:53:01 +0800
• cd269672a5 新增作者 xiongziliang 2022-09-03 14:55:46 +0800
• 0948a3df31
  支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930) PioLing 2022-09-03 09:54:09 +0800
• f81cc24b92
  缩进 夏楚 2022-09-03 09:52:53 +0800
• 4f0b12a316
  缩进 夏楚 2022-09-03 09:52:15 +0800
• de4bd9439d
  Update MultiMediaSourceMuxer.cpp PioLing 2022-09-03 07:00:34 +0800
• 72a91d0b55
  Update WebHook.cpp PioLing 2022-09-02 22:06:47 +0800
• 3170959184
  Update MultiMediaSourceMuxer.cpp PioLing 2022-09-02 22:05:30 +0800
• d874936e4a 增加ProtocolOption 构造函数初始化成员 modify_stamp为配置文件的默认的全局 admin 2022-09-02 21:38:01 +0800
• aa6581c253
  Merge pull request #1931 from custompal/cus_pr 夏楚 2022-09-02 18:10:11 +0800
• dd6495cc07 补充getMediaPlayerList接口注释及postman示例 custompal 2022-09-02 17:46:09 +0800
• feaacf39ec
  Merge pull request #1920 from custompal/cus_pr 夏楚 2022-09-02 17:30:50 +0800
• 48d49a334d
  Update README.md 夏楚 2022-09-02 11:46:38 +0800
• 33e1e6b88d getMediaPlayerList返回播放器id以及会话类型名称 custompal 2022-09-01 21:52:43 +0800
• d0214a13e1 防止getPlayerList返回的json数据为null custompal 2022-09-01 17:45:06 +0800
• 38170c702e 修正gcc4.8编译错误 custompal 2022-09-01 17:33:36 +0800
• 640ed13d67 更新ZLToolKit custompal 2022-09-01 17:03:16 +0800
• ce545aa74f Merge branch 'master' into cus_pr custompal 2022-09-01 16:56:44 +0800
• 3585e9f7bc
  增加VLC如何播放SRT协议说明 (#1929) KevinZang 2022-09-01 15:53:19 +0800
• 8ac524ab13 srt add vlc ZSC714725 2022-09-01 13:39:27 +0800
• 0d6509ce03 统一部分变量名和代码样式风格 custompal 2022-08-30 21:24:25 +0800
• 04aa3ef41f 增加获取媒体流播放器列表功能 custompal 2022-08-30 21:05:19 +0800
• 679c79802f 整理媒体事件相关代码，删除无须重载时的多余代码逻辑 xiongzilaing 2022-08-28 17:25:56 +0800
• 67ad2a49c3 srt is player stop handleshake timert xiongguangjie 2022-08-27 15:18:32 +0800
• f9f6fd136a srt handle packet send repeate by timer xiongguangjie 2022-08-27 15:06:03 +0800
• 602c8e068b srt handshake packet send 3 times xiongguangjie 2022-08-27 13:25:23 +0800
• beb6383e72 optimize srt handle shake xiongguangjie 2022-08-27 12:46:35 +0800
• f0ae5a1bd7 优化日志提示 xiongziliang 2022-08-27 11:00:24 +0800
• 0cab9c8d16 rtp发送去除重连机制 xiongziliang 2022-08-27 10:59:15 +0800
• 6a4297845f 新增发送rtp被动关闭hook xiongziliang 2022-08-27 10:53:47 +0800
• c2ab45f78d 完善线程安全设计 xiongziliang 2022-08-27 10:17:06 +0800
• 8b0bd2d224
  Merge pull request #1908 from aaasoft/master 夏楚 2022-08-26 11:43:03 +0800
• 00acea369e
  修复接收rtsp、gb28181等rtp流转为其他协议播放时可能卡顿的bug (#1906) rqb500 2022-08-26 11:42:40 +0800
• 69416f53c9 更新.gitignore文件，排除out目录。 张鹏 2022-08-26 10:37:47 +0800
• bc7a51e347 修复获取ntp_stamp时计算溢出的bug rqb500 2022-08-25 21:27:25 +0800
• 60465b29c7 修改返回的ntp_stamp为32位 rqb500 2022-08-24 22:38:35 +0800
• c407e6571f 将rtp时间戳改为32位 rqb500 2022-08-24 21:37:55 +0800
• 44ba971cb6 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-08-23 14:13:36 +0800
• 208b0865bd 修复全局变量初始化顺序错乱导致崩溃的问题 ziyue 2022-08-23 14:11:32 +0800
• 074d13be0c rpm: 默认不打包 api/cxx-api Xiaofeng Wang 2022-08-22 13:18:05 +0800
• a06b4321be cmake: fix install cxx api headers Xiaofeng Wang 2022-08-22 13:11:17 +0800
• c6a0e3ad66 rtp发送启停支持触发观看人数统计事件 xiongziliang 2022-08-20 13:16:25 +0800
• 9f0c15a4f0 startSendRtp接口支持rtcp接收超时主动停止 xiongziliang 2022-08-20 12:48:27 +0800
• b7ef766701
  支持单独的datachannel通道 (#1894) Dw9 2022-08-20 10:28:19 +0800
• 82be993720 单独开启datachannel时，通过dtls包维持心跳 xiongziliang 2022-08-20 10:25:45 +0800
• fa0874d733 当仅有datachannel时 ，忽略rtp和rtcp超时 weishao 2022-08-19 19:14:19 +0800
• 189046fe5b 支持单独的datachannel 通道 weishao 2022-08-19 19:05:36 +0800
• 39d2255771
  Merge pull request #1893 from gongluck/master 夏楚 2022-08-19 10:22:34 +0800