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

#4035

#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

• 201e06dc0b fixed #102 xiongziliang 2019-10-08 10:19:52 +0800
• ba71bac475 提升sdp解析兼容性 xiongziliang 2019-10-08 09:55:59 +0800
• b1c8b24d18 提升sdp兼容性 xiongziliang 2019-10-08 09:45:43 +0800
• e5cb5c56a1 提升sdp解析兼容性 xiongziliang 2019-10-08 09:44:08 +0800
• eb12bc7397 提升sdp解析兼容性 xiongziliang 2019-10-08 09:39:54 +0800
• 205b01f6d1 修复http文件服务器可能丢失数据的问题 xiongziliang 2019-09-30 20:07:09 +0800
• b573b5bbac 防止时间戳跳变 xiongziliang 2019-09-30 16:51:17 +0800
• 119d8d824f 完善配置文件说明 xiongziliang 2019-09-30 09:20:14 +0800
• c6270aa1f9 Merge pull request #99 xiongziliang 2019-09-30 09:13:19 +0800
• 39a528cc02 停止写之后将最后的片段也写进m3u8文件中 Weiwei.Zhou 2019-09-29 22:05:18 +0800
• 5704d8171c
  Merge pull request #1 from zlmediakit/master nanguantong 2019-09-29 22:00:18 +0800
• e69ec8f8a2 更新ZLToolKit(windows下日志支持颜色) xiongziliang 2019-09-29 15:30:10 +0800
• dd81a70bed 添加是否添加静音音频选项 xiongziliang 2019-09-29 10:33:05 +0800
• 612a9dc541
  Merge pull request #8 from zlmediakit/master baiyfcu 2019-09-28 10:26:31 +0800
• 940c3ffbca rtsp/rtmp点播改成后台线程读取 xiongziliang 2019-09-27 18:05:42 +0800
• 9fc31f3d3e 修复android下老版本ndk编译兼容性问题 xiongziliang 2019-09-27 09:58:42 +0800
• e3e412cf8e 更新ZLToolKit(修复在覆盖时间戳时的相关bug) xiongziliang 2019-09-26 19:10:45 +0800
• 4bc355b08a 支持hls点播录制 xiongziliang 2019-09-26 14:21:20 +0800
• 86fcf69f81 提高rtsp对H264编码的sdp的兼容性 xiongziliang 2019-09-25 22:16:35 +0800
• df7305c6ce
  Merge pull request #94 from nanguantong/master 夏楚 2019-09-25 09:11:58 +0800
• 67575bb2e1 添加文件循环读取 Weiwei.Zhou 2019-09-24 20:48:30 +0800
• a65d9f03ba 默认关闭hook xiongziliang 2019-09-24 16:09:10 +0800
• a6574560ac 替换Android MediaServer默认配置 xiongziliang 2019-09-24 15:38:07 +0800
• fd89b2d0cf MediaServer支持Android xiongziliang 2019-09-24 15:21:20 +0800
• 8552687559 提高对无Metadata的rtmp流的兼容性 xiongziliang 2019-09-24 11:44:23 +0800
• 653667baf5 提高对无Metadata的rtmp流的兼容性 xiongziliang 2019-09-24 11:42:27 +0800
• 928f642a27 完善注册rtmp机制，防止及时拉流不出画面的bug xiongziliang 2019-09-23 18:56:19 +0800
• adfc084d4a 提高无Metadata的rtmp推流的兼容性 xiongziliang 2019-09-23 17:08:00 +0800
• 1fda56ab6e rtmp推流时，确保config帧收完后再注册 xiongziliang 2019-09-23 16:53:04 +0800
• cb7c72d9d9 修正metadata拼写错误，优化RtmpMediaSource注册机制，修复及时拉流不出画面的bug xiongziliang 2019-09-23 16:47:20 +0800
• 8ae9f56110 添加to_string接口 xiongziliang 2019-09-21 19:27:55 +0800
• 8da9aee11a 兼容无metadata的rtmp流 xiongziliang 2019-09-21 19:27:34 +0800
• 9d43c38e09 add exit event xiongziliang 2019-09-20 17:58:50 +0800
• 91adaaaab6 回滚代码 xiongziliang 2019-09-20 14:05:23 +0800
• eb2c514e72 删除二进制文件，改成github的Release发布 xiongziliang 2019-09-20 11:50:17 +0800
• 9735d891da 整理代码 xiongziliang 2019-09-20 10:37:41 +0800
• 5ad4103ce0 修正拼写错误 xiongziliang 2019-09-20 10:36:37 +0800
• 81c757a0dc
  Update README.md 夏楚 2019-09-19 10:00:10 +0800
