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

#4042

#4043

#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

• dae7516c55 完善对FFmpeg的支持 xiongziliang 2020-08-01 10:16:28 +0800
• c7225dffbc 整理rtsp客户端代码 xiongziliang 2020-08-01 10:14:42 +0800
• 5d436d0a1f 修复websocket服务端收到close请求后未断开连接的问题:#430 xiongziliang 2020-08-01 10:13:42 +0800
• 6d5f2abb46 fixed mediaplayer Lucas Zanella 2020-07-31 02:51:18 +0000
• 4b9f1fcb22 new approach Lucas Zanella 2020-07-30 01:25:29 +0000
• 979899c25f backup Lucas Zanella 2020-07-30 00:57:49 +0000
• 589157fac1 first try Lucas Zanella 2020-07-30 00:12:02 +0000
• 7ef3ad6b95
  Update README.md 夏楚 2020-07-26 20:04:46 +0800
• 7091865bc5
  Update README.md 夏楚 2020-07-26 20:02:46 +0800
• d350d640ce
  Update README.md 夏楚 2020-07-26 19:58:59 +0800
• 3acfb15c99 完善H264 rtp解包打包相关代码 xiongziliang 2020-07-26 19:56:39 +0800
• c0fde62480 完善aac rtp解析 xiongziliang 2020-07-24 20:10:47 +0800
• 4281a1272e Merge remote-tracking branch 'origin/master' xiongziliang 2020-07-24 20:04:53 +0800
• a44a63423c 解决rtsp推流，aac时间戳增量太大导致flv.js播放异常的问题：#392 xiongziliang 2020-07-24 20:03:35 +0800
• 90bbdf95a9
  Merge pull request #18 from xiongziliang/master baiyfcu 2020-07-20 11:37:23 +0800
• 81a384049a
  Merge pull request #425 from v354412101/master 夏楚 2020-07-20 09:17:10 +0800
• 04840742cf 修复rtsp拉流rtp FU-A最后一个分片size为0的问题;#424 Zhou Weimin 2020-07-19 07:21:18 +0000
• 7254c39fc2 rtsp推流采用相对时间戳,防止音视频不同步:#392 xiongziliang 2020-07-16 16:36:26 +0800
• c31b0cc26b H264Track不过滤SEI: #411 xiongziliang 2020-07-16 16:26:13 +0800
• c612f291db 关闭hook时，流不存在就立即返回播放失败:#417 xiongziliang 2020-07-16 16:03:22 +0800
• f84b3d90b4 流未找到事件中，可以立即返回播放失败: #417 xiongziliang 2020-07-16 16:00:31 +0800
• 85f28ce1f0 修复seq溢出时的日志误报:#418 xiongziliang 2020-07-16 15:46:34 +0800
• 7f8aa7b3d6 Merge remote-tracking branch 'origin/master' xiongziliang 2020-07-16 10:41:28 +0800
• bdb28c53de 重命名前确保关闭mp4文件:#416 xiongziliang 2020-07-16 10:40:30 +0800
• c216821e5c
  Merge pull request #413 from lyg1949/master 夏楚 2020-07-15 14:35:55 +0800
• 09cce4522d
  Merge pull request #6 from lyg1949/lyg1949-patch-1 lyg1949 2020-07-15 14:17:51 +0800
• f420509c5c
  修复点播rtmp时多出一个后缀名的bug lyg1949 2020-07-15 14:17:18 +0800
• 2d89322b8e
  Merge pull request #5 from xiongziliang/master lyg1949 2020-07-14 17:29:26 +0800
