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

• 84ab30ec76 修复c api编译错误 Dw9 2023-07-14 21:30:27 +0800
• e8a870e215 rtc port默认8000 Dw9 2023-07-14 20:15:11 +0800
• 4e33f5b477
  rtsp player add query param for content-base (#2637) xiongguangjie 2023-07-10 10:53:02 +0800
• 8ee91d705b
  feat: support auto fill streamUrl by webrtc page(#2646) johzzy 2023-07-09 13:24:52 +0800
• cbfd13b537 feat: support auto fill streamUrl by webrtc page, like "https://your-host/webrtc?app=live&stream=hello&type=push" Johnny 2023-07-09 11:20:48 +0800
• 15d752d6ae
  fix(www/webrtc): update 1080x720~1280x720 as default selected resolution in webrtc. (#2645) johzzy 2023-07-09 13:04:05 +0800
• aff6498ead fix(www/webrtc): update 1080x720~1280x720 as default selected resolution in webrtc. Johnny 2021-06-20 01:20:45 +0800
• d41afa5d48
  fix typo. (#2644) johzzy 2023-07-09 10:25:10 +0800
• 806f7d88d2 fix typo. Johnny 2021-12-27 11:26:40 +0800
• 9e8568e753
  添加rtp ext: av1-rtp-spec (#2609) yogo-zhangyingzhe 2023-07-08 23:28:34 +0800
• 4121441894 完善 xia-chu 2023-07-08 23:25:59 +0800
• 69816810a8 Merge branch 'master' of github.com:yogo-zhangyingzhe/ZLMediaKit xia-chu 2023-07-08 22:36:13 +0800
• f55e13f9da c sdk新增on_mk_media_send_rtp_stop事件回调 xia-chu 2023-07-08 22:34:09 +0800
• e6a19c4ecc 修复c api录制相关接口线程安全问题 xia-chu 2023-07-08 22:12:56 +0800
• 97859a995b 更新addStreamProxy接口 xia-chu 2023-07-08 22:07:32 +0800
• beae515bb2
  新增无人观看自动关闭流(无须hook返回)功能 (#2643) 夏楚 2023-07-08 21:36:34 +0800
• e52c1cc510
  修复addFFmpegSource添加的流事件拦截可能失效问题 (#2642 #2629) 夏楚 2023-07-08 21:35:09 +0800
• fad8dd74e7
  修复webrtc开启simulcast推流时，统计观看人数线程安全相关bug (#2640) 夏楚 2023-07-08 21:33:07 +0800
• 077566d1e1
  新增支持on_publish hook返回stream_replace替换流id (#2641) 夏楚 2023-07-08 21:32:04 +0800
• 2b49399311 新增自动关闭无人观看流选项 xia-chu 2023-07-08 18:51:54 +0800
• c8dd020015 fix bug xia-chu 2023-07-08 18:39:01 +0800
• b9cac91d6f 新增获取MultiMediaSourceMuxer对象接口，解决FFmpeg拉流事件可能拦截失败的问题 xia-chu 2023-07-08 18:34:27 +0800
• e5cc69870b 防止_push_src为空 xia-chu 2023-07-08 16:52:21 +0800
• 0cfd76c834 fix build issue xia-chu 2023-07-08 10:45:37 +0800
• 6ab0cb913d 新增支持on_publish hook返回stream_replace替换流id xia-chu 2023-07-08 10:39:05 +0800
• bead77cfcc 修复webrtc开启simulcast推流时，统计观看人数线程安全相关bug xia-chu 2023-07-08 10:30:01 +0800
• 575a4263c0 更新ZLToolKit,修复http/hls客户端复用无效socket的bug xia-chu 2023-07-08 10:19:43 +0800
• 07a1a929ad
  修复HLS点播时下载切片过快的bug (#2635 #2628) Nick 2023-07-08 10:18:09 +0800
• 7322bd3a7d rtsp player use sdp global a:control as play url xiongguangjie 2023-07-07 17:59:09 +0800
• f0aa39ea72 修复下载延时可能为负的问题 xia-chu 2023-07-07 16:50:31 +0800
• 3e9cc64894
  修复webrtc demo网页中stream拼写错误 (#2636) tjpgt 2023-07-07 14:57:23 +0800
• 2344e1b2ea fix rtsp url add query continue not effect xiongguangjie 2023-07-07 14:01:14 +0800
• 54fe534ecf
  修复webrtc demo网页中stream拼写错误 tjpgt 2023-07-07 13:50:02 +0800
• 3af9600c4b rtsp player add query param for content-base xiongguangjie 2023-07-07 11:39:49 +0800
• f13b97d385 #2628 HLS播放器proxy转推时文件下载过快的bug修复 Nick 2023-07-07 11:39:44 +0800
• 7be55b3cde Revert "#2628 HLS播放器支持播放点播文件" Nick 2023-07-07 10:15:57 +0800
• 1212053163 Merge branch '#2628' of https://github.com/joyouswind/ZLMediaKit into #2628 Nick 2023-07-07 10:03:27 +0800
• 3d433d1d0b #2628 0694 2023-07-06 19:43:05 +0800
• c86e6ba3f1
  Fix build issue with uclibc (#2625 #2631) a-ucontrol 2023-07-06 15:07:49 +0300
• 16d51df59d #2628 HLS播放器支持播放点播文件 0694 2023-07-06 19:43:05 +0800
• 0259387611 Build with uclibc, fix size type Alexandr 2023-07-06 12:57:51 +0300
• ab2d5396ce Build with uclibc (#2625) Alexandr 2023-07-06 12:15:53 +0300
• 788915c7f7
  修复mp4解复用器输出sps pps帧时设置起始头长度错误问题 (#2627) xiongguangjie 2023-07-06 15:47:30 +0800
• f855d71784 for mp4 reader paser video box nal should has prefix xiongguangjie 2023-07-06 14:42:44 +0800
• 7c6b612a4d
  c sdk新增mpeg-ps/ts打包接口 (#2620) xiangshengjye 2023-07-06 14:11:21 +0800
• d337a17f9c c sdk新增mpeg-ps/ts打包接口 root 2023-07-05 15:56:25 +0800
• 7663cbdcf1 添加rtp ext: av1-rtp-spec zhangyingzhe 2023-07-03 18:12:13 +0800
• 6b9889a883 WebApi调试日志恢复为Debug级别 xia-chu 2023-07-02 12:45:07 +0800
• 59c961a6df webrtc页面流刷新时间改为5秒一次 xia-chu 2023-07-02 12:44:07 +0800
• 0b32306bf5 更新作者列表 xia-chu 2023-07-02 12:43:28 +0800
• f911ad7a1f 更新功能特性说明 xia-chu 2023-07-02 12:34:44 +0800
• 3259bac046 c sdk新增mk_frame_merger接口 xia-chu 2023-07-02 12:25:30 +0800
• cb0579a16d
  新增支持hls-fmp4直播(#2603 #977 #1965) XiaoYan Lin 2023-07-02 12:02:33 +0800
• da13dbacb5 setupRecord接口支持ts/fmp4协议 xia-chu 2023-07-02 11:43:34 +0800
• d41e40af10 优化协议开启选项与编译选项设置 xia-chu 2023-07-02 11:36:46 +0800
• 2127fb9450 去除多余宏 xia-chu 2023-07-02 11:18:52 +0800
• c6c51d1e2c 优化编译选项 xia-chu 2023-07-02 11:05:36 +0800
• 3ef462b4ff 修复setupRecord开启的hls-fmp4录制无法生成init.mp4的问题 xia-chu 2023-07-02 10:32:17 +0800
• 99a05ec960 修复hls关闭后的编译问题 xia-chu 2023-07-02 10:28:24 +0800
• 2add61a23d 性能优化 xia-chu 2023-07-02 10:21:00 +0800
• bc3f2b570d 新增单独开关控制hls fmp4是否开启 xia-chu 2023-07-02 10:09:32 +0800
• df384b2860 fix build issue 2 xia-chu 2023-07-01 13:46:27 +0800
• 36f52f1baa fix build issue xia-chu 2023-07-01 13:07:13 +0800
• 159fb97a6b 优化代码 xia-chu 2023-07-01 13:05:33 +0800
• c28da026ab 各复用器onAllTrackReady函数重命名为addTrackCompleted xia-chu 2023-07-01 12:39:06 +0800
• 973b414d96 优化精简代码 xia-chu 2023-07-01 12:29:37 +0800
• ddf71f3d44 优化代码 xia-chu 2023-07-01 11:20:19 +0800
• 396e86c71e 修改fmp4_hls直播不再依赖fmp4直播 xia-chu 2023-06-30 15:55:21 +0800
• b1a6efc86f Merge branch 'master' of https://github.com/linxiaoyan/ZLMediaKit xia-chu 2023-06-30 11:56:48 +0800
• e8a85debf9 1、删除冗余代码；2、统一代码风格 linxiaoyan 2023-06-30 11:20:39 +0800
• 1eedda94ae 支持hls.fmp4.m3u8 dawei lin 2023-06-29 17:31:32 +0800
• 8f89c04b8c sync from master xiongguangjie 2023-06-29 14:42:04 +0800
• 6aa4b741a3
  修复通用rtp解码器输入小时间戳增量流在丢包时不再输出帧数据的bug (#2589) 夏楚 2023-06-28 14:56:24 +0800
• d5bf99a27b
  ts or ps muxer not support mjpeg video codec ignore it (#2593) xiongguangjie 2023-06-28 14:56:06 +0800
• 2ad44bc773
  修复启动参数log-size单位错误bug (#2598) 夏楚 2023-06-28 14:55:39 +0800
• 2771bc15a5
  添加on_server_exited webhook事件,当程序正常退出时触发 (#2591 #2585) pedoc 2023-06-28 11:36:41 +0800
• 6c06387c03
  修复启动参数log-size单位错误bug 夏楚 2023-06-28 10:55:08 +0800
• fd66748873 remove mpeg muxer jpeg filter logic xiongguangjie 2023-06-28 08:20:32 +0800
• d00a4da323 添加on_server_exited webhook事件,当程序正常退出时触发 pedoc 2023-06-27 22:00:56 +0800
• 8cc66fecca ts or ps not support mjpeg video codec ignore it xiongguangjie 2023-06-27 20:23:12 +0800
• a418aaa5e3 修复通用rtp解码器输入小时间戳增量流在丢包时不再输出帧数据的bug xia-chu 2023-06-27 20:14:58 +0800
• c530f281c3
  优化CMakeList, 完善iOS下编译配置 (#2578) 朱如洪 2023-06-27 10:51:31 +0800
• 46656a6a96 删除 重复的 命令 zhu410289616 2023-06-26 23:17:25 +0800
• 6cd9e15cb8
  优化FFmpeg截图命令模板，提高截图成功率 (#2583) 夏楚 2023-06-26 11:04:52 +0800
• 06742f9d25
  新增日志相关设置启动参数 (#2581) 夏楚 2023-06-26 10:49:25 +0800
• db8e9182cc
  新增配置项指定H264 rtp打包是否优先采用stap-a模式 (#2582) 夏楚 2023-06-26 10:04:16 +0800
• 0f130f9067 优化FFmpeg截图命令模板，提高截图成功率 xia-chu 2023-06-25 20:50:11 +0800
• 14adce9195 新增配置项指定H264 rtp打包是否优先采用stap-a模式 xia-chu 2023-06-25 20:26:01 +0800
• f2f09fb292 新增日志相关设置启动参数 xia-chu 2023-06-25 19:54:15 +0800
• b5e20f8af9 1-调整 json 的源码引入，外部可以引入 json/json.h 使用；2-针对 iOS 工程调整 cmake 配置，解决 iOS 环境下 mk_util.h 找不到问题；同时在 iOS 工程中引入 media server 静态库； zhu410289616 2023-06-23 12:00:51 +0800
• 24d210f61d
  修复NTP时间戳计算精度不足导致误差累积问题 (#2576 #2570 ) Luosh 2023-06-21 17:20:39 +0800
• 9f753b5e5f
  RTSP支持强制协商RTP传输方式 (#2572) Talus 2023-06-21 15:35:27 +0800
• f286619433 优化判断 Talus 2023-06-21 07:25:36 +0000
• 2da0fb6b10 优化NTP时间戳精度计算 Luosh 2023-06-21 15:23:13 +0800
• a615664632 replace multi if to switch case? Talus 2023-06-21 07:21:40 +0000
• c04eb19b2e 组播注释 Talus 2023-06-21 06:38:46 +0000
• 45aff48cdf 格式化 Talus 2023-06-20 21:02:02 +0000
• 537e658ef3 Revert "格式化" Talus 2023-06-20 20:54:40 +0000
• 53b49f4cfc 优化 Talus 2023-06-20 13:22:26 +0000
• d498669c30 优化 Talus 2023-06-20 13:20:21 +0000