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

• d971eccf92 新增支持HTTP-fMP4 WebSocket-fMP4直播 xiongziliang 2020-09-20 19:45:37 +0800
• 4ce1a25f09 修复MP4解复用时不写入adts头的问题 xiongziliang 2020-09-20 19:45:21 +0800
• 071d0a9fd1 提炼MP4相关接口和代码 xiongziliang 2020-09-20 19:45:04 +0800
• 2dd1046131 合并fmp4和mov接口 xiongziliang 2020-09-20 19:44:20 +0800
• d3cb0e3d39 ts直播源注销时关闭播放器 xiongziliang 2020-09-20 00:57:34 +0800
• 2d0cf5cdd9 解决http-ts直播与hls直播冲突的问题 xiongziliang 2020-09-20 00:55:22 +0800
• c76930e3cd 支持http-ts/websocket-ts直播 xiongziliang 2020-09-20 00:21:46 +0800
• f84981dc75 合并pr(添加录制ts完成通知): #479 xiongziliang 2020-09-20 11:40:42 +0800
• 0fce108de5 Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr xiongziliang 2020-09-20 11:01:45 +0800
• 5104252474 修复HLS直播结束后，最后一个切片无法写入的问题 xiongziliang 2020-09-20 10:56:54 +0800
• 100af97d51 修复死锁问题:#486 xiongziliang 2020-09-20 10:43:25 +0800
• 07ef417250 优化HLS直播相关代码 xiongziliang 2020-09-20 10:13:15 +0800
• 380a0204b1 替换docker镜像 xiongziliang 2020-09-20 10:09:13 +0800
• 9c873e1d19 去除转协议开关参数 xiongziliang 2020-09-20 09:26:00 +0800
• 01ec9d4b13 新增hls追加录制，新增转推 monktan 2020-09-17 20:59:33 +0800
• 748bb8e488 统一 mp4 及 ts 录像信息定义 wxf 2020-09-15 19:09:26 +0800
• b22a6e3dbd 添加 ts 切片是否通知选项, 默认为不通知 wxf 2020-09-15 17:46:12 +0800
• c53edf0ee8
  Merge pull request #3 from xia-chu/master 程憨憨 2020-09-14 22:09:59 +0800
• 00a7414f67 Merge remote-tracking branch 'origin/master' xiongziliang 2020-09-14 14:39:27 +0800
• 84b84ab979 update readme xiongziliang 2020-09-14 14:39:10 +0800
• 188e087fc2 添加 hls ts 切片录制完成通知 wxf 2020-09-13 14:08:05 +0800
• a024c51536 修正警告: moving a local object in a return statement prevents copy elision wxf 2020-09-13 11:07:19 +0800
• f903ffeb4a
  Update README.md 夏楚 2020-09-12 22:00:31 +0800
• 9b305bd4ae 优化HLS播放个数统计 xiongziliang 2020-09-12 21:27:34 +0800
• d26b751273 修复hls播放器流量统计不准确的bug xiongziliang 2020-09-12 20:52:53 +0800
• 1e1b3794da HLS切片间隔以数据时间戳为准:#463 xiongziliang 2020-09-12 20:49:00 +0800
• 1b9550cfc4 修复HLS按需生成相关bug xiongziliang 2020-09-12 20:42:58 +0800
• 3b5053af50 修复关闭HLS后，编译失败的问题 xiongziliang 2020-09-12 19:46:58 +0800
• be1e872f0c 完善按需转协议(包括hls) xiongziliang 2020-09-12 19:20:18 +0800
• 268a7fec10 修复hls播放鉴权相关bug xiongziliang 2020-09-12 19:14:35 +0800
• 898c6ff24f 修复mark bit相关错误 xiongziliang 2020-09-12 19:13:58 +0800
• 9e26a02fb1 实现rtsp/rtmp按需转协议功能 xiongziliang 2020-09-12 19:09:56 +0800
• aff9963f95 兼容某些多帧粘合在一起的流 xiongziliang 2020-09-12 19:06:26 +0800
• c711eedaa7 适配ZLToolKit代码,支持自定义创建Socket:#468 xiongziliang 2020-09-12 19:03:52 +0800
• 9a088f4825 提高PSRtpSender对象的线程安全性 xiongziliang 2020-09-12 18:53:51 +0800
• dc192c95fc 优化hls播放速度 xiongziliang 2020-09-12 18:53:16 +0800
• 28d73db9f7
  Merge pull request #478 from v354412101/master 夏楚 2020-09-12 18:40:06 +0800