• 2d96124f45 去除冗余依赖 xiongziliang 2019-09-18 17:12:53 +0800
• 3268daa42b 精简代码 xiongziliang 2019-09-18 10:27:40 +0800
• f31773ee19
  Merge pull request #7 from zlmediakit/master baiyfcu 2019-09-17 12:09:24 +0800
• 10e74b7eb6 修复websocket跨域问题 xiongziliang 2019-09-17 10:29:15 +0800
• ca0fc13367 添加提示 xiongziliang 2019-09-17 10:11:09 +0800
• d4506f946d 完成测试程序的说明 xiongziliang 2019-09-17 09:56:11 +0800
• ee8d28dbef 单独提供websocket服务器程序 xiongziliang 2019-09-17 09:48:20 +0800
• 4d84ae92f9 Support websocket client xiongziliang 2019-09-16 18:32:25 +0800
• e7550d796a 替换websocket测试服务器 xiongziliang 2019-09-16 18:11:41 +0800
• 00e64ed279 添加注释完善代码 xiongziliang 2019-09-16 18:02:33 +0800
• 78069ce0e5 添加bom xiongziliang 2019-09-16 17:46:39 +0800
• 644905a374 实现websocket客户端模板 xiongziliang 2019-09-16 17:45:27 +0800
• 3095075749 完善websocket服务器 xiongziliang 2019-09-16 17:42:52 +0800
• 671f22077a 添加websocket client支持 baiyfcu 2019-09-12 13:44:38 +0800
• f28b732ae8
  Merge pull request #6 from zlmediakit/master baiyfcu 2019-09-12 11:23:24 +0800
• 96aa687fea 完善http文件访问鉴权逻辑 xiongziliang 2019-09-11 16:37:49 +0800
• 8fe876c0ef 修复http文件鉴权漏洞 xiongziliang 2019-09-11 15:51:42 +0800
• d30d0e2b29 issue:#83 xiongziliang 2019-09-11 09:21:10 +0800
• 7701a883e3 提高EasyDarwin的rtsp推流兼容性 xiongziliang 2019-09-10 17:08:24 +0800
• ae64bc9bcb 不指定协议转换时，默认转换hls，rtxp 提高EasyDarwin的rtsp推流兼容性 xiongziliang 2019-09-10 17:01:42 +0800
• d41d116a67 兼容带url参数的rtsp推流 xiongziliang 2019-09-10 16:00:39 +0800
• e67894a085 推流鉴权事件支持是否允许转rtsp/rtmp、hls 、mp4 xiongziliang 2019-09-10 11:06:31 +0800
• 15539bc27e
  Merge pull request #80 from zqsong/master 夏楚 2019-09-09 10:55:12 +0800
• 005db3cbc5 修复推送H265的时候,每一帧都split导致耗时过长 zqsong 2019-09-09 10:44:34 +0800
• 2192451cd1 修复http文件鉴权相关bug xiongziliang 2019-09-09 09:41:23 +0800
• 47cb4b8edc 完善rtp打包 xiongziliang 2019-09-06 23:23:43 +0800
• 203edc5cec 完善rtp打包 xiongziliang 2019-09-06 23:22:04 +0800
• 9f1a91cda6 rtmp支持带后缀名的url xiongziliang 2019-09-06 18:30:42 +0800
• dd188f08fd 完善配置注释 xiongziliang 2019-09-06 18:03:40 +0800
• 39e3c89848 rtp打包减少一次内存拷贝 xiongziliang 2019-09-06 15:16:22 +0800
• ca8e295ada Merge remote-tracking branch 'origin/master' xiongziliang 2019-09-05 15:00:53 +0800
• d8de1e226c 完善对H265的sdp兼容性 xiongziliang 2019-09-05 14:56:33 +0800
• ab38c24fc7
  Update README_CN.md 夏楚 2019-09-05 14:25:46 +0800
