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

• b24c4f8d33 默认禁用编译ffmpeg相关特性 xiongziliang 2022-06-18 20:50:25 +0800
• b8e625bb80 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into feature/transcode2 xiongziliang 2022-06-18 15:32:19 +0800
• 94839fd93c 添加bom头 xiongziliang 2022-06-18 14:34:58 +0800
• 272eca1249 hook重试新增延时功能 xiongziliang 2022-06-18 14:09:38 +0800
• 06f5bda8b3 Merge branch 'master' of gitee.com:leon14631/ZLMediaKit xiongziliang 2022-06-18 13:29:14 +0800
• 7f98f9a750 删除重复的获取gmt offset相关代码 xiongziliang 2022-06-18 13:27:23 +0800
• 266a0ca5b4 修复test_rtp触发断言的问题 xiongziliang 2022-06-18 13:27:15 +0800
• 771844d065
  去除rtp_sender_mtx (#1722) custompal 2022-06-18 13:22:57 +0800
• 8bfc08310c 确保onReaderChanged触发时线程安全 xiongziliang 2022-06-18 13:16:00 +0800
• fda4e83ae4 srt support tlpktdrop=0 feature xiongguangjie 2022-06-18 13:01:04 +0800
• 3e62775db7 无人观看定时器指定为MediaSource对象所属poller以确保读取观看数是线程安全的 custompal 2022-06-17 18:21:00 +0800
• d06480903c
  Update WebRtcTransport.cpp Dw9 2022-06-17 16:08:49 +0800
• 260b3ff02c 修复笔误 custompal 2022-06-16 19:53:50 +0800
• 7852fdc215 去除rtp_sender_mtx custompal 2022-06-16 19:48:00 +0800
• 56b8a86032 update submodule monktan 2022-06-16 17:14:12 +0800
• 96bf1c9d79 update submodule monktan 2022-06-16 17:02:30 +0800
• fe652e46b4 rtmp session when client stop publish not set push src null avoid judge player or pusher error xiongguangjie 2022-06-16 10:57:48 +0800
• b22e1cf937 fix g711u or g711a rtp judge error xiongguangjie 2022-06-16 10:04:46 +0800
• 5479820748 const payload type variable start's letter is lower case xiongguangjie 2022-06-16 09:59:09 +0800
• 6d701bfef5
  update conf/config.ini. 配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试， Leon 2022-06-15 07:17:02 +0000
• 01350c810e
  update server/WebHook.cpp. 配置文件HOOK添加retry ，设置hook通知失败重试的次数。默认为0，不重试， Leon 2022-06-15 07:14:36 +0000
• c157aae2ad 使用double来保存_tsp，避免出现2.5ms的frame_size(ffmpeg内置的opus) cqm 2022-06-15 10:03:23 +0800
• 6a337adc91 for rtp server can config pt xiongguangjie 2022-06-15 00:20:53 +0800
• 559b4d3fe7 for srt more check config xiongguangjie 2022-06-14 19:49:45 +0800
• dfec2d76e0 修复close_stream接口无回复问题 ziyue 2022-06-14 16:29:04 +0800
• 7f09af3e63 增加转码比特率设置: kAacBitRate和kOpusBitRate cqm 2022-06-14 15:02:12 +0800
• 7b59a36b22 实现rtc音频转码： - 启用rtc:// schecma, 将rtc发布订阅到该schema下 - 增加 RtcMediaSourceImp 和 RtcMediaSourceMuxer 用于aac<->opus的转码 - 调整MultiMediaSourceMuxer头文件包含，加快编译 cqm 2022-06-13 17:25:12 +0800
• 315f146e59 删除directProxy cqm 2022-06-08 11:36:22 +0800
• a36e2ce740 使用FFmpegAudioFifo来简化代码 修复转码声音卡顿问题 cqm 2022-06-02 11:30:31 +0800
• fc22f21672 增加FFmpegEncoder和test_audio_transcode 修复linux连接错误, update linux github action cqm 2022-05-31 17:10:02 +0800
• 8679f47344 AacTracker 增加构造函数 test_audio_transcode支持各种音频输出 cqm 2022-06-01 11:35:52 +0800
• 4f444203eb Merge remote-tracking branch 'origin/master' into dev xiongguangjie 2022-06-13 10:59:25 +0800
• b771274a7f fix recv cycle buffer crash and avoid send nak packet exceed mtu xiongguangjie 2022-06-12 23:35:30 +0800
• 6503d95853 add cyclebuffer for recv buf xiongguangjie 2022-06-12 21:11:50 +0800
• 705875f410 添加 dl 依赖库 Xiaofeng Wang 2022-06-12 18:27:55 +0800
• 9e18428d7b delay min is 120ms xiongguangjie 2022-06-11 23:50:47 +0800
• ce7787fe33 force use srt flag 0xbf xiongguangjie 2022-06-11 23:11:14 +0800
• 2e097f13b1 only use periodic NAK xiongguangjie 2022-06-11 23:04:24 +0800
• 4b9f789c79 add srt recv and send packet buf size xiongguangjie 2022-06-11 22:51:11 +0800
• f8373302d0 change srt streamid like srs srt streamid xiongguangjie 2022-06-11 21:37:41 +0800
• 4d6cff36b8 添加bom头 xiongziliang 2022-06-11 16:00:45 +0800
• 8fba694473 注释多余代码，消除编译警告 xiongziliang 2022-06-11 15:14:14 +0800
• 5688337546 添加utf-bom头 xiongziliang 2022-06-11 15:11:03 +0800
• fd11c53a78 Merge branch 'feature/srt' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-06-11 15:07:58 +0800
• 84d0d1db19 getAllSession接口返回完整可读类名 xiongziliang 2022-06-11 15:03:28 +0800
• 926e78272c 优化获取丢包率相关代码 xiongziliang 2022-06-11 14:45:56 +0800
• 974428d1e7 确保获取丢包率时线程安全 xiongziliang 2022-06-11 14:40:14 +0800
• df7a3242bb 修复获取webrtc推流丢包率除0的bug xiongziliang 2022-06-11 14:23:43 +0800
• f6b4eb418f 优化录制相关代码 xiongziliang 2022-06-11 14:18:55 +0800
• 09af12a183 操作MediaSource对象时确保线程安全 xiongziliang 2022-06-11 14:17:43 +0800
• 97116e1208 完善getOwnerPoller相关逻辑 xiongziliang 2022-06-11 13:08:58 +0800
• b6d3ec5251 完善获取丢包率pull request; 新增MediaSource::getOwnerPoller接口 xiongziliang 2022-06-11 12:56:03 +0800
• be995f9cd2 !17 【功能请求】 /index/api/getMediaList接口 增加LOSS字段用于统计每个轨道丢包率反馈 * update webrtc/WebRtcPusher.h. * update webrtc/WebRtcPusher.cpp. * update webrtc/WebRtcTransport.h. * update webrtc/WebRtcTransport.cpp. * update src/Common/MediaSource.h. * update src/Common/MediaSource.cpp. * update server/WebApi.cpp. Leon 2022-06-11 04:31:06 +0000
• 3a9408bcec
  webrtc answer m-lines次序错误 (#1695) sha-long-ba-si 2022-06-11 12:26:31 +0800
• 483a75284e 修复udp发送失败导致的问题：#1444, #1645 xiongziliang 2022-06-11 12:24:33 +0800
• 49a0183df0 fix clang format change include order result in windows build error xiongguangjie 2022-06-09 22:54:24 +0800
• f58211fb08 optimize send nack when check packet lost send nack immediately xiongguangjie 2022-06-09 19:30:03 +0800
• ec757e4b2d webrtc answer m-lines次序错误 james 2022-06-08 15:41:57 +0800
• e5ca3aa0fb 格式化代码 ziyue 2022-06-07 10:01:42 +0800
• e415230e47 格式化srt相关代码 ziyue 2022-06-07 09:52:20 +0800
• 020b8b85ea try fix for windows build xiongguangjie 2022-06-06 22:13:53 +0800
• c92fc8a4a8 format code and remove some useless code xiongguangjie 2022-06-06 20:40:04 +0800
• 83d75c9a72 add srt config for lantency multiplier xiongguangjie 2022-06-06 19:55:47 +0800
• 9f357c24b8 avoid seq cycle xiongguangjie 2022-06-06 18:18:26 +0800
• b8806657cd for srt lantency calculate when handshake xiongguangjie 2022-06-05 14:09:35 +0800
• 3cca4015c5 fix rtt and rtt variance xiongguangjie 2022-06-05 12:13:28 +0800
• 62dfed39f7 fix timelatency not take effect and avoid buffer is liner avoid cycle xiongguangjie 2022-06-05 11:07:42 +0800
• 6f05cf803d prevent cycle for time lantency and available size xiongguangjie 2022-06-04 22:42:28 +0800
• adaffcc245 prevent pkt seq cycle and time stamp cycle xiongguangjie 2022-06-04 22:09:56 +0800
• 71ce31d5c0 for some optimize and anti pkt lost and force pop packet when too late xiongguangjie 2022-06-04 20:51:49 +0800
• 89b135400c Merge remote-tracking branch 'origin/master' into feature/srt xiongguangjie 2022-06-04 15:47:47 +0800
• 086146a344 try fix windows build error xiongguangjie 2022-06-04 14:05:51 +0800
• 9a57353470 add srt on readme xiongguangjie 2022-06-04 13:31:36 +0800
• 4d9a55b924 add srt usage for zlm xiongguangjie 2022-06-04 13:31:15 +0800
• 92420f8392 check stream id xiongguangjie 2022-06-04 13:30:59 +0800
• cd6b0ee0c4 fix peer ip error xiongguangjie 2022-06-04 12:22:55 +0800
• af9bd2dd0a fix streamid zero error xiongguangjie 2022-06-04 12:03:56 +0800
• 91aa9c494c srt can play stream xiongguangjie 2022-06-04 11:23:18 +0800
• df9a9649b0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-06-04 11:08:13 +0800
• b23cbaa0f8 on_publish hook新增continue_push_ms参数，用于断连续推延时控制 xiongziliang 2022-06-04 11:06:35 +0800
• 6237dd48dc add commet and remove compile warn xiongguangjie 2022-06-04 10:11:28 +0800
• 7f65e082f5 can build prepare for play ts stream by srt xiongguangjie 2022-06-03 22:47:52 +0800
• 82da99eef3 add shutdown packet and flow report xiongguangjie 2022-06-03 21:17:01 +0800
• b9f66ca1ec add srt push string xiongguangjie 2022-06-03 20:38:35 +0800
• 18f4870cfe emit push is srt xiongguangjie 2022-06-03 20:26:53 +0800
• 7606dd7110 for srt push fix ack paramter error result in pkt lost xiongguangjie 2022-06-03 20:18:34 +0800
• 7038924c6f for srt set recv buf xiongguangjie 2022-06-03 18:05:24 +0800
• ddc5b59a65 some change xiongguangjie 2022-06-03 17:49:43 +0800
• 9fadc22c80 srt can push but bandwith estimate has error xiongguangjie 2022-06-03 16:47:53 +0800
• 1891c4e391 add srt push type xiongguangjie 2022-06-03 15:02:07 +0800
• aa2ff01d9f first commit for srt intergrate xiongguangjie 2022-06-03 13:25:32 +0800
• 2357c0b56a 实现音频转码，启用rtc:// schecma cqm 2022-06-01 18:30:40 +0800
• 6fa4f985a1 使用FFmpegAudioFifo来简化代码 cqm 2022-06-02 11:30:31 +0800
• 57ad77d3a9 增加FFmpegEncoder和test_audio_transcode cqm 2022-05-31 17:10:02 +0800
• 14f9441701 AacTracker 增加构造函数 test_audio_transcode支持各种音频输出 cqm 2022-06-01 11:35:52 +0800
• 59dcd03b70
  修改hls拉流后closestream崩溃的bug (#1678) taojishou 2022-06-01 13:05:49 +0800
• 43d1557044
  Delete apply.orig 夏楚 2022-06-01 12:55:38 +0800
• daea89d049
  Delete apply.rej 夏楚 2022-06-01 12:55:22 +0800
• 771ab64331 修改hls拉流后closestream崩溃的bug taojishou 2022-06-01 12:27:47 +0800
• ea996cd2e4 Merge branch 'fixhls' of https://github.com/taojishou/ZLMediaKit into fixhls root 2022-06-01 12:15:20 +0800