Commit Graph - srs - LiJianlong Git

Commit Graph

Select branches

Hide Pull Requests

1.0release

2.0release

3.0release

4.0release

5.0release

6.0release

develop

duiniuluantanqin-patch-1

feature/gb28181

feature/h265

feature/simulcast

fossa

master

min

#1003

#1003

#1033

#1038

#1039

#1045

#1055

#1055

#1077

#1080

#1083

#1106

#1106

#1109

#1119

#1119

#1127

#1127

#1146

#1146

#1150

#1150

#1176

#1178

#1178

#1212

#1212

#1236

#1237

#1247

#1249

#1256

#1261

#1263

#1265

#1268

#1274

#1276

#1285

#1294

#1304

#1312

#1317

#1321

#1324

#133

#1339

#1350

#1351

#1382

#1398

#1421

#1536

#1551

#1560

#1561

#1566

#1568

#1580

#1582

#1583

#1584

#1585

#1587

#1596

#1597

#1599

#1600

#1602

#1611

#1612

#1615

#1620

#1621

#1622

#1625

#1631

#1633

#1636

#1637

#1638

#1642

#1649

#1651

#1653

#1654

#1656

#1658

#1659

#1661

#1666

#1672

#1679

#1682

#1684

#1691

#1692

#1721

#1747

#1748

#1753

#1754

#1758

#1772

#1788

#1804

#1805

#1809

#1830

#1831

#1832

#1833

#1841

#1841

#1859

#1872

#1872

#1882

#1887

#1890

#1895

#1908

#1919

#1924

#1925

#1926

#1927

#1929

#1940

#1949

#1963

#1969

#1971

#1978

#1988

#1997

#1998

#2011

#2012

#2014

#2023

#2024

#2033

#2033

#2034

#2036

#2037

#2039

#2042

#2057

#2066

#2075

#2080

#2083

#2104

#2109

#2121

#2128

#2132

#2138

#2144

#2145

#2156

#2157

#2164

#2168

#2169

#2186

#2199

#2200

#2203

#2204

#2213

#2245

#2252

#2257

#2258

#2261

#2261

#2275

#2282

#2283

#2284

#2285

#2303

#231

#231

#2315

#2324

#2329

#2344

#2352

#2357

#2359

#2363

#2366

#2367

#2373

#2374

#2378

#2379

#2380

#2382

#2384

#2385

#2397

#2401

#2404

#2418

#2420

#2429

#2435

#2438

#2440

#2441

#2444

#2447

#2448

#2452

#2455

#2459

#2461

#2464

#2466

#2470

#2473

#2474

#2478

#2482

#2483

#2486

#2487

#2491

#2493

#2494

#2502

#2505

#2506

#2509

#2514

#2517

#2521

#2524

#2525

#2526

#2527

#2533

#2534

#2536

#2537

#2540

#2542

#2543

#2544

#2545

#2549

#2550

#2552

#2572

#2573

#2578

#2579

#2580

#2581

#2582

#2593

#2604

#2605

#2609

#2614

#2618

#2622

#2627

#2629

#2630

#2635

#2636

#2639

#2643

#2646

#2647

#2648

#2649

#2650

#2652

#2654

#2657

#2659

#2665

#2668

#2669

#2670

#2671

#2675

#2678

#2679

#2683

#2683

#2686

#2687

#2692

#2697

#2701

#2702

#2706

#2707

#2708

#2710

#2711

#2714

#2721

#2722

#2729

#2733

#2738

#2751

#2752

#2757

#2765

#2766

#2768

#2771

#2772

#2775

#2781

#2784

#2786

#2792

#2798

#2799

#2800

#2802

#2803

#2809

#2816

#2820

#2822

#2827

#2832

#2836

#2838

#2840

#2844

#2847

#2851

#2859

#2863

#2867

#2870

#2871

#2872

#2873

#2875

#2878

#2880

#2882

#2886

#2887

#2888

#2895

#2896

#2908

#2914

#2917

