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

• 1067c5a2d3 再优化dts获取 xiongziliang 2020-04-29 18:19:51 +0800
• 9d9f6e304e 完善dts计算算法 xiongziliang 2020-04-29 18:05:29 +0800
• 3630839bc9 关闭转协议后，将关闭解复用以提供性能 xiongziliang 2020-04-29 11:59:45 +0800
• 0270057907 新增rtmps默认端口 xiongziliang 2020-04-29 11:30:06 +0800
• 7e85be7654 添加rtmps服务器 xiongziliang 2020-04-29 11:25:15 +0800
• f9df7f5217 去除ultraLowDelay配置项 xiongziliang 2020-04-29 11:08:43 +0800
• 4fbd45e408 h265新增支持两种类型的关键帧 xiongziliang 2020-04-29 10:01:56 +0800
• 163b0875cf 修复h264 split后可能多个字节的bug xiongziliang 2020-04-28 22:24:31 +0800
• 7565a20695 startRecord API with "customized_path" #279 xiongziliang 2020-04-28 15:24:08 +0800
• 0eb97d5471 修复不能控制录制路径的问题：#279 xiongziliang 2020-04-28 09:40:47 +0800
• aa9bd56c5a 回调可以设置空指针 xiongziliang 2020-04-27 09:18:46 +0800
• 7490f320f8
  Merge pull request #15 from xiongziliang/master baiyfcu 2020-04-26 22:35:29 +0800
• 7272f01ea9 确保能同步取消定时器 xiongziliang 2020-04-26 19:36:17 +0800
• 341bb5d84a 确保定时器能同步取消 xiongziliang 2020-04-26 19:34:58 +0800
• 3651609a5f 确保mk_player_release后不再触发回调 xiongziliang 2020-04-26 19:09:38 +0800
• ff7cf5f4d3 完善注释 xiongziliang 2020-04-26 19:04:47 +0800
• dee0af1c40 Merge remote-tracking branch 'origin/master' xiongziliang 2020-04-26 19:02:49 +0800
• e141eeb8b8 同步取消回调 xiongziliang 2020-04-26 19:02:40 +0800
• 98d0bc27f9 mk_player api 增加seek和获取进度以相对开始时间的接口以适应按时间轴方式回放的需求 baiyfcu 2020-04-26 17:40:34 +0800
• 42b89a4da1
  Update README.md 夏楚 2020-04-26 17:40:09 +0800
• 12eabbe426
  Merge pull request #14 from xiongziliang/master baiyfcu 2020-04-26 15:30:28 +0800
• 75cc34814f 保证不丢帧 5.0 xiongziliang 2020-04-26 15:19:32 +0800
• b2fe3cd05d 加锁 xiongziliang 2020-04-26 11:25:25 +0800
• 2c9141513d ts/ps支持G711 xiongziliang 2020-04-26 09:45:00 +0800
• b2b276029b 修复windows下编译问题 xiongziliang 2020-04-24 16:35:41 +0800
• f222af2632 完善代码 xiongziliang 2020-04-24 15:28:27 +0800
• e85a8f277e RTMP协议限制G711规格、日志打印codec相关信息 xiongziliang 2020-04-24 15:08:28 +0800
• 46740b7c31 修复编译问题 xiongziliang 2020-04-24 14:13:50 +0800
• bda57b57f2 修复内存失效的问题 xiongziliang 2020-04-24 14:06:28 +0800
• 2e74d5c957 修复合并写相关bug: #282 xiongziliang 2020-04-24 13:51:04 +0800
• 3cdc0dd98f 更新ZLToolKit xiongziliang 2020-04-24 12:45:21 +0800
• 79949fc05f Merge remote-tracking branch 'origin/master' xiongziliang 2020-04-24 12:39:34 +0800
• b4228f91c3 适配ZLToolKit xiongziliang 2020-04-24 12:39:22 +0800
• 540faa8c24
  Update README_en.md 夏楚 2020-04-24 10:12:21 +0800
• 48e6fecbc0
  Update README.md 夏楚 2020-04-24 10:11:45 +0800
• a9fcd9dbc1 完善接口 xiongziliang 2020-04-23 23:57:42 +0800
• 787af5109e api返回音视频相关信息 xiongziliang 2020-04-23 23:45:20 +0800
• 1c03acbdb9 完善网络相关信息 xiongziliang 2020-04-23 23:33:58 +0800
• 26cfb5ae73 完善网络相关信息 xiongziliang 2020-04-23 23:30:24 +0800
• 0df25942aa rtp推流初步添加事件 xiongziliang 2020-04-23 23:18:24 +0800
• 00c21cd99e 优化代码 xiongziliang 2020-04-23 22:22:24 +0800
• eda7a59f3c 统一事件参数类型 xiongziliang 2020-04-23 22:04:59 +0800
• b6946a5968 事件广播触发者改成SockInfo对象 xiongziliang 2020-04-23 21:38:44 +0800
• 4d84661a87 更新ZLToolKit xiongziliang 2020-04-23 17:50:12 +0800
• b09919d374 替换inet_ntoa线程安全版本 xiongziliang 2020-04-23 16:14:24 +0800
• 727322b8e9 更新readme xiongziliang 2020-04-23 15:51:11 +0800
• b2e324efdc 完善日志 xiongziliang 2020-04-23 15:43:22 +0800
• 2e3cee09bb hls/mp4录像/mp4点播/ts解析/ps解析初步支持G711 xiongziliang 2020-04-23 15:19:20 +0800
• eb67bc8348 完善测试程序 xiongziliang 2020-04-22 09:55:24 +0800
• 8859e89ade 完善 c api xiongziliang 2020-04-22 09:51:04 +0800
• 1d5c6cb141 整理解析器 xiongziliang 2020-04-20 18:13:45 +0800
• 7805558d3a
  Merge pull request #13 from xiongziliang/master baiyfcu 2020-04-20 09:16:08 +0800
