Commit Graph

Select branches

Hide Pull Requests

1.0release

2.0release

3.0release

4.0release

5.0release

6.0release

develop

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

#4253

#4265

#4265

#427

#4270

#4270

#4271

#4276

#4276

#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

Mono Color

• a0ecc5a305 finger out the PES_packet_length is 0 winlin 2013-11-21 22:33:32 +0800
• dc7f2cff86 remove the unused h264 enums winlin 2013-11-21 20:34:59 +0800
• 3913e46ba5 fix bug of ts_info winlin 2013-11-20 23:48:21 +0800
• af5ce26746 finger out the ts audio/video package for AACADTS and H264NAL winlin 2013-11-20 23:07:59 +0800
• 54a1116f7a add ts analysis file winlin 2013-11-20 20:50:31 +0800
• 974af0605b fix protocol decode PCUC packet bug, requires 4bytes winlin 2013-11-20 20:41:46 +0800
• bc8828a7de update the random generater winlin 2013-11-20 14:52:47 +0800
• 4bba9ddcbb add ts_info doc winlin 2013-11-20 11:51:07 +0800
• c350a182b7 link the -lcrypto winlin 2013-11-20 10:13:38 +0800
• d1e20dc866 fix the global static instance error, use function to get server winlin 2013-11-20 10:08:52 +0800
• c79372417d parse the aac ADTS packets, add h264 doc winlin 2013-11-20 00:25:53 +0800
• f667351095 add aac specification, iso-13818-7 winlin 2013-11-19 23:03:05 +0800
• 1ae03a2ba0 parse video/audio message winlin 2013-11-19 18:38:33 +0800
• 6b75390476 add Makefile for ts_info winlin 2013-11-19 16:02:13 +0800
• 6d4e4d3da2 update the ts_info, parse the PES packet winlin 2013-11-19 14:06:28 +0800
• b2fe7fb8a1 update ts_info, parse the PES packet dts/pts. winlin 2013-11-19 11:06:28 +0800
• a47a53f271 update the ts_info parse the PMT and PES header winlin 2013-11-18 23:49:18 +0800
• 89332789d1 update ts_info, parse header, adaption field and PAT winlin 2013-11-17 23:34:36 +0800
• 611d2a7e46 update ts_info, parse header, adaption field and PAT winlin 2013-11-17 23:25:39 +0800
• 741564b809 add reference doc from vb winlin 2013-11-17 11:27:06 +0800
• 553eec5769 update readme winlin 2013-11-16 23:21:41 +0800
• c621be2247 add ts_info.cpp for HLS research winlin 2013-11-16 23:11:16 +0800
• 732b2bbc6e add hls specification winlin 2013-11-16 16:55:24 +0800
• d06d83fb96 add rtmp players winlin 2013-11-16 13:36:00 +0800
• 8745ab542b add rtmp players winlin 2013-11-16 13:30:12 +0800
• ff565c4d9b fix bug of amf0 decode winlin 2013-11-16 12:54:48 +0800
• bf1113dad7 add log for update video/audio sequence header winlin 2013-11-14 17:13:20 +0800
• 687d190da1 reset the audio sample size and video frame size when unpublish winlin 2013-11-13 13:29:03 +0800
• 0645f5e927 calc the delta for time jitter for video winlin 2013-11-12 18:41:22 +0800
• 8f528ae5b2 v0.4 released. 12500 lines. v0.4.0 winlin 2013-11-10 12:05:13 +0800
• b855caa045 refine handshake, pithy print clock winlin 2013-11-10 12:00:01 +0800
• 3669419e4c support config and reload the pithy print. winlin 2013-11-10 11:52:19 +0800
• 6c3b5943e9 add reload config comments for config. winlin 2013-11-09 22:53:59 +0800
• 0813104c6e support reload config(vhost and its detail). winlin 2013-11-09 22:47:27 +0800
• aef2fe9db5 support reload config(vhost and its detail). winlin 2013-11-09 22:46:50 +0800
• 68ccd7eb64 support reload config(listen and chunk_size) by SIGHUP(1). winlin 2013-11-09 22:41:44 +0800
• cc44329f37 support longtime(>4.6hours) publish/play. winlin 2013-11-09 20:59:28 +0800
• ed3525056c support config the chunk_size. winlin 2013-11-09 20:56:35 +0800
• c78af697a1 support pause for live stream. winlin 2013-11-09 11:49:38 +0800
• c77695ce55 add comments for extended-timestamp, always send the extended-timestamp even chunk type=0x03 winlin 2013-11-08 15:35:24 +0800
• 3f81cde997 update readme winlin 2013-11-04 23:25:14 +0800
• 151e243a98 update readme winlin 2013-11-04 23:23:13 +0800
• 883b054f9d update readme. winlin 2013-11-04 23:08:34 +0800
• 6e62efb9e6 update readme. winlin 2013-11-04 23:08:07 +0800
• c3700fe790 update readme. v0.3.0 winlin 2013-11-04 22:58:43 +0800
• fa858b7da7 update readme. winlin 2013-11-04 22:57:57 +0800
• 2c8d54dfcb release v0.3, 11773 lines winlin 2013-11-04 22:56:51 +0800
• 751323fac8 release v0.3, 11773 lines winlin 2013-11-04 22:55:19 +0800
• 58d9677ddd support vhosts specified config. winlin 2013-11-04 22:42:03 +0800
• 9f94f891ad delete the cache when unpublish, when publish the encoder will update it winlin 2013-11-03 19:57:54 +0800
• 6d4eb3d373 update Readme winlin 2013-11-02 19:54:49 +0800
• a5339c2a27 refine socket buffer, append bytes to vector directly winlin 2013-11-02 19:52:33 +0800
• c0b6982e0d support listen multiple ports. winlin 2013-11-02 19:32:52 +0800
• 2aa15a1134 support nginx-style config file winlin 2013-11-02 17:55:59 +0800
• 6e670627af merge from server winlin 2013-10-30 12:02:48 +0800
• 8ee307b0b4 update configure, try to detect the tools winlin 2013-10-30 12:01:35 +0800
• b9fe3ca695 Update configure winlin 2013-10-30 11:41:38 +0800
• 032d959d3f Merge branch 'master' of github.com:winlinvip/simple-rtmp-server winlin 2013-10-30 11:39:32 +0800
• a1a3a2eef9 add macro to disable the srs_trace winlin 2013-10-30 11:37:11 +0800
• db4375ece8 Update README.md winlin 2013-10-30 11:35:40 +0800
• b4427877f7 support pithy print log message specified by stage. winlin 2013-10-29 22:16:18 +0800
• 293399dcf5 fix bug of time jitter correcter winlin 2013-10-29 18:46:46 +0800
• 3aa6be8645 fix the timestamp bug. correct the audio diff by audiosamplerate winlin 2013-10-29 10:17:33 +0800
• a1f97954f5 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server winlin 2013-10-29 07:51:43 +0800
• bc79ee4361 support librtmp/ffmpeg without extended timestamp in 0xCX chunk packet. update signautre of server winlin 2013-10-29 07:51:08 +0800
• 3accc969ab update the signature of server winlin 2013-10-29 07:46:55 +0800
• 3c8e1f8ff7 fix bug of extended-timestamp, support librtmp/ffmpeg publish winlin 2013-10-28 22:09:11 +0800
• f15867d865 Update README.md winlin 2013-10-27 11:29:12 +0800
• 0ed8807727 support cache last gop for video winlin 2013-10-27 11:25:42 +0800
• b9ef2801d9 Update README.md winlin 2013-10-27 09:15:02 +0800
• 17877f6a74 Update README.md winlin 2013-10-27 09:11:26 +0800
• 426e4d25be Update README.md winlin 2013-10-27 09:04:33 +0800
• 9d45993b46 Update README.md winlin 2013-10-27 09:01:23 +0800
• 693a98b286 update Readme winlin 2013-10-27 08:57:16 +0800
• 79aa7e9280 update Readme winlin 2013-10-27 08:54:05 +0800
• e5c73c5eba release v0.2, 10125 lines winlin 2013-10-25 18:52:51 +0800
• 821d0f6a23 release v0.2, 10125 lines v0.2.0 winlin 2013-10-25 18:47:01 +0800
• 570cc51b4b release v0.2, 10125 lines winlin 2013-10-25 18:45:36 +0800
• 359c7da19b support flash publish winlin 2013-10-25 18:44:56 +0800
• 6d385f15a7 refine code, add todo command winlin 2013-10-25 17:35:37 +0800
• 24a54a40e8 refine code, add prefix srs winlin 2013-10-25 17:22:52 +0800
• 53a668e34d support h264/avc codec by rtmp complex handshake(SrsComplexHandshake) winlin 2013-10-25 17:16:23 +0800
• f0f4837a97 define the structs for c0c1 complex handshake winlin 2013-10-25 07:42:18 +0800
• e6ca039dd6 add rtmp complex handshake classes winlin 2013-10-25 07:15:33 +0800
• 598aaa5c98 detect the video/audio codec, only cache the h264/aac sequence header winlin 2013-10-24 22:29:12 +0800
• 2987a24877 add TODO for complex handshake winlin 2013-10-23 22:25:35 +0800
• 2ee913bd70 update comment TODO for sequence header and fast-startup caching last gop winlin 2013-10-23 22:20:08 +0800
• 9da31de1c1 support decode user control message. response ping automatically winlin 2013-10-23 22:17:57 +0800
• 0a92faf2e3 update timestamp comments winlin 2013-10-23 21:44:24 +0800
• b40d0467a8 time jitter detect and correct, very simple algorithm winlin 2013-10-23 21:37:22 +0800
• e31e3d601d time jitter detect and correct, very simple algorithm winlin 2013-10-23 21:31:22 +0800
• 2a346c2398 support send acknowledgement when recv message. winlin 2013-10-23 20:59:08 +0800
• 5d1d0ff8bb update help v0.1.0 winlin 2013-10-23 12:20:03 +0800
• 3974cac46b update README winlin 2013-10-23 12:03:49 +0800
• a0a0da5f23 release v0.1, support FMLE/FFMPEG publish, vp6 codec live streaming winlin 2013-10-23 11:57:47 +0800
• dc7149595b support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet winlin 2013-10-23 00:30:37 +0800
• 4199ff4346 support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet winlin 2013-10-23 00:28:53 +0800
• 54b9c5d389 support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet winlin 2013-10-23 00:17:44 +0800
• 444a45facd fix bug to accept FFMPEG streaming winlin 2013-10-23 00:01:59 +0800
• 150489af51 support ffmpeg publish winlin 2013-10-22 23:37:44 +0800