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

• aa03d7d0bb 添加hls/mp4录制相关接口 xiongziliang 2019-12-24 16:19:33 +0800
• a3c482c1ef 添加shell相关代码 xiongziliang 2019-12-24 16:09:09 +0800
• 4e0919d13b 提供完成的c api事件测试代码 xiongziliang 2019-12-24 16:02:41 +0800
• 824eeee6f5 c api 回调invoker支持异步执行 xiongziliang 2019-12-24 14:24:32 +0800
• e663ddd9a6 简化事件参数 xiongziliang 2019-12-24 14:08:16 +0800
• 5886a38a9f 完成事件c api的开发 xiongziliang 2019-12-24 13:56:53 +0800
• eb89a3e504 完善http服务器对不固定长度body的支持 xiongziliang 2019-12-24 10:25:28 +0800
• 40c2326950 完善c接口事件定义 xiongziliang 2019-12-23 18:50:46 +0800
• 756d10aa55 支持导出默认配置文件 xiongziliang 2019-12-23 15:31:35 +0800
• c72dd5b4c5 通过windows测试 xiongziliang 2019-12-23 14:31:02 +0800
• 92bc4fbbb1 c api测试程序防止退出时崩溃 xiongziliang 2019-12-23 14:20:49 +0800
• 6796d0b592 添加c api测试范例 xiongziliang 2019-12-23 14:01:00 +0800
• 2da0c884a1 添加kBroadcastHttpBeforeAccess事件，拦截http文件下载事件 xiongziliang 2019-12-23 12:47:04 +0800
• 0b8c4e75e1 添加mk_env_init1接口 xiongziliang 2019-12-20 11:04:18 +0800
• 15fbb3d087 规范命名 xiongziliang 2019-12-19 16:45:32 +0800
• f32f5df4eb 修复mp4录制崩溃的bug:#181 xiongziliang 2019-12-18 18:40:41 +0800
• 73df1bb949 添加安全冗余代码 xiongziliang 2019-12-18 15:02:55 +0800
• 5f0bbb3f17 优化代码 xiongziliang 2019-12-18 14:56:24 +0800
• 4e1876fab8 添加mk_rtp_server_start接口 xiongziliang 2019-12-18 14:54:47 +0800
• be5d98b968 添加mk_rtp_server_start接口 xiongziliang 2019-12-18 14:53:42 +0800
• d342cc3a76 添加pusher接口 xiongziliang 2019-12-18 14:44:19 +0800
• ef7e937808 添加pusher接口 整理代码 xiongziliang 2019-12-18 14:43:32 +0800
• ee4659a185 添加异步日志线程 xiongziliang 2019-12-18 13:54:55 +0800
• bf499916d8 统一添加UTF-8 bom 头 xiongziliang 2019-12-18 11:47:49 +0800
• 026aa5e75c 添加播放器的C接口 xiongziliang 2019-12-18 11:45:33 +0800
• 239dc309f2 尝试修复linux下编译问题 xiongziliang 2019-12-18 10:37:23 +0800
• 97bf82e54c 尝试修复linux编译失败的问题 xiongziliang 2019-12-18 10:19:08 +0800
• 31438cfde4 初步提供c标准接口 xiongziliang 2019-12-17 18:45:31 +0800
• ee88297d4a fixed #174 xiongziliang 2019-12-17 09:24:35 +0800
• a1e5724c70 优化hls录制 xiongziliang 2019-12-17 09:18:11 +0800
• 1169f29ca6 fixed #175 xiongziliang 2019-12-17 09:05:34 +0800
• 1cc6a0dce5 fixed #175 xiongziliang 2019-12-17 09:04:10 +0800
• 0670f9f62b 更新ios编译方法 xiongziliang 2019-12-16 17:12:24 +0800
• 5322a5761b 修复时间戳跳跃可能导致的问题 xiongziliang 2019-12-16 16:17:52 +0800
• 3f12c0ccde 修复时间戳覆盖的累积误差 xiongziliang 2019-12-16 15:49:52 +0800
• c353c626c1 1、根据PS获取时间戳 2、修复rtp代理可能花屏的问题 xiongziliang 2019-12-16 11:00:40 +0800
• bfa9a3b678 #include <ctime> xiongziliang 2019-12-13 16:29:26 +0800
• caf8274026 更新ZLToolKit xiongziliang 2019-12-13 16:20:03 +0800
• e6235e00e1 修复windows下无法编译的问题 xiongziliang 2019-12-13 16:17:15 +0800
• 6d697daeb0 去除FrameMerger逻辑 xiongziliang 2019-12-13 15:49:57 +0800
• 14ba899c61 选择是否导出调试文件 xiongziliang 2019-12-13 15:43:24 +0800
• 6e59000265 修复过滤多余帧类型导致的bug xiongziliang 2019-12-13 15:42:58 +0800
• bd8a9a78e8 rtp代理防止时间戳回环 xiongziliang 2019-12-13 15:42:12 +0800
• fbf0f63503 1、getMediaList接入添加tracks、readerCount字段 2、添加getMediaInfo接口 xiongziliang 2019-12-13 13:35:27 +0800
• 89b8d461db
  Merge pull request #167 from gemfield/master 夏楚 2019-12-12 23:02:59 +0800
• d9a5de5a63 修复持续集成编译失败问题 xiongziliang 2019-12-12 23:02:11 +0800
• 5fe5dd9de6 hls保存ts文件时根据日期、时间保存 xiongziliang 2019-12-12 22:58:31 +0800
• ee66d945e8 更新media-server库 xiongziliang 2019-12-12 22:25:55 +0800
• 0adfb3ec83 Fix Docker timezone issue, and also expose RTP port Gemfield 2019-12-12 20:07:21 +0800
• 2a518493d7 完善rtp测试工具 xiongziliang 2019-12-11 20:01:51 +0800
• f8c8465aa9
  Merge pull request #3 from xiongziliang/master kqbi 2019-12-11 11:12:53 +0800