#2919

#2921

#2925

#2926

#2926

#2927

#2928

#2939

#2941

#2943

#2948

#2955

#2960

#2960

#2965

#2966

#2967

#2970

#2988

#2988

#2990

#3001

#3001

#3010

#3017

#3040

#3040

#3050

#3059

#3062

#3067

#3078

#3078

#3079

#3083

#3084

#3085

#3086

#3086

#3089

#3089

#3101

#3101

#3105

#3107

#3115

#3126

#3126

#3127

#3128

#3150

#3152

#3153

#3159

#3160

#3162

#3166

#3177

#3181

#3184

#3186

#3187

#3189

#3195

#3197

#3200

#3201

#3202

#3212

#3217

#3219

#3223

#3224

#3232

#3236

#3240

#3242

#3246

#3247

#3248

#3250

#3255

#3257

#3258

#3259

#3260

#3262

#3263

#3264

#3265

#3266

#3268

#3269

#3270

#3272

#3273

#3274

#3275

#3276

#3277

#3278

#3279

#3281

#3282

#3284

#3286

#3287

#3289

#3291

#3292

#3295

#3296

#3301

#3302

#3305

#3306

#3308

#3310

#3311

#3315

#3318

#3321

#3323

#3324

#3327

#3333

#3341

#3345

#3348

#3349

#3352

#3353

#3354

#3355

#3356

#3358

#3360

#3362

#3363

#3365

#3366

#3367

#3367

#3370

#3371

#3374

#3375

#3379

#3380

#3382

#3383

#3384

#3385

#3386

#3389

#3392

#3393

#3394

#3396

#3400

#3404

#3408

#3409

#3411

#3416

#3423

#3424

#3425

#3425

#3426

#3427

#3429

#3432

#3432

#3438

#3441

#3445

#3446

#3450

#3455

#3456

#3458

#3460

#3465

#3470

#3473

#3473

#3475

#3475

#3477

#3482

#3494

#3494

#3495

#3503

#3507

#3509

#3513

#3515

#3518

#3534

#3538

#3539

#3541

#3551

#3565

#3567

#3568

#3569

#3570

#3571

#3578

#3579

#3581

#3591

#3592

#3594

#3595

#3596

#3597

#3598

#3599

#3605

#3606

#3606

#3607

#3609

#3611

#3615

#3618

#3618

#3695

#3696

#3699

#3703

#3716

#3722

#3743

#3747

#3748

#3748

#3750

#3758

#3759

#3768

#3774

#3775

#3776

#3777

#3779

#3781

#3782

#3793

#3794

#3795

#3804

#3806

#3807

#3808

#3810

#3811

#3815

#3816

#3822

#3824

#3825

#3827

#3828

#3837

#3840

#3841

#3845

#3846

#3847

#3851

#3852

#3854

#3856

#3858

#3868

#3869

#3879

#3882

#3883

#3886

#3891

#3902

#3910

#3911

#3914

#3916

#3920

#3923

#3924

#3925

#3947

#3947

#3949

#3949

#3956

#3958

#3964

#3973

#3977

#3979

#3981

#3981

#3983

#3987

#3987

#3989

#3990

#3995

#3997

#3997

#4005

#4024

#4028

#4029

#4030

#4033

#4038

#4042

#4044

#4049

#4057

#4063

#4064

#4071

#4072

#4073

#4073

#4077

#4080

#4083

#4084

#4085

#4086

#4087

#4088

#4089

#4092

#4097

#4100

#4101

#4102

#4106

#4109

#4111

#4114

#4115

#4116

#4120

#4120

#4126

#4127

#4131

#4141

#4142

#4144

#4149

#4150

#4152

#4153

#4154

#4156

#4157

#4158

#4159

#4159

#4160

#4161

#4161

#4162

#4164

#4165

#4166

#4171

#4174

#4174

#4184

#4184

#4185

#4186

#4186

#4190

#4199

#4199

#4201

#4211

#4211

#4216

