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

• 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
• 420df3ca28 格式化 Talus 2023-06-20 13:11:35 +0000
• 8b42d0c803 优化 Talus 2023-06-20 13:03:52 +0000
• 8b261222e9 支持限制rtsp rtp传输类型 Talus 2023-06-20 02:18:15 +0000
• ebd3e7f6be
  Merge branch 'ZLMediaKit:master' into master Luosh 2023-06-19 14:09:50 +0800
• 7e117b1c7f
  新增支持http-flv播放器 (#2562) 夏楚 2023-06-17 10:29:27 +0800
• 03770ff409
  Replace the tuple (vhost/app/stream) with MediaTuple. (#2560) johzzy 2023-06-17 10:28:01 +0800
• c0a7a4ab70
  优化cmake配置文件, 添加必要头文件 (#2558) tbago 2023-06-17 10:24:17 +0800
• 7b057c23f0 添加bom头 xia-chu 2023-06-17 10:18:34 +0800
• 2410419911 忽略非法的rtcp ntp时间戳 xia-chu 2023-06-17 10:13:29 +0800
• 81bd9916ac update readme xia-chu 2023-06-17 09:24:40 +0800
• ea58988541 新增支持http-flv播放器 xia-chu 2023-06-17 09:22:13 +0800
• ccddb84a19 修复跨域问题: #2548 xia-chu 2023-06-17 09:15:50 +0800
• 72ba87c803 修复mk_media_source_get_track接口崩溃问题:#2552 xia-chu 2023-06-17 09:14:51 +0800
• 5dbe05dd16 修改一些cmake配置文件 tbago 2023-06-15 22:31:50 +0800
• 975df9d839 Replace the tuple (vhost/app/stream) with MediaTuple. Johnny 2023-06-16 15:29:50 +0800
• 23e24d07e6
  解决存在b帧情况下,rtsp播放不同步问题 (#2550 #2549) Luosh 2023-06-13 17:39:43 +0800
• 2209079aef 解决存在b帧情况下,rtsp播放不同步问题 Luosh 2023-06-13 17:05:54 +0800
• 5ca4ed53b2
  防止析构函数抛异常导致崩溃问题 (#2546) 夏楚 2023-06-11 22:07:15 +0800
• 0a93a0482e 防止析构函数抛异常导致崩溃问题 xiongziliang 2023-06-11 09:45:00 +0800
• fe37005526 兼容http body超过声明大小的情况 xiongziliang 2023-06-11 09:21:15 +0800
• 5f936663b4
  统一处理content-length, 修复http get请求带body不兼容问题(#2528 #2544) 夏楚 2023-06-10 20:49:21 +0800
• 6523b741d7 修复websocket服务生效问题 xia-chu 2023-06-10 18:52:25 +0800
• 67d5c42007
  Fix addStreamProxy rtsp url user or pass contain special char result in auth failed (#2545) xiongguangjie 2023-06-10 18:46:30 +0800
• 338aa42230 更新ZLToolKit xia-chu 2023-06-10 18:40:24 +0800
• 2c115f240a 优化http服务器 xia-chu 2023-06-10 18:20:22 +0800
• 24fb666fb3 新增mk_media_source_get_track方法: #2530 xia-chu 2023-06-10 09:34:00 +0800
• d3f1c2fab1
  mp4录制文件名添加索引号，防止一秒内生成多个同名文件导致覆盖 (#2542) 夏楚 2023-06-10 14:56:23 +0800
• 64b8079ac1 优化函数命名风格 xia-chu 2023-06-10 12:28:49 +0800
• 31944a92ad 重写Parser代码实现 xia-chu 2023-06-10 12:22:28 +0800
• af0ebf4633 优化Parser代码命名 xia-chu 2023-06-10 11:04:52 +0800
• 52c7bc1d34 精简HttpServer代码 xia-chu 2023-06-10 10:16:45 +0800
• fff53cf0e2 格式化HttpSession.cpp代码 xia-chu 2023-06-10 09:45:46 +0800
• 7fbbac826f 优化函数命名风格 xia-chu 2023-06-10 12:28:49 +0800
• 1a129a9804 重写Parser代码实现 xia-chu 2023-06-10 12:22:28 +0800
• 01540174a4 优化Parser代码命名 xia-chu 2023-06-10 11:04:52 +0800
• cdd74931f2 精简HttpServer代码 xia-chu 2023-06-10 10:16:45 +0800
• cb83c8fc9e 格式化HttpSession.cpp代码 xia-chu 2023-06-10 09:45:46 +0800
• 248b363ad5 mp4录制文件名添加索引号，防止一秒内生成多个同名文件导致覆盖 xia-chu 2023-06-10 09:36:18 +0800
• 4c0e15600f 新增mk_media_source_get_track方法: #2530 xia-chu 2023-06-10 09:34:00 +0800
• a186249722 move strcodeing to common and fix rtsp url user or pass decoding xiongguangjie 2023-06-10 08:20:09 +0800
• a2a3aab203 fix http get carry body #2528 xiongguangjie 2023-06-06 19:23:15 +0800
• 7e1078bbcc
  Update submodule ZLToolKit (#2529) a-ucontrol 2023-06-06 04:23:34 +0300
• 4b9a0f58b6 Update submodule ZLToolKit Alexandr 2023-06-05 18:07:03 +0300
• e4acc59bec
  媒体时间戳默认改为相对时间戳，通过时间戳矫正器解决跳跃和回退问题 (#2523) 夏楚 2023-06-03 17:34:34 +0800
• 525c1aebc4
  Update config.ini 夏楚 2023-06-02 22:24:35 +0800
• 3577a76a28 媒体时间戳默认改为相对时间戳，通过相对时间戳矫正器解决时间戳跳跃和回退问题 xiongziliang 2023-06-02 22:00:43 +0800
• af57691bc8 c++14相关代码替换为c++11代码 xiongziliang 2023-06-02 21:43:24 +0800
• 7970138966
  Fix MP4Reader available speed range bug (#2516) fruit Juice 2023-06-01 14:29:19 +0800
• 42e14b11de Revert "Update Stamp.h" xingqiao 2023-06-01 14:13:50 +0800
• 877af1b62b
  Update Stamp.h 百鸣 2023-06-01 14:09:50 +0800
• 94d1015640 fix mp4reader speed bug xuandu 2023-06-01 13:20:33 +0800
• f241669dee
  Merge branch 'ZLMediaKit:master' into master 百鸣 2023-06-01 11:32:12 +0800
• 14537bfbc7
  解决ws-flv和http-flv的累积时延问题(#2509) 百鸣 2023-05-31 23:16:16 +0800
• fc030a30a8
  Update HttpSession.cpp 百鸣 2023-05-31 11:18:57 +0800
• 11a39c68c4
  修复海康rtsp点播拉流seek相关bug(#2501 #2511) xiongguangjie 2023-05-31 09:59:41 +0800
• e6e8717db0 format rtsp player code style xiongguangjie 2023-05-30 22:50:59 +0800
• 473bb5ca1b fix hik rtsp record video pull bug #2501 xiongguangjie 2023-05-30 18:36:25 +0800
• 62b04a4586
  Merge pull request #2 from ZLMediaKit/master ljx0305 2023-05-30 14:35:00 +0800
• 3d2fd42f29
  Update HttpSession.cpp 百鸣 2023-05-30 14:24:54 +0800
• 0dc95cb85b
  Update HttpSession.cpp 百鸣 2023-05-30 11:25:19 +0800
• 0232caf068 add MediaTuple Johnny 2023-05-25 16:23:24 +0800
• f4ee607feb add RtspMediaSource::Clone Johnny 2023-05-11 20:47:40 +0800
• ac15502f7b add MediaTuple Johnny 2023-05-25 16:23:24 +0800
• faeec8398a add RtspMediaSource::Clone Johnny 2023-05-11 20:47:40 +0800
• 51e9313275
  Make available the media_info variable for the class inherited from WebRtcSession and HttpSession. (#2505 #2461) a-ucontrol 2023-05-29 09:48:13 +0300
• ce851cfe57 Make available the media_info variable for the class inherited from WebRtcSession and HttpSession. https://github.com/ZLMediaKit/ZLMediaKit/issues/2461#issue-1707625723 Alexandr 2023-05-28 16:44:31 +0300
• 18dbbc8d19
  降低TCP RTP 2字节头被误判为EHOME头的风险 (#2502) dengjfzh 2023-05-27 22:27:10 +0800
• 599fa71ef9 降低TCP RTP 2字节头被误判为EHOME头的风险 dengjfzh 2023-05-26 21:55:43 +0800
• 032a2ac91d
  修复TCP RTP 2字节头被误判为4字节头的问题 (#2499) dengjfzh 2023-05-26 17:34:47 +0800
• 3f447246c2
  使用SDL_OpenAudioDevice接口打开音频设备 (#2489) PioLing 2023-05-26 17:02:21 +0800
• bfd4de44f3 降低RFC4571数据被误认为是RTSP Interleaved数据的风险。 dengjfzh 2023-05-26 16:30:37 +0800
• f7ecf9d1aa
  修正获取socket端口来自udp或tcp端口池 ljx0305 2023-05-26 14:13:34 +0800
• 97d53824d5
  Merge pull request #1 from ZLMediaKit/master ljx0305 2023-05-26 14:05:27 +0800
• 936babf459 新增mk_media_source_find2接口 xia-chu 2023-05-25 16:57:03 +0800
• e17ee3fa04 修改说明 cqm 2023-05-24 23:51:54 +0800
• d6e6e61ad7 增加转码配置说明 cqm 2023-05-24 23:32:39 +0800
• ca0f795a03 修改国标rtp分包对于ehome协议的处理，添加rtp协议dump原始数据流 xuxiping 2023-05-24 18:09:19 +0800
• a146896b96 use new sdl2.0 SDL_OpenAudioDevice() function instead of SDL_OpenAudio() admin 2023-05-24 16:01:28 +0800
• d4f8017117 修复mk_tcp_session_ref相关接口误导性注释 xia-chu 2023-05-24 10:50:49 +0800
• efe1c5244a Improved vlc behavior. https://github.com/ZLMediaKit/ZLMediaKit/issues/2416#issue-1681232888 Alexandr 2023-05-22 09:57:45 +0300
• 0363c17263 Revert "Improved vlc behavior. https://github.com/ZLMediaKit/ZLMediaKit/issues/2416#issue-1681232888" Alexandr 2023-05-22 09:54:57 +0300
• 7cb772c564 On arm need align, without this the application crashed after SIGBUS Alexandr 2023-05-21 17:38:40 +0300
• 60364f8995 Improved vlc behavior. https://github.com/ZLMediaKit/ZLMediaKit/issues/2416#issue-1681232888 Alexandr 2023-05-21 17:13:01 +0300
• 944f7eef96 Make available the media_info variable for the class inherited from WebRtcSession and HttpSession. https://github.com/ZLMediaKit/ZLMediaKit/issues/2461#issue-1707625723 Alexandr 2023-05-21 17:09:43 +0300
• 7e4010df83
  修复startSendRtp接口gop缓存功能可能失效的问题 (#2455) Kiki 2023-05-18 16:35:54 +0800
• c03d66cf04 fix the first 264-ps-rtp-idr has no sps/pps, when there is aud/sei between sps/pps and idr kiki 2023-05-18 14:58:59 +0800
• 15e76293d0
  readme新增多语言跳转链接 (#2465) 夏楚 2023-05-14 10:19:07 +0800
• fb3128a63c 修复跳转中文失败问题 xiongziliang 2023-05-14 10:17:57 +0800
• 4da5ad013f readme新增多语言跳转链接 xiongziliang 2023-05-14 10:16:24 +0800
• cb362371b9
  更新zltoolkit, 修复iOS下编译问题 (#2464) 夏楚 2023-05-14 10:10:08 +0800
• 9ed247bc9a 更新zltoolkit, 修复 #2459 xiongziliang 2023-05-14 09:59:38 +0800
• 4f6e32b510
  mk_media_input_aac接口可以不指定adts头(#2463) 夏楚 2023-05-14 09:57:59 +0800
• 8ba6740b33 fix #2432 xiongziliang 2023-05-14 09:46:14 +0800
• 4fa04d6a37 优化PlayerProxy代码 xia-chu 2023-05-13 00:14:35 +0800
• 0afe75229e 修复拉流代理获取流信息可能访问空指针的bug xia-chu 2023-05-13 00:02:06 +0800
• f6ac39ade5
  新增允许所有跨域请求配置项 (#2449) 老衲不出家 2023-05-12 11:47:22 +0800