• 99c1dd339f 修复adts头相关bug xiongziliang 2019-12-11 09:29:10 +0800
• df73eb2c10 getSsrcInfo接口ssrc使用16进制字符串 xiongziliang 2019-12-09 18:15:02 +0800
• fa4fac1e0d rtp推流由配置文件决定是否默认录制 xiongziliang 2019-12-09 17:49:00 +0800
• 2f12a66372
  Merge pull request #2 from xiongziliang/master kqbi 2019-12-08 19:26:29 +0800
• 655a30081b 修复rtp(tcp)获取ssrc失败的bug xiongziliang 2019-12-06 20:18:08 +0800
• adf0e09262 mp4点播支持pts xiongziliang 2019-12-06 17:23:49 +0800
• 030d8f6d53 完成windows下编译 xiongziliang 2019-12-06 13:53:28 +0800
• 1300e11507 完善cmakelist xiongziliang 2019-12-06 13:39:55 +0800
• 0d9bdec182 支持rtp代理服务器 xiongziliang 2019-12-06 11:54:10 +0800
• 55814070f8 Update CMakeFiles for RTP Proxy Gemfield 2019-12-05 19:53:55 +0800
• 55d258fafc Add rtp server Gemfield 2019-12-05 19:20:12 +0800
• 10dc254510 完善stopRecord接口 xiongziliang 2019-12-05 14:31:44 +0800
• 055c312579 修复getRecordStatus接口 xiongziliang 2019-12-05 14:12:22 +0800
• 8502ed27c4 修复录制http ap接口 xiongziliang 2019-12-05 12:55:43 +0800
• 69c0c3e237 添加录制相关http api xiongziliang 2019-12-05 12:04:08 +0800
• f581f0f2a7 优化精简录制相关代码 xiongziliang 2019-12-05 10:47:23 +0800
• 6eb4d5916d 修复bug xiongziliang 2019-12-04 19:19:03 +0800
• 33047ddc94 程序退出前停止一切录制 xiongziliang 2019-12-04 19:15:48 +0800
• 728fd55e0c 修复无法延后录制的bug xiongziliang 2019-12-04 18:58:19 +0800
• ae230bc1aa 优化代码 xiongziliang 2019-12-04 18:53:12 +0800
• 57043138d8 优化代码 xiongziliang 2019-12-04 18:49:22 +0800
• e69cbc1486 优化代码 xiongziliang 2019-12-04 18:46:31 +0800
• 996ff47d26 Merge remote-tracking branch 'origin/master' xiongziliang 2019-12-04 18:36:57 +0800
• b3fcb4c038 重写mp4录制驱动机制 xiongziliang 2019-12-04 18:36:30 +0800
• a79bee1d88
  Update README_CN.md 夏楚 2019-12-04 12:11:36 +0800
• d5a81d7105 规范命名 xiongziliang 2019-12-04 10:59:13 +0800
• de77460621 修复编译失败问题 xiongziliang 2019-12-04 10:52:26 +0800
• de33d6a847 整理文件录制 xiongziliang 2019-12-04 10:45:38 +0800
• 2c2e7262d6 修复bug xiongziliang 2019-12-03 16:14:52 +0800
• 5249c24430 整理MediaSource代码 xiongziliang 2019-12-03 16:10:02 +0800
• 68718953d4 优化代码 xiongziliang 2019-12-03 13:05:23 +0800
• b50a34bf1f 优化代码 xiongziliang 2019-12-03 12:43:48 +0800
• c55f26fba7 整理MediaSink xiongziliang 2019-12-03 12:32:57 +0800
• c1ab73f758 修复类型转换失败的bug xiongziliang 2019-11-30 22:14:22 +0800
• cadff93d4d 1、hls cookie改成60秒有效期并且访问时刷新cookie 2、去除keep-alive下最大请求次数限制 xiongziliang 2019-11-30 14:29:44 +0800
• d46b67a5cf 精简代码 xiongziliang 2019-11-30 11:56:40 +0800
• 12346f77a4 修复编译问题 xiongziliang 2019-11-30 11:44:05 +0800
• a44ab25d46 整理http文件服务器相关代码 xiongziliang 2019-11-30 11:38:00 +0800
• ee528b2bfb Merge remote-tracking branch 'origin/master' xiongziliang 2019-11-29 11:59:55 +0800
• 9b6ee8131b hls用作点播时，那么m3u8文件实时记录为点播 xiongziliang 2019-11-29 11:59:39 +0800
• 64a1255b76
  Update README_CN.md 夏楚 2019-11-29 11:36:26 +0800
• 0c79af024c 切换submodule至gitee xiongziliang 2019-11-29 11:32:17 +0800
• 5e9291e035 添加启动失败处理逻辑 xiongziliang 2019-11-29 11:27:54 +0800
• 22c01d0a03 完善范例配置文件 xiongziliang 2019-11-29 10:14:08 +0800
• d587ddf7ef 添加服务器启动报告 xiongziliang 2019-11-29 10:12:20 +0800
• 544135b2d7 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit xiongziliang 2019-11-29 09:57:11 +0800
• c42ee1dc5d 优化时间戳覆盖逻辑:#148 xiongziliang 2019-11-29 09:54:48 +0800
• e84af6a9e2
  Update ccpp.yml 夏楚 2019-11-26 09:52:20 +0800
• bf70a01f6a 提升rtsp的兼容性 xiongziliang 2019-11-25 17:59:04 +0800