• 01284323eb 忽略AUD帧; Zhou Weimin 2020-09-12 13:45:16 +0800
• c75c8f3806
  Merge pull request #471 from doodoocoder/master 夏楚 2020-09-11 10:01:03 +0800
• f2f41e63bb
  Merge pull request #474 from Colibrow/patch-1 夏楚 2020-09-11 09:54:28 +0800
• 299b988ed1
  Update MultiMediaSourceMuxer.cpp qingci 2020-09-10 19:28:30 +0800
• 2ae9d7c2ef
  当用pkg-config找avcodec与avutil时，应该就AVCODEC_INCLUDE_DIRS,AVUTIL_INCLUDE_DIRS doodoocoder 2020-09-10 13:35:35 +0800
• 8966df8db9 cleanup Lucas Zanella 2020-09-07 01:06:46 -0300
• ff4121b2a0 lil changes Lucas Zanella 2020-09-07 01:00:49 -0300
• f6757d5a89 lil adjust Lucas Zanella 2020-09-07 00:58:51 -0300
• 9c96f8d31a 确保PSRtpSender对象的线程安全 xiongziliang 2020-09-06 21:09:19 +0800
• 040c132fb6 优化stopSendRtp接口返回值 xiongziliang 2020-09-06 18:24:48 +0800
• 0878f776b3 修复某些场景下rtmp定位关键帧不准确的bug xiongziliang 2020-09-06 18:22:04 +0800
• 51ae8d4083 复用忽略协议查找流的相关代码 xiongziliang 2020-09-06 18:19:54 +0800
• 599e8493ca 添加utf8-bom头 xiongziliang 2020-09-06 18:09:31 +0800
• d0f17559cb 更新ZLToolKit xiongziliang 2020-09-06 18:01:47 +0800
• d90d25acb9 支持GB推流客户端 添加2个相关工程 xiongziliang 2020-09-06 17:59:18 +0800
• e7ac7fd5f9 优化HLS平滑播放逻辑 xiongziliang 2020-09-06 17:56:45 +0800
• faa8786f8f 兼容一些奇怪的流 xiongziliang 2020-09-06 17:56:26 +0800
• 09e484794b 实现ps-rtp的发送 #366 xiongziliang 2020-09-06 17:56:05 +0800
• ac70597216 优化getTrack接口相关代码 xiongziliang 2020-09-06 17:54:52 +0800
• 28262b158f 优化性能 xiongziliang 2020-09-06 17:53:22 +0800
• 16e21e0205 修复直接拉流代理时有些事件不生效的bug xiongziliang 2020-09-06 17:52:57 +0800
• 636068b2b8 精简代码，改善代码结构 xiongziliang 2020-09-06 17:52:33 +0800
• eca9236955 优化与拦截代码 xiongziliang 2020-09-06 17:52:07 +0800
• 74d6689a65 rtp解包采用自有代码 xiongziliang 2020-09-06 17:51:21 +0800
• 9fa2221a79 整理代码 xiongziliang 2020-09-06 17:51:00 +0800
• 9bfbe02f73 添加最大帧长度参数 xiongziliang 2020-09-06 17:50:24 +0800
• 90622a30fa 更新ZLToolKit xiongziliang 2020-08-30 09:15:50 +0800
• 84cfe66da0 修复由于音视频同步导致时间戳回退的问题 xiongziliang 2020-08-30 09:15:39 +0800
• 29fcf3eb3b 完善代码 xiongziliang 2020-08-30 09:15:02 +0800
• aedb1a8866 修复hls无人观看事件不触发的bug xiongziliang 2020-08-30 09:14:45 +0800
• 8961ca1659 修复可能无限递归的bug xiongziliang 2020-08-30 17:03:58 +0800
• a7e99b9d37 整理代码 xiongziliang 2020-08-30 11:40:03 +0800
• fbd711a6bb 整理代码 xiongziliang 2020-08-30 10:48:34 +0800
• 0219a155a8 fixes Lucas Zanella 2020-08-25 23:20:52 -0300
• a4912148f3
  Merge pull request #2 from xia-chu/master chengxiaosheng 2020-08-25 11:36:14 +0800