• 003cd58371 完善接口 xiongziliang 2020-04-19 00:05:02 +0800
• b7b839a06f 修复编译错误 xiongziliang 2020-04-18 23:58:29 +0800
• 49596bd97f 简化接口 xiongziliang 2020-04-18 23:56:27 +0800
• e1459834df 支持G711编码 xiongziliang 2020-04-18 23:06:36 +0800
• 3efda8fd0b 根据playload type生成track xiongziliang 2020-04-18 23:00:48 +0800
• bacf8f100b G711支持多种规格 xiongziliang 2020-04-18 22:13:11 +0800
• 5c3418a412 合并 #278 xiongziliang 2020-04-18 18:46:20 +0800
• 1f43359b31 Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit xiongziliang 2020-04-18 16:05:49 +0800
• 40afa204d5 增加rtmp/rtsp对音频G711A,G711U的支持 baiyfcu 2020-04-17 17:47:10 +0800
• 1a97c2e3cd 优化特定情况下丢帧问题 xiongziliang 2020-04-17 15:19:42 +0800
• 1f02144225 完善录制相关api错误提示 xiongziliang 2020-04-16 21:31:07 +0800
• 6b621d42db 优化接口 xiongziliang 2020-04-15 22:30:24 +0800
• 7823d2c1d8 修复为安装openssl编译失败的问题 xiongziliang 2020-04-13 17:30:38 +0800
• d363871601 修复一些mp4点播不支持的问题 xiongziliang 2020-04-13 09:44:05 +0800
• 048b30c41c Merge remote-tracking branch 'origin/master' xiongziliang 2020-04-10 18:58:36 +0800
• c8d4edac9c 修复不支持多级ssl证书的问题:#257 xiongziliang 2020-04-10 18:58:14 +0800
• 7e78af7527
  Update README.md 夏楚 2020-04-10 15:19:08 +0800
• c18a065b08 Merge remote-tracking branch 'origin/master' xiongziliang 2020-04-10 14:08:33 +0800
• 895e7d4714 完善rtp推流 xiongziliang 2020-04-10 14:08:10 +0800
• b30105892d
  Update README.md 夏楚 2020-04-09 22:51:51 +0800
• 54874ed865
  Update README.md 夏楚 2020-04-09 22:50:12 +0800
• 1174046e32
  Update README.md 夏楚 2020-04-09 22:48:20 +0800
• 8650cd18d1
  Update README.md 夏楚 2020-04-09 22:47:19 +0800
• 00a2ef496c
  Update README.md 夏楚 2020-04-09 22:34:39 +0800
• 53e9043a98
  Update README.md 夏楚 2020-04-09 22:19:47 +0800
• 9173c5e0af
  Update README.md 夏楚 2020-04-09 22:17:58 +0800
• 15f5279e22
  Update README.md 夏楚 2020-04-09 22:16:56 +0800
• 99a55ddaaa 添加合并写功能 xiongziliang 2020-04-09 16:19:03 +0800
• 5fcc22bab7 useBuf暂定为true时seek失败 baiyfcu 2020-04-08 16:15:47 +0800
• 340629cdc6 添加对g711A/U rtsp支持相关文件，api添加windows静态库编译选项，g711 RTMP支持尚未修改 baiyfcu 2020-04-08 15:42:52 +0800
• fb77293648 修复rtsp seek播放时rtsp server返回npt字段不对问题 baiyfcu 2020-04-08 15:37:16 +0800
• 8a8da61ef5 防止windows下字符编码错误 xiongziliang 2020-04-08 13:54:44 +0800
• 0fc1499643 添加性能测试模式 xiongziliang 2020-04-08 11:16:09 +0800
• f7fa4e6407
  Merge pull request #12 from xiongziliang/master baiyfcu 2020-04-08 09:14:20 +0800
• 5025d7d4cc 修复rtsp点播时不触发播放成功回调的问题 xiongziliang 2020-04-07 18:09:25 +0800
• 76588e9f05 增加使用ZL按需拉流后再推流的功能 kqbi 2020-04-07 15:54:55 +0800
• b06cc96975
  Merge pull request #4 from xiongziliang/master kqbi 2020-04-07 14:57:52 +0800
• 43579a5618 Merge remote-tracking branch 'origin/master' xiongziliang 2020-04-07 13:11:05 +0800
• b169f94cce 大幅提高rtsp服务器性能 xiongziliang 2020-04-07 13:03:53 +0800
• 84be3fbfc1
  Merge pull request #262 from gemfield/master 夏楚 2020-04-07 10:32:49 +0800
• 1352e159f1 优化性能 xiongziliang 2020-04-07 10:26:07 +0800
• 8e3cbd11d3 Update Dockerfile to 20.04 version Gemfield 2020-04-06 15:52:45 +0000
• 4d74360609 去除多余依赖 xiongziliang 2020-04-06 21:57:14 +0800
• 1896b1d768 优化代码 xiongziliang 2020-04-06 21:44:32 +0800
• 45c5f1ec4c 避免死锁 xiongziliang 2020-04-06 21:23:35 +0800
• e192931429 修复动态添加HlsMediaSource后无法获取Track列表的问题 xiongziliang 2020-04-05 10:32:42 +0800
• d3db5e0ce0 完善录制相关功能 xiongziliang 2020-04-05 09:48:38 +0800
• e5d5cabf89 部分恢复录制相关接口 xiongziliang 2020-04-05 09:26:29 +0800