• f1dce22915 兼容多线程编码的帧 xiongziliang 2019-09-05 11:15:30 +0800
• d6fa0296cb 添加配置项ultraLowDelay,可选择是否低延时模式 xiongziliang 2019-09-04 18:57:54 +0800
• d864e7084b 修复rtmp点播移动时间轴相关bug xiongziliang 2019-09-03 17:20:56 +0800
• 226473a223 更新ZLToolKit(修复点播结束后，MediaReader对象还无法销毁的的bug) xiongziliang 2019-09-03 16:40:10 +0800
• a3c8cb11b3
  Merge pull request #5 from zlmediakit/master baiyfcu 2019-09-02 20:31:04 +0800
• 3c4d7498bc 完善兼容性 xiongziliang 2019-08-30 16:56:57 +0800
• cfc7dc2126
  Merge pull request #74 from 3503207480/master 夏楚 2019-08-30 11:49:11 +0800
• a7953fdbca 除以0错误 3503207480@qq.com 2019-08-30 11:18:25 +0800
• 036b36f012 注释，说明 3503207480@qq.com 2019-08-30 11:17:27 +0800
• 64cf7efa13 删除无效代码 xiongziliang 2019-08-30 10:34:00 +0800
• e3139134e8 修复握手超时相关bug xiongziliang 2019-08-28 18:20:40 +0800
• 4cfe4e5d73 修复windows下编译问题 xiongziliang 2019-08-28 11:02:36 +0800
• ab08f333d3 修复ws-flv可能播放失败的bug xiongziliang 2019-08-27 11:54:27 +0800
• 43608585a1 优化时间戳修正逻辑 xiongziliang 2019-08-27 11:34:50 +0800
• e7727e7e9b 修复某些流转换hls后花屏的问题 xiongziliang 2019-08-27 11:34:20 +0800
• 06784d86be 完善websocket-flv直播错误响应 xiongziliang 2019-08-23 09:45:01 +0800
• 1cff946848 MediaSource类添加getTracks接口 xiongziliang 2019-08-22 17:48:10 +0800
• a451da058c 修正mp4录制相关的宏定义 xiongziliang 2019-08-22 17:46:47 +0800
• ac865066bc windows下默认gbk编码，不再需要字符转码 xiongziliang 2019-08-22 16:57:50 +0800
• fa030fa0cc 简化代码 xiongziliang 2019-08-22 16:54:30 +0800
• 3b3e037ef0 添加bom头 xiongziliang 2019-08-22 16:30:07 +0800
• c6e9f8365d 规范类命名 xiongziliang 2019-08-22 16:25:19 +0800
• 61d8c526ab 添加bom头处理工具 xiongziliang 2019-08-22 16:16:26 +0800
• fb1d7dd5a6 rtsp推流拉流转发时修整sdp rtsp推流修整时间戳 xiongziliang 2019-08-22 16:05:35 +0800
• bf7363714d 完善注释 xiongziliang 2019-08-22 15:23:14 +0800
• fc0544512b 优化rtmp时间戳修正 xiongziliang 2019-08-22 14:56:58 +0800
• 7f0fa0ead1 更新ZLToolKit xiongziliang 2019-08-20 12:11:21 +0800
• a12a832ec8 Merge remote-tracking branch 'origin/master' xiongziliang 2019-08-20 12:10:11 +0800
• 113b7842d9 http cookie 可以保存更丰富的信息 xiongziliang 2019-08-20 12:09:43 +0800