• 4255914613 ts打包过滤没有adts头的aac：#453 xiongziliang 2020-08-23 17:57:30 +0800
• 0456cee336 修复添加aac静音前缀未设置的问题 xiongziliang 2020-08-15 09:51:31 +0800
• 678e011afb FFmpeg拉流添加防呆设计 xiongziliang 2020-08-15 09:49:56 +0800
• 62da32477e ps rtp推流支持4个字节的头 xiongziliang 2020-08-15 09:48:27 +0800
• d986b1d36c 更新第三方库 xiongziliang 2020-08-08 12:23:46 +0800
• 461b5da933 修复closeRtpServer接口相关bug:#447 xiongziliang 2020-08-08 12:20:44 +0800
• f23e117751 MultiMediaSourceMuxer默认能处理大部分事件 xiongziliang 2020-08-08 12:20:13 +0800
• b3f048f194 修复adts符合包相关bug xiongziliang 2020-08-08 12:19:04 +0800
• 873f8bc5ac 精简代码 xiongziliang 2020-08-08 12:18:02 +0800
• 0087f50aaa 修复rtp组播性能问题 xiongziliang 2020-08-08 12:17:43 +0800
• 2fd567b8b0 1、ws-flv直播支持客户端主动关闭请求:#430 2、兼容CONTINUATION类型的websocket包 3、修复websocket客户端在处理Content-Length时的相关bug xiongziliang 2020-08-08 12:17:06 +0800
• e7e8969b4f ps解析添加外部缓存 xiongziliang 2020-08-08 12:13:35 +0800
• 30bbbd2e2f 修复缓存不够导致获取vps/sps/pps失败的问题 xiongziliang 2020-08-08 12:12:46 +0800
• 3ab683cfec
  Merge pull request #1 from xia-chu/master chengxiaosheng 2020-08-07 18:57:01 +0800
• 3285e51356 small corrections Lucas Zanella 2020-08-07 01:20:17 -0300
• 1e397ce963
  Update README.md 夏楚 2020-08-06 11:40:15 +0800
• 21548e3609 更新ZLToolKit xiongziliang 2020-08-04 17:12:39 +0800
• 1638e53b15 未找到流默认等待 xiongziliang 2020-08-04 16:47:29 +0800
• 76b5e1c3e3 更新ZLToolKit xiongziliang 2020-08-04 15:06:00 +0800
• 8be13c5b5f 更新ZLToolKit xiongziliang 2020-08-04 11:46:29 +0800
• 47cc97f696 修复rtmp增长时间戳相关问题 xiongziliang 2020-08-04 11:10:40 +0800
• 40e68fa0f5 支持通配符证书 xiongziliang 2020-08-03 12:00:23 +0800
• 5856e0d53e fixes usage of socket Lucas Zanella 2020-08-02 02:01:13 +0000
• a9b0ca9cdd hls支持opus xiongziliang 2020-08-01 20:56:34 +0800
• df49d6a717 添加opus相关支持的说明 xiongziliang 2020-08-01 10:32:05 +0800
• a93e3a395e 添加bom头 xiongziliang 2020-08-01 10:24:28 +0800
• a22f97c777 rtsp/rtmp/mp4支持opus并整理代码 xiongziliang 2020-08-01 10:22:12 +0800
• b4a3b608ab 修复rtmp增长时间戳相关bug xiongziliang 2020-08-01 10:20:27 +0800