#4217

#4217

#4218

#4222

#4222

#4225

#4225

#4227

#4227

#4230

#4230

#4232

#4235

#4235

#4243

#4243

#4245

#4245

#4247

#4252

#4252

#4253

#4265

#4265

#427

#4270

#4270

#4271

#4276

#4276

#4289

#4289

#4291

#4292

#4292

#4294

#4294

#4295

#4295

#4296

#4296

#4297

#4297

#444

#444

#483

#499

#505

#505

#510

#522

#528

#528

#530

#537

#537

#549

#549

#555

#555

#556

#556

#558

#559

#563

#563

#571

#573

#573

#587

#609

#609

#638

#649

#667

#667

#668

#668

#691

#691

#737

#745

#745

#746

#746

#747

#747

#748

#749

#749

#756

#763

#774

#776

#776

#777

#779

#782

#782

#783

#784

#788

#788

#790

#794

#794

#800

#813

#816

#816

#823

#836

#841

#849

#849

#854

#860

#867

#867

#874

#876

#881

#891

#899

#902

#902

#908

#908

#970

#970

#978

#987

#987

#988

v0.1.0

v0.2.0

v0.3.0

v0.4.0

v0.5.0

v0.6.0

v0.7.0

v0.8.0

v0.9.0

v1.0-r0

v1.0-r1

v1.0-r2

v1.0-r3

v1.0-r4

v2.0-a0

v2.0-a1

v2.0-a2

v2.0-a3

v2.0-b0

v2.0-b1

v2.0-b2

v2.0-b3

v2.0-b4

v2.0-r0

v2.0-r1

v2.0-r10

v2.0-r11

v2.0-r2

v2.0-r3

v2.0-r4

v2.0-r5

v2.0-r6

v2.0-r7

v2.0-r8

v2.0-r9

v3.0-a0

v3.0-a1

v3.0-a2

v3.0-a3

v3.0-a4

v3.0-a5

v3.0-a6

v3.0-a7

v3.0-a8

v3.0-a9

v3.0-b0

v3.0-b1

v3.0-b2

v3.0-b3

v3.0-b4

v3.0-r0

v3.0-r1

v3.0-r2

v3.0-r3

v3.0-r4

v3.0-r5

v3.0-r6

v3.0-r7

v3.0-r8

v4.0-b0

v4.0-b1

v4.0-b10

v4.0-b2

v4.0-b3

v4.0-b4

v4.0-b5

v4.0-b6

v4.0-b7

v4.0-b8

v4.0-b9

v4.0-r0

v4.0-r1

v4.0-r2

v4.0-r3

v4.0-r4

v4.0-r5

v5.0-a0

v5.0-a1

v5.0-a2

v5.0-a3

v5.0-a4

v5.0-a5

v5.0-b0

v5.0-b1

v5.0-b2

v5.0-b3

v5.0-b4

v5.0-b5

v5.0-b6

v5.0-b7

v5.0-r0

v5.0-r1

v5.0-r2

v5.0-r3

v6.0-a0

v6.0-a1

v6.0-d0

v6.0-d1

v6.0-d2

v6.0-d3

v6.0-d4

v6.0-d5

v6.0-d6

v6.0.10

v6.0.36

v6.0.45

v6.0.48

e694939e6f

Merge 370b9b71b1 into 93cba246bc Laurentiu 2025-03-12 17:08:51 +0800
90b5e2a405

Merge 1ff0344f34 into 93cba246bc Haibo Chen(陈海博) 2025-03-12 17:08:51 +0800
888f3a5db8

Merge 8f67b51d19 into 93cba246bc Arjen10 2025-03-12 17:08:50 +0800
0689346a5c

Merge 0e12bd0252 into 93cba246bc Mr. Li 2025-03-11 15:13:42 +0800
d3bf533877

Merge e93abb67b3 into bd333fe7b4 chundonglinlin 2025-03-11 09:39:45 +0800
cb6108f056