• c507e8a772 完善对系统时间戳跳变的支持 xiongziliang 2020-07-14 15:03:47 +0800
• 971a4d765d 修复修改系统时间戳导致定时器不精准的bug xiongziliang 2020-07-13 14:38:45 +0800
• 0bb593f817 rtp推流无人观看时，自动关闭端口：#410 xiongziliang 2020-07-14 09:50:06 +0800
• 58fb88eac0 添加postman相关配置文件 xiongziliang 2020-07-11 23:17:36 +0800
• c66e5dcdb1 更新第三方库，修复ps rtp解包相关问题:#388 xiongziliang 2020-07-11 21:56:39 +0800
• b588053571 整理rtsp服务器相关代码 xiongziliang 2020-07-10 10:42:23 +0800
• bc5931dce9 修复G711生成RTP类型无效的bug xiongziliang 2020-07-09 11:15:01 +0800
• d6d861c401 openRtpServer接口不允许添加重复的stream_id xiongziliang 2020-07-09 10:57:17 +0800
• 363673dd00 完善getRtpInfo接口 xiongziliang 2020-07-09 10:41:17 +0800
• 4b39fd487d 动态创建rtp端口采用stream_id为索引 xiongziliang 2020-07-09 10:38:57 +0800
• ade89bdb4d
  Merge pull request #3 from xiongziliang/master lyg1949 2020-07-09 08:24:26 +0800
• a164b28608 优化rtp解析代码 xiongziliang 2020-07-08 23:23:11 +0800
• d191347839 修复bug xiongziliang 2020-07-08 22:49:08 +0800
• d4908c3162 提高rtsp客户端健壮性 xiongziliang 2020-07-08 22:29:08 +0800
• be65ec5f1d 提供rtsp服务器稳定性 xiongziliang 2020-07-08 22:19:05 +0800
• 1c19394b3d 防止rtmp协议重复生成Track xiongziliang 2020-07-08 21:39:30 +0800
• 8f369061a8
  Merge pull request #397 from wasphin/feature/install-3rdpart-libraries 夏楚 2020-07-08 21:15:39 +0800
• 5cc684ac30
  Merge pull request #2 from xiongziliang/master lyg1949 2020-07-08 20:14:52 +0800
• b0e9f8c449 安装 C++ SDK 时也安装第三方库 wxf 2020-07-08 16:27:26 +0800
• 7bce212701 修复rtsp重复推流判断无效的bug:#394 xiongziliang 2020-07-08 12:42:05 +0800
• b2ff53037b http api新建的rtp服务器可以自动超时移除 xiongziliang 2020-07-08 10:25:30 +0800
• e58a63c528 优化代码 xiongziliang 2020-07-08 10:09:16 +0800
• 248b2d5cb9 完善GB28181推流 xiongziliang 2020-07-08 09:36:10 +0800
• 477f99b756 支持动态创建GB28181收流端口并可指定stream_id:#338 xiongziliang 2020-07-07 10:01:12 +0800
• 30260e5414 复用printSSRC函数 xiongziliang 2020-07-07 09:58:08 +0800
• 80d9f8ccaa 更新ps解析库，兼容不规范的ps流:#359 xiongziliang 2020-07-04 21:44:44 +0800
• cd5dd6ffd0 更新ps解析库，修复猜测编码格式错误的bug:#359 xiongziliang 2020-07-04 19:30:03 +0800
• 2be19ffb31 添加listRtpServer接口 xiongziliang 2020-07-02 22:26:38 +0800
• b603b8a68d 支持http api动态添加或关闭rtp服务器 xiongziliang 2020-07-02 22:23:43 +0800
• 236219c589
  Merge pull request #382 from wasphin/feature/use-pkgconfig-to-find-libav 夏楚 2020-07-02 18:20:01 +0800
• 55cc1d7391
  Merge pull request #383 from wasphin/feature/install-cxx-api 夏楚 2020-07-02 18:19:27 +0800
• 3c858a8351 添加媒体注册回调事件:#373 xiongziliang 2020-07-02 18:14:39 +0800
• dccb1e2a42 支持安装 C++ 库 wxf 2020-07-02 17:56:18 +0800
• e89e39704f 支持配置是否编译 api/tests/server wxf 2020-07-02 17:55:32 +0800
• ac320ddc09 支持在编译时开启/关闭部分特性 wxf 2020-07-02 16:58:21 +0800
• 5195475116 Merge remote-tracking branch 'origin/master' xiongziliang 2020-07-02 17:45:07 +0800
• 21edbb0ebe 更新ZLToolKit xiongziliang 2020-07-02 17:44:53 +0800
• 0c9dd568b0
  Merge pull request #1 from xiongziliang/master lyg1949 2020-07-02 17:10:53 +0800
