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

• 9d340f5419 v0.8 released. 19186 lines. v0.8.0 winlin 2013-12-08 13:19:42 +0800
• c618229487 regression test ok winlin 2013-12-08 13:17:39 +0800
• 3fd3ac5a11 support http hooks: on_connect/close/publish/unpublish/play/stop. winlin 2013-12-08 12:48:03 +0800
• 889ad9238b support http hooks: on_connect/close/publish/unpublish/play/stop. winlin 2013-12-08 12:45:12 +0800
• 3d4474f620 support multiple http hooks for a event. winlin 2013-12-08 10:53:18 +0800
• 2887cda176 support multiple http hooks for a event. winlin 2013-12-08 10:46:33 +0800
• 30099dfa09 support multiple http hooks for a event. winlin 2013-12-08 10:46:15 +0800
• 260bde69d9 update readme winlin 2013-12-08 10:27:33 +0800
• 9f3139c5c3 add comments for api server winlin 2013-12-08 09:22:33 +0800
• baf11c59df update readme, add ffmpeg forward(acode/vcopy) feature winlin 2013-12-08 08:47:29 +0800
• 3f05f06234 update readme winlin 2013-12-07 23:32:30 +0800
• 29d6beac66 update readme winlin 2013-12-07 23:31:53 +0800
• fd926b3915 update readme winlin 2013-12-07 23:25:40 +0800
• a478452f57 support http callback hooks: on_connect winlin 2013-12-07 23:23:19 +0800
• 65fde21e6c add http client winlin 2013-12-07 22:06:53 +0800
• 8f8412b59c update readme winlin 2013-12-07 20:52:02 +0800
• bb22c3b5cd add http library, support in build script winlin 2013-12-07 20:51:27 +0800
• 3600be9796 add http callback in config winlin 2013-12-07 20:38:14 +0800
• d3cee00b3b add cherrypy api server winlin 2013-12-07 20:34:42 +0800
• b29d7ccd56 update readme. winlin 2013-12-07 19:29:11 +0800
• 4b9eabdf01 udpate files. winlin 2013-12-07 19:28:11 +0800
• 263213d8b6 update version, add build date winlin 2013-12-07 19:27:31 +0800
• 0516ddc7cb update readme, update the st-load winlin 2013-12-07 16:42:54 +0800
• d13d020485 update readme, update the st-load winlin 2013-12-07 16:42:29 +0800
• 6121c100fa update readme, update the st-load winlin 2013-12-07 16:40:54 +0800
• e3b837fb81 update readme, update the st-load winlin 2013-12-07 16:38:17 +0800
• 05d94eba08 update readme, update the st-load winlin 2013-12-07 16:37:47 +0800
• 3b09f9bea9 support audio transcode only, speex/mp3 to aac winlin 2013-12-06 14:35:03 +0800
• 2d592d177d refine the signals of ffmpeg. winlin 2013-12-06 14:12:01 +0800
• 71895a4da6 fix the ffmpeg kill bug, wait until ffmpeg quit. winlin 2013-12-06 14:07:37 +0800
• cab88dfe70 hls support multiple publish/unpublish. disable hls when not support winlin 2013-12-06 14:02:10 +0800
• 679e851f07 support max_connections, drop if exceed. winlin 2013-12-06 11:00:37 +0800
• 4827777035 fix the build ffmpeg script bug, add yasm to path when build winlin 2013-12-06 10:46:32 +0800
• 86b1f3349a fix bug of forward, erase msgs when error winlin 2013-12-06 10:23:28 +0800
• 89c0170850 fix bug of forward, earse the forwarded msgs. winlin 2013-12-06 10:16:24 +0800
• 8c5661b9ff fix bug of hls muxer, support close/open/flush even muxer is closed. winlin 2013-12-06 09:44:23 +0800
• 6207a2f19e fix the rewind bug, support republish by restart the ffmpeg encoder. winlin 2013-12-05 23:54:30 +0800
• b9440df745 add encoder/hls pithy print winlin 2013-12-05 23:34:26 +0800
• 4a8fe0bc67 add plan: support file source, transcoding file to live stream winlin 2013-12-03 15:00:21 +0800
• a85a7342ae add plan: transcode speex to aac, video passthrough winlin 2013-12-03 13:23:24 +0800
• 464d78b762 add todo for ffmpeg winlin 2013-12-03 00:26:40 +0800
• 5afe746e69 0.7 released, +live stream transcoding. v0.7.0 winlin 2013-12-02 23:57:28 +0800
• 113731dd6b reap the transcode process winlin 2013-12-02 23:51:51 +0800
• b5bba29768 refine hls, extract ts cache for ts cache audio and flush once winlin 2013-12-02 22:09:10 +0800
• 1c2f5052dd refine the hls muxer module winlin 2013-12-02 15:55:10 +0800
• b4eb38c86b refine hls code, reorder classes. winlin 2013-12-02 14:24:09 +0800
• d6897205c7 add todo for protocol winlin 2013-12-02 12:56:52 +0800
• a2e6e6718e fix the m3u8 crash bug, simplify it winlin 2013-12-02 11:46:39 +0800
• 2b0bef18ed add todo for forward winlin 2013-12-01 20:03:07 +0800
• 09f9811a97 fix the hls crash bug winlin 2013-12-01 19:54:52 +0800
• 3c8cc487e6 update arch winlin 2013-12-01 19:09:12 +0800
• a33ca8b517 update arch winlin 2013-12-01 19:08:48 +0800
• 6f0bba9856 add todo: cycle all process, reap the exited winlin 2013-12-01 18:53:24 +0800
• e85e74f5d4 add arch winlin 2013-12-01 18:46:59 +0800
• fc2213e6e2 add arch winlin 2013-12-01 18:38:41 +0800
• b1d33bfb37 add arch winlin 2013-12-01 18:36:12 +0800
• 2695e4d0c6 fix bug of core winlin 2013-12-01 17:42:09 +0800
• 6af0794bab support dead-loop detect for forwarder and transcoder. winlin 2013-12-01 17:32:06 +0800
• e4ea965a3a update conf winlin 2013-12-01 14:28:07 +0800
• 82190d7fa2 change server name to demo, dev used for development vhost winlin 2013-12-01 14:11:07 +0800
• 9d65cd1c9f change server name to demo, dev used for development vhost winlin 2013-12-01 14:08:28 +0800
• 35676920be convert to unix format winlin 2013-12-01 13:05:43 +0800
• 18028ad4cb update readme winlin 2013-12-01 13:04:09 +0800
• bf18a3ac96 change demo video to 200kbps winlin 2013-12-01 12:41:52 +0800
• bbf7b9bb01 disable the forward for bug. update the steps winlin 2013-12-01 12:31:23 +0800
• ec28513941 Update README.md winlin 2013-12-01 12:29:40 +0800
• 41fcda1d86 use hosts to play stream winlin 2013-12-01 12:25:04 +0800
• 5502344e85 add forward sample winlin 2013-12-01 12:16:57 +0800
• 5cc1ad6da8 add drawtext filter sample winlin 2013-12-01 12:04:00 +0800
• ecec80ab43 support all ffmpeg filters and params. winlin 2013-12-01 11:25:15 +0800
• 1da09e5ffb add sample video winlin 2013-12-01 11:24:26 +0800
• a7c83b1aee support ffmpeg filter winlin 2013-12-01 10:55:06 +0800
• 9a0d8855d8 support ffmpeg filter winlin 2013-12-01 10:54:41 +0800
• f85b70966c rename global username and email winlin 2013-11-30 23:26:40 +0800
• 951cd08f1f refine the params winlin 2013-11-30 23:21:14 +0800
• 407801b8a6 add ffempty winlin 2013-11-30 23:20:46 +0800
• b88596b6dc update readme winlin 2013-11-30 23:15:25 +0800
• 601a69aa70 update readme winlin 2013-11-30 23:15:13 +0800
• 52e6115f9a update readme winlin 2013-11-30 23:12:47 +0800
• 100a48795f update readme winlin 2013-11-30 23:08:51 +0800
• dd066a4973 update readme winlin 2013-11-30 23:06:25 +0800
• 525af4599f support live stream transcoding by ffmpeg. winlin 2013-11-30 23:04:47 +0800
• ee18b9f537 add ffempty winlin 2013-11-30 21:56:50 +0800
• 2be9ef2a8b add research empty ffmpeg winlin 2013-11-30 21:53:42 +0800
• 06278176dd add research empty ffmpeg winlin 2013-11-30 21:53:28 +0800
• 80a81b1661 parse ffmpeg params winlin 2013-11-30 21:02:21 +0800
• ce15f4bce3 update encoder framework winlin 2013-11-30 19:14:19 +0800
• 8d91561ca0 add ffmpeg transcoding framework winlin 2013-11-30 18:31:07 +0800
• b1466c8883 fix build ffmpeg bug, add -ldl compile option winlin 2013-11-30 16:45:47 +0800
• 129244aafa change x264 from 10bit to 8bit winlin 2013-11-30 16:37:33 +0800
• c69933d68b add transcoding params to config winlin 2013-11-30 16:24:03 +0800
• a086e2bbfa add transcoding params to config winlin 2013-11-30 16:23:01 +0800
• 57064237d0 rename author to contributor winlin 2013-11-30 14:35:59 +0800
• 9a582b0e4a refine the configure winlin 2013-11-30 14:12:19 +0800
• ad618702aa add ffmpeg build script winlin 2013-11-30 13:55:14 +0800
• 041ce8f18f add ffmpeg build script winlin 2013-11-30 12:52:15 +0800
• e4840d4480 add ffmpeg build script winlin 2013-11-30 12:43:55 +0800
• 14c2585cc3 add build ffmpeg script winlin 2013-11-30 11:59:21 +0800
• df53681a07 add ffmpeg-2.1, x264-core138, lame-3.99.5, libaacplus-2.0.2. winlin 2013-11-30 11:50:00 +0800
• 93fec0997f add ffmpeg2.1 winlin 2013-11-30 11:48:00 +0800