Merge 4bac70d155 into 93cba246bc chundonglinlin 2025-03-06 14:15:48 +0800
4bac70d155 Update release to v6.0.162 v7.0.24 john 2025-03-06 14:15:40 +0800
ea01064c44

Merge 4a1c409929 into 93cba246bc Haibo Chen 2025-03-04 08:02:59 +0000
4a1c409929 prevent memory leaks Haibo Chen 2025-03-04 15:59:56 +0800
97bf4c7d05

Merge f6238c2fc3 into 93cba246bc Yan Naing Tun 2025-03-04 04:49:13 +0000
f6238c2fc3

Update srs_protocol_http_stack.cpp Yan Naing Tun 2025-03-04 12:49:10 +0800
8b5741882b

Update CMakeLists.txt Yan Naing Tun 2025-03-04 11:43:54 +0800
b7766637d4

Update json2.js Yan Naing Tun 2025-03-04 11:31:22 +0800
b39389ade4

Merge cf1fae1dca into 93cba246bc Parallelc 2025-03-04 10:05:06 +0800
cf1fae1dca

Merge branch 'develop' into bugfix/missing-msid-in-play-answer Haibo Chen 2025-03-04 10:05:04 +0800
133795193a Fix HTTP parser vulnerability to prevent request smuggling yannaingtun 2025-02-28 00:12:14 +0800
a9bd0513e4

Merge 7dd54399eb into 93cba246bc Jacob Su 2025-02-26 10:01:16 +0000
f2ee75119a

Merge 32152626a7 into 93cba246bc Jacob Su 2025-02-26 10:01:16 +0000
b1185d588f fix typo about heartbeat. v6.0.161 (#4253) 6.0release john 2025-02-24 21:03:17 +0800
bd333fe7b4 fix typo about heartbeat. v5.0.220 (#4253) 5.0release john 2025-02-24 21:02:31 +0800
2ce08750e7 fix ci error. v6.0.160 (#4291) john 2025-02-24 19:39:20 +0800
5851fa05d2 fix ci error. v5.0.219 (#4291) john 2025-02-24 19:37:23 +0800
02c6e60e3a update copyright to 2025. v6.0.159 (#4271) john 2025-02-24 19:34:34 +0800
4526a8b781 update copyright to 2025. v5.0.218 (#4271) john 2025-02-24 19:30:55 +0800
4733e7f087 Fix HEVC STAP payload decoding in RTP Haibo Chen 2025-02-24 14:39:10 +0800
6363ed3e27 Fix HLS logging error Haibo Chen 2025-02-24 14:33:48 +0800
d32a11a26e

Merge da7c5331c5 into 93cba246bc Jacob Su 2025-02-23 23:47:04 +0700
aab7ad5cc1

Merge 90e0131dc0 into 93cba246bc Jacob Su 2025-02-23 20:27:46 +0800
55241b4244 Dvr: support h265 flv fragments.(#4280) chundonglinlin 2025-02-23 20:14:03 +0800
deaf6cde53

Merge cbecd3816e into 93cba246bc chundonglinlin 2025-02-22 17:03:10 +0000
cbecd3816e Remove redundant check. chundonglinlin 2025-02-23 00:32:12 +0800
c2e31d1578 Modify the play stream to specify encoding format. chundonglinlin 2025-02-22 23:23:10 +0800
e54613d43d

Merge a9694ac90c into 93cba246bc sangbumlikeagod 2025-02-22 13:24:16 +0000
a9694ac90c

Merge branch 'develop' into bugfix/bug-summary sangbumlikeagod 2025-02-22 22:24:13 +0900
957ee4cc25 support audio jitter buffer. chundonglinlin 2025-02-22 19:55:07 +0800
0eb4024437

Merge d0d315c38b into 93cba246bc xNyapAe3 2025-02-22 12:15:03 +0800
a853130dba

Merge f59a504173 into 93cba246bc Jacob Su 2025-02-22 00:25:12 +0300
6de13f9dc3

Merge 9c481965d8 into 93cba246bc chundonglinlin 2025-02-21 23:43:14 +0800
9c481965d8 Update build version to v7. chundonglinlin 2025-02-21 23:39:52 +0800
8953dbfba1 Optimize init h265 track and format. chundonglinlin 2025-02-21 23:05:39 +0800
2c1c903b8b

Merge 8a9ab1147c into 93cba246bc Jacob Su 2025-02-20 14:34:33 -0500
8daf078ecd

Merge 332285655c into 93cba246bc Shengming Yuan 2025-02-20 19:32:30 +0000
332285655c

Merge branch 'develop' into develop Shengming Yuan 2025-02-20 14:32:26 -0500
9dde6fd419

Merge f0c60bb8c9 into 93cba246bc Eason 2025-02-20 16:54:15 +0800
53be9a06af

Merge 644443f389 into 93cba246bc chai51 2025-02-20 16:02:59 +0800
d5d0194c97

Merge 128500be43 into 93cba246bc Lukas 2025-02-20 08:01:02 +0000
128500be43

Merge branch 'develop' into develop Haibo Chen 2025-02-20 16:00:55 +0800
83e8877623

Merge branch 'develop' into hevc_over_rtc Haibo Chen 2025-02-20 16:00:15 +0800
c542fe76e1

Merge d752a8f5e3 into 93cba246bc Jacob Su 2025-02-20 14:29:46 +0700
6d38331acb

Merge a2dd63b678 into 93cba246bc jkb3 2025-02-20 13:58:34 +0800
9f83d62ab8

Merge 62a544a3fd into 93cba246bc Jacob Su 2025-02-20 13:50:19 +0800
93cba246bc

fix typo about heartbeat. v5.0.220 v6.0.161 v7.0.23 (#4253) develop johzzy 2025-02-20 13:47:52 +0800
c11afbe059

Merge branch 'develop' into hevc_over_rtc Haibo Chen 2025-02-20 13:38:10 +0800
e391434929

Merge branch 'develop' into develop Haibo Chen 2025-02-20 13:36:50 +0800
33f13e0e92 Update release to v5.0.220 v6.0.161 v7.0.23 john 2025-02-20 12:29:29 +0800
71f12ab519 Merge branch 'develop' into pr-develop john 2025-02-20 12:29:29 +0800
6a612784d0

fix ci error. v5.0.219 v6.0.160 v7.0.22 (#4291) Haibo Chen 2025-02-20 12:26:24 +0800
86e083101a Update release to v5.0.219 v6.0.160 v7.0.22 duiniuluantanqin-patch-1 john 2025-02-19 22:22:22 +0800
83d577a49a define SrsAvcNaluTypeParse Haibo Chen 2025-02-19 16:33:24 +0800
b3c508534d remove unused code Haibo Chen 2025-02-19 15:40:05 +0800
8350881cad

Update test.yml Haibo Chen 2025-02-18 09:47:49 +0800
00238bb9a9

fix typo in log output Lukas 2025-02-17 12:52:47 +0100
77ee2190b6

Update test.yml Haibo Chen 2025-02-17 13:56:03 +0800
4890abcd1d

Update test.yml Haibo Chen 2025-02-17 13:39:04 +0800
c2d961277f

Update test.yml Haibo Chen 2025-02-17 10:31:58 +0800
6eff6b8c89

Update test.yml Haibo Chen 2025-02-17 10:28:28 +0800
9fce2a6783

Update test.yml Haibo Chen 2025-02-17 10:26:34 +0800
1a224c77de rtmp2rtc: support hevc chenhaibo 2025-02-16 09:19:48 +0800
370b9b71b1

Merge branch 'ossrs:develop' into develop Laurentiu 2025-02-07 18:30:58 +0200
5da92780fe

Merge 6c1aeb1809 into 13597d1b7f Jacob Su 2025-01-17 14:09:29 +0000
13597d1b7f

update copyright to 2025. v5.0.218 v6.0.159 v7.0.21 (#4271) ChenGH 2025-01-14 17:35:18 +0800
cf2029ce4f Update release to v5.0.218 v6.0.159 v7.0.21 john 2025-01-14 16:50:34 +0800
a2dd63b678 fix: Problem that the source is regularly cleared before setting the status after the stream publishing completes the create_of_fatch() operation khjiang 2025-01-08 16:09:09 +0800
4967f369c9

Merge branch 'develop' into develop Shengming Yuan 2025-01-08 02:22:47 -0500
0f7100769c

Merge e56f8b75be into 7416134262 Jason N. White 2025-01-01 02:42:26 -0500
e56f8b75be

Update LICENSE, fix license year JasonnnW3000 2025-01-01 02:42:18 -0500
9affdfda03 change log message sangbumlikeagod 2024-12-30 01:04:33 +0900
b320fdd909 fix naming issue sangbumlikeagod 2024-12-29 11:59:34 +0900
f8fd43816a replace range-base for loop for 'build-centos7' case sangbumlikeagod 2024-12-29 11:54:40 +0900
220f7431e1 handle exception for listen parameter doesn't exist sangbumlikeagod 2024-12-29 11:16:40 +0900
1e848d96e7 feat : 1. change api_listener_, apis_listener_, http_listener_, https_listener_ to SrsMultipleTcpListeners 2. for reusing ‘httpmux logic’. enable listener only when ‘api_listener’ and ‘http_listener’ have zero intersection, or ‘http_listener’ contains whole ‘api_listener’. same for ‘apis_listener_’ and ‘https_listeners_’. otherwise occurs error. sangbumlikeagod 2024-12-22 16:33:09 +0900
e9b4a3fcc8 feat : make SrsServer http listener to MultiTcpListneres sangbumlikeagod 2024-12-22 11:26:26 +0900
596f770cd0 fix typo about heartbeat Johnny 2024-12-09 11:02:12 +0800
2281dacdc3

WebRTC: Fix missing msid in play answer Parallelc 2024-12-08 00:37:15 +0800
2499a43349

Merge 15d6458b85 into 7416134262 accest 2024-12-05 16:57:38 +0800
7416134262

fix compile error in srs_protocol_rtmp_stack.cpp (#4247) Jacob Su 2024-12-05 16:53:22 +0800
99d08bd5eb fix compile error in srs_protocol_rtmp_stack.cpp Jacob Su 2024-11-29 21:52:29 +0800
eb3d700499 Allow env var to configure forward Shengming Yuan 2024-11-28 22:07:54 -0500
644443f389 WebRTC: fix h264 FU-A only one package chai51 2024-11-25 16:49:45 +0800
d0d315c38b Console: Add HTTP server port input box xNyapAe3 2024-11-16 15:16:26 +0800
00d14daa16 improve timestamp type: int -> uint. Jacob Su 2024-11-13 15:30:13 +0800
8a9ab1147c issue #3993: fix av off sync for mp4 dvr. Jacob Su 2024-11-12 16:45:34 +0800
32152626a7 Ignore RTC audio transcode error: AVERROR_INVALIDDATA. Jacob Su 2024-11-11 09:44:52 +0800
f59a504173 issue #4223: remove hls_acodec and hls_vcodec config. Jacob Su 2024-11-08 16:58:55 +0800
7dd54399eb fix rtc over tcp crash when stop rtc publish. Jacob Su 2024-11-05 22:12:43 +0800
d752a8f5e3 fix the ip address is included in SRSServer.API. Jacob Su 2024-11-01 10:44:40 +0800
7951bf3bd6

Test: Fix utest fail for StUtimeInMicroseconds. v7.0.20 (#4218) Jacob Su 2024-10-31 18:25:57 +0800
997a43f258 Update release to v7.0.20 winlin 2024-10-31 18:17:10 +0800
f58b7aeb05 Merge branch 'develop' into pr-fix/ut-utime winlin 2024-10-31 18:17:10 +0800