Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

branch_cumulative_commit

feature/async_write_file

feature/dynamic_codec

feature/hls_record_disk

feature/log_context

feature/test

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

#3429

#3432

#3433

#3442

#3444

#3446

#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

#3691

#3692

#3693

#3694

#3699

#3707

#3713

#3714

#3715

#3716

#3716

#374

#375

#382

#383

#397

#4

#4

#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

• 8e55e5dee4 fixed build error cqm 2023-02-20 17:45:00 +0800
• d27e577b14 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode cqm 2023-02-20 17:07:15 +0800
• 46842e6f29
  修复WebRTC播放导致媒体延迟注销问题 (#2246) Talus 2023-02-20 16:23:29 +0800
• 1f2ef82b46 新增支持获取gop大小与间隔信息: #1570 ziyue 2023-02-20 16:10:22 +0800
• 2e066f2b77 修复WebRTC播放特殊情况下推流器断开无法触发媒体注销的问题 #2246 TalusL 2023-02-20 15:36:15 +0800
• 2f8dab66c5
  http地址支持相对路径 (#2223) alexliyu7352 2023-02-20 10:52:00 +0800
• 5bcfba1da4 startSendRtpPassive接口新增连接超时参数：close_delay_ms xiongziliang 2023-02-17 23:02:09 +0800
• 8f0ba6988b openRtpServer接口新增only_audio参数，优化语音对讲场景 xiongziliang 2023-02-17 22:43:45 +0800
• 5cdaf982f3 更新zltoolkit，修复udp服务线程安全问题 ziyue 2023-02-15 11:51:24 +0800
• 9f50b9159c
  的确有不少问题 #2223 alexliyu7352 2023-02-13 13:30:44 +0800
• 719b137208
  修正macos持续集成运行目录 (#2234) zx 2023-02-12 22:44:37 +0800
• 2f090e33cf 新增c sdk api，防止user_data导致的内存泄露 ziyue 2023-02-11 15:14:18 +0800
• 5e91955dd0
  修改 macos 最后一步运行目录 #2234 zx 2023-02-11 14:55:56 +0800
• d8b7870809
  拦截非 http 请求，打印相关数据 #2233 zx 2023-02-11 14:32:55 +0800
• c7a67d7109
  修改 onRecvContent 注释。 #2232 zx 2023-02-11 14:18:59 +0800
• 5078723236 新增mk_http_body无拷贝创建api ziyue 2023-02-11 11:55:06 +0800
• 56586189cf 完善h264/h265分帧逻辑，更新h264文件直播测试程序 ziyue 2023-02-11 11:43:41 +0800
• 0773e79fd1 新增自定义转协议创建mk_media接口 ziyue 2023-02-11 11:40:32 +0800
• 9629dbd969 新增mk_ini配置文件相关接口 ziyue 2023-02-11 11:39:26 +0800
• b3ba6d4214 完善mk_transcode相关接口 ziyue 2023-02-11 11:35:37 +0800
• f6cba98a8e 修复FrameDispatcher可能导致死锁的问题 ziyue 2023-02-06 14:18:21 +0800
• 6eb36ec883 获取MediaSource信息相关接口返回帧数相关字段：#1570 xiongziliang 2023-02-05 22:04:14 +0800
• a0955d956a 优化代码风格 xiongziliang 2023-02-05 22:00:36 +0800
• fb5b31a85f 更新media-server,修复某些国标流兼容性问题 xiongziliang 2023-02-05 21:39:10 +0800
• a34c9079ba 有时候上游http协议不规范会导致直接输出eof, 特别是在自动重试机制开启下, 容易造成定时器没办法初始化从而拉不到流但是session一直存在,所以需要做一个判断,如果没数据直接报错 Alex 2023-02-05 16:24:42 +0800
• 7b59ad874a 部分hls中会出现类似[../]或者[./]的相对地址, 因此写了一个解析的方法 Alex 2023-02-05 16:17:01 +0800
• a52e9d6ba8 fix h264 no idr nal sps pps sei i slices xiongguangjie 2023-02-04 18:17:06 +0800
• 878f1a556e 更新zltoolkit，减缓udp网络接收线程漂移问题 ziyue 2023-02-02 11:59:40 +0800
• 6078ca3e81 修复hls注册抛异常可能导致的bug ziyue 2023-02-02 11:21:49 +0800
• b9e68882bd
  Create devcontainer.json #2190 fengshaoqi 2023-01-10 14:41:25 +0800
• 44f4e9acd4 openRtpServer udp多端口模式默认绑定发送端地址，防止多路同时推流时ssrc冲突问题 xiongziliang 2023-01-08 21:35:50 +0800
• fcf70c6ef1 startSendRtpPassive接口支持同时接收流 xiongziliang 2023-01-08 21:24:29 +0800
• 0374e7a660 startSendRtp接口支持同时接收流：#2109,#2149 xiongziliang 2023-01-07 22:36:30 +0800
• 3b3a83b524
  修复MediaSource在startSendRtp后无法注销的bug (#2187) Dw9 2023-01-07 21:31:46 +0800
• 3b39f1ea3d 格式化代码 #2187 xiongziliang 2023-01-07 21:29:27 +0800
• 7b5391e339
  Merge branch 'ZLMediaKit:master' into master Dw9 2023-01-06 22:36:36 +0800
• d3fffb7a56 修复mediasource在结束推流但在sendrtp时无法注销 Dw9 2023-01-06 22:30:55 +0800
• f5755a17e7 合并 #2183 ziyue 2023-01-02 12:04:06 +0800
• 08c47ff4f0 Merge branch 'feature/editable_rtsp_sdp' of github.com:a-ucontrol/ZLMediaKit ziyue 2023-01-02 11:59:56 +0800
• 77e46353ce 新增支持mjpeg es rtp流 ziyue 2022-12-30 18:04:15 +0800
• ae950606cb 修复JPEGTrack无法就绪的bug ziyue 2022-12-30 18:03:21 +0800
• fda77f0daf !23 fix typo in RtspSession.cpp * fix typo in RtspSession.cpp Ikko Ashimine 2022-12-30 09:15:14 +0000
• afa6465178 Changes to MP4Muxer for CodecJPEG #2183 Alexandr 2022-12-30 08:56:57 +0300
• 8bcc2cddc8 Build without usrsctp Alexandr 2022-12-30 08:51:37 +0300
• dc26bbf145 protected virtual bool sendRtspResponse(...) Alexandr 2022-12-30 08:50:30 +0300
• eed5f02380
  rtsp/rtp 新增支持mjpeg编码 (#2166) a-ucontrol 2022-12-21 10:32:16 +0300
• ca5d1d9fab 支持MJPEG #2166 ziyue 2022-12-21 14:55:37 +0800
• 6df0b7c74b add bom header ziyue 2022-12-21 14:45:24 +0800
• b9855f5be3 优化性能 ziyue 2022-12-21 13:38:45 +0800
• a08e37931d 支持mjpeg pix type ziyue 2022-12-21 13:10:31 +0800
• 855ba483a8 mjpeg rtp打包避免内存拷贝/修复mjpeg rtp解包huffman_table size字段错误的bug ziyue 2022-12-21 12:47:27 +0800
• d4c88b4864 getVideoHeight(), getVideoWidth() and getVideoFps() in JPEGTrack Alexandr 2022-12-19 18:36:44 +0300
• 09fcf769b0 处理转码和静音发生器冲突问题： 由于静音发生器产生的音频时间戳不连续，会导致转码出一大堆警告日志，并占用cpu 这变采用opus静音发生器来伪造rtc静音，而不是用转码： cqm 2022-11-17 12:43:30 +0800
• 2a6013a3b8 实现音频转码功能: - 启用rtc:// schecma - 增加音频转码码率配置 - aac转码使用原通道数 cqm 2022-06-01 18:30:40 +0800
• f8bd7f606e 支持多种类型的静音发生器 cqm 2022-10-27 16:23:20 +0800
• 3def04b40e RtpCodec保存和还原Rtp seq cqm 2022-11-30 16:32:50 +0800
• fdbd553e25 增加FFmpegEncoder和test_audio_transcode, 主要修改有: - 使用FFmpegAudioFifo来简化代码 - 修复转码时间戳不规则递增，导致的音频破音和不连续问题 - 使用double来保存_tsp，避免出现2.5ms的frame_size(ffmpeg内置的opus) cqm 2022-05-31 17:10:02 +0800
• 05371e9b84 AacTracker 增加构造函数 cqm 2022-06-01 11:35:52 +0800
• fda69e2a8e Modified JPEGRtpEncoder::inputFrame and JPEGRtpEncoder::rtp_send_jpeg Alexandr 2022-12-18 18:18:09 +0300
• c295c6a238 FrameJPEG renamed to JPEGFrame according to ZLM style Alexandr 2022-12-17 19:44:10 +0300
• 00a6d11b80 Micro fix Alexandr 2022-12-17 13:07:11 +0300
• fb22a4aa48 完善jpeg相关逻辑 xiongziliang 2022-12-17 16:34:26 +0800
• 8005c2b5ba 优化代码 xiongziliang 2022-12-17 15:12:30 +0800
• d7356137f4 Merge branch 'feature/jpeg' of github.com:a-ucontrol/ZLMediaKit xiongziliang 2022-12-17 14:37:59 +0800
• 6810952508 Improved JPEGRtpEncoder::inputFrame code but still not working Alexandr 2022-12-16 17:41:01 +0300
• 7b265ababc Trying to send mjpeg via MultiMediaSourceMuxer Alexandr 2022-12-15 19:28:28 +0300
• 96f549ab32 avoid bug for #2159 xiongguangjie 2022-12-15 19:17:09 +0800
• f6a36180b4 修复webrtc转发可能内存越界的bug: #2159 monktan89 2022-12-14 15:08:59 +0800
• 56ccd4332a 提高rtsp播放器兼容性: #2159 monktan89 2022-12-14 15:08:24 +0800
• 9d40c82141 修复手机推rtc,其他协议拉流画面旋转 Dw9 2022-12-08 21:52:55 +0800
• 04422b31b6 完善非法url提示:#2129 xiongziliang 2022-12-04 16:21:08 +0800
• f05a9501fa
  Unified code style (#2137) 老衲不出家 2022-12-02 14:43:06 +0800
• 2bf895fdcd Unified code style #2137 monktan89 2022-12-01 16:23:18 +0800
• a12b7c8021 修正代码拼写错误 monktan89 2022-11-30 18:24:35 +0800
• 68ea5465cc 修复addStreamProxy后，马上startSendRtp，触发的无人观看事件回调是MediaSourceNull的信息，导致无法关闭流bug(#2120) monktan89 2022-11-29 11:33:16 +0800
• 754073918a
  Header refactor (#2115) mtdxc 2022-11-29 11:07:13 +0800
• 59ecdd13e5 fix: WebRtcTransport 切换 poller 线程时，创建 WebRtcSession 不需要加锁 Johnny 2022-11-28 17:52:28 +0800
• bc4fa2bc53
  fix(rtcp/bye): 收到rtcp bye时不断开webrtc连接 (#2123) johzzy 2022-11-28 17:52:37 +0800
• 2f39d60ad1 fix(rtcp/bye): bye(203) 会在 sender audio track mute 时出现, 不能作为 shutdown 的依据 #2123 Johnny 2022-11-28 17:36:19 +0800
• 6c655810ec 修复on_err事件死循环的bug: #2121 ziyue 2022-11-28 14:28:56 +0800
• fef9d31631
  webrtc支持通过http参数指定是否优先tcp模式 (#2105) Dw9 2022-11-27 12:43:16 +0800
• 45388d5c56 force_tcp改成perferred_tcp #2105 xiongziliang 2022-11-27 12:40:51 +0800
• 31b2aacab3 Merge branch 'master' of github.com:Dw9/ZLMediaKit xiongziliang 2022-11-27 12:30:33 +0800
• 50fa671564 修复析构中调用getOwnerPoller抛异常导致崩溃的bug:#2117 xiongziliang 2022-11-26 10:14:37 +0800
• 05c3bab7bc 删除多余的Stamp.h和Base64包含 #2115 cqm 2022-11-25 12:29:58 +0800
• baf69905e2 规范.h头文件包含，并将其移到.cpp中: - 尽量不包含Common\config.h - Util\File.h - Rtsp/RtspPlayer.h - Rtmp/RtmpPlayer.h cqm 2022-11-25 18:54:45 +0800
• 45cc14a7d5 webrtc头文件重构 cqm 2022-11-25 18:55:04 +0800
• 16c48e967d Rtsp头文件重构 cqm 2022-11-23 10:46:00 +0800
• 27fd74d896 Rtmp头文件重构 cqm 2022-11-23 10:05:33 +0800
• 2889335803 MediaSource头文件重构, 独立出PacketCache.h 精简Frame和Track的头文件 cqm 2022-11-25 21:00:01 +0800
• 09fb5346c5 将MediaSinkDelegate和Demux移到MediaSink中 cqm 2022-08-29 10:40:28 +0800
• a0946b26e1 优化MultiMediaSourceMuxer头文件包含 cqm 2022-06-17 12:55:13 +0800
• 5b061ffafe put input and output parameters of ffmpeg in quotes, in case of some special chars (space, & etc.) cause unexpected failure #2107 Aven 2022-11-23 00:41:17 +0800
• a3b30da3b1 webrtc push/play支持通过http参数指定tcp Dw9 2022-11-21 22:43:28 +0800
• 9fd5152aa1 确保webrtc关闭udp模式时可用 ziyue 2022-11-19 09:52:10 +0800
• d910c80a00 优化webrtc iceandidate端口相关代码 ziyue 2022-11-19 09:46:04 +0800
• a9e53aae70 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit ziyue 2022-11-19 09:38:44 +0800
• 188ee1f61a 消除编译警告 ziyue 2022-11-19 09:37:49 +0800
• 68948288e0 TcpSession/UdpSession统一为Session类 ziyue 2022-11-19 09:33:10 +0800
• 0d6fa1281a add rtc tcp port config and ignore candidate when port is 0 xiongguangjie 2022-11-19 01:51:53 +0800