• 2fee173d7a 优先使用 pkg-config 来查找 AV* 库 wxf 2020-06-30 21:45:17 +0800
• e24adfe995
  Update README_en.md 夏楚 2020-07-02 15:26:40 +0800
• 97c2297d2a
  Merge pull request #375 from wasphin/patch-2 夏楚 2020-06-30 21:21:04 +0800
• 92de6239f7
  Merge pull request #374 from wasphin/patch-1 夏楚 2020-06-30 21:20:01 +0800
• e679e74695 去除多余#include xiongziliang 2020-06-30 21:14:51 +0800
• bc606cf767
  子模块地址使用相对路径 Xiaofeng Wang 2020-06-30 21:13:52 +0800
• d2c052a673 优化代码逻辑 xiongziliang 2020-06-30 21:11:59 +0800
• 9e42772b48 rtmp aac config包没有负载 xiongziliang 2020-06-30 21:08:52 +0800
• 29077dcef4 rtmp播放成功时确保aac track处于ready状态 xiongziliang 2020-06-30 21:00:45 +0800
• 2b276efadd
  Remove self-included header Xiaofeng Wang 2020-06-30 20:15:22 +0800
• 41c75fb66a 新增是否开启浏览http目录的配置选项:#367 xiongziliang 2020-06-30 09:16:02 +0800
• bbcb4d41f7 修复ps解析误判为aac的bug xiongziliang 2020-06-29 11:55:13 +0800
• 038979b716 修改rtmp metadata codec由字符为整形,兼容比较老的rtmp服务器 xiongziliang 2020-06-28 21:49:08 +0800
• fd77398291 修复dts计算可能导致不同步的问题：#369 xiongziliang 2020-06-28 15:24:08 +0800
• f67e9fce9a 修复访问悬垂指针的可能 xiongziliang 2020-06-28 15:21:41 +0800
• e89caa2385 c sdk支持pcm输入:#363 xiongziliang 2020-06-24 11:18:04 +0800
• 575b84beee Merge branch 'master' of https://github.com/lyg1949/ZLMediaKit xiongziliang 2020-06-24 11:07:28 +0800
• 66c5a7169a 修复metadata中没duration导致播放失败的bug:#362 xiongziliang 2020-06-24 11:02:35 +0800
• 3d25ede46f 为API添加获取配置型内容的接口 zhlong 2020-06-24 09:50:35 +0800
• f0a538d37d
  实现输入PCM帧的接口 lyg1949 2020-06-24 08:54:15 +0800
• 791c773ae0
  增加输入PCM帧的接口 lyg1949 2020-06-24 08:52:45 +0800
• c49812fe73 Merge remote-tracking branch 'origin/master' xiongziliang 2020-06-19 10:19:56 +0800
• e76bc65243 修复开启转协议后，无人观看掐流延时不定期的bug xiongziliang 2020-06-19 10:19:42 +0800
• bb00759ce0
  Update README.md 夏楚 2020-06-17 16:15:15 +0800
• a46218965a
  Merge pull request #17 from xiongziliang/master baiyfcu 2020-06-17 15:58:41 +0800
• 05a65d4961 merge stamp baiyfcu 2020-06-17 15:51:02 +0800
• f881108dfe 更新第三方库 xiongziliang 2020-06-15 09:13:45 +0800
• 5f50441f43 降低第三方库头文件依赖性 xiongziliang 2020-06-12 18:17:49 +0800
• f03351a71a 修改dts生成逻辑 xiongziliang 2020-06-11 23:06:01 +0800
• efa92752c7 完善对高规格aac的支持 xiongziliang 2020-06-11 19:21:46 +0800
• b9006a90d4 优化rtmp推流时，aac config获取不完整的bug xiongziliang 2020-06-11 17:40:09 +0800
• 0e47dc94f9 aac config不再限制两个字节：#336 xiongziliang 2020-06-11 17:19:10 +0800
• 6b7e4f5f52 修复子进程日志路径固定的问题 xiongziliang 2020-06-11 09:22:28 +0800
• 9c646d1316 完善预设截图相关逻辑 xiongziliang 2020-06-10 10:50:37 +0800