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

#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

• 6e5cd0345d 优化点播相关代码 xiongziliang 2020-04-03 23:27:16 +0800
• ecf3847482 mp4转rtsp支持h265 xiongziliang 2020-04-03 23:13:55 +0800
• 1ca81e39fe 提高H264点播兼容性 xiongziliang 2020-04-03 23:03:47 +0800
• 42eece5b9a mp4点播无人观看时自动关闭 xiongziliang 2020-04-03 22:39:44 +0800
• c3c4c72d1d 去除mp4v2依赖 xiongziliang 2020-04-03 22:28:27 +0800
• 523a8d0527 消除编译警告 xiongziliang 2020-04-03 22:19:04 +0800
• d07161f18f 点播时间轴兼容VLC xiongziliang 2020-04-03 22:17:40 +0800
• 0a31b03064 完善MP4点播 xiongziliang 2020-04-03 22:08:03 +0800
• 47d8e37e3d 完善mp4点播 xiongziliang 2020-04-03 22:04:13 +0800
• 278591d5ee 修复MP4点播相关bug xiongziliang 2020-04-03 21:39:44 +0800
• 095834fe57 重写MP4点播 xiongziliang 2020-04-03 20:46:55 +0800
• 46be8a38e7 重写MP4点播 xiongziliang 2020-04-03 20:45:58 +0800
• f03365efb1 提高对echo show设备的兼容性 xiongziliang 2020-04-03 14:09:03 +0800
• 40a7b5b5b4 防止未赋值导致崩溃的问题 xiongziliang 2020-04-02 10:35:10 +0800
• 651d0da14a 防止未赋值导致崩溃的问题 xiongziliang 2020-04-02 10:34:25 +0800
• f1914ca67f 优化事件触发器性能 xiongziliang 2020-04-02 10:32:16 +0800
• 205c894eb0 添加mk_media_set_on_seek接口 xiongziliang 2020-04-02 10:31:33 +0800
• 194168f9c2 Merge remote-tracking branch 'origin/master' xiongziliang 2020-04-01 16:53:23 +0800
• bbaf5d7b3b 优化事件触发器性能 xiongziliang 2020-04-01 16:51:51 +0800
• 82dfaa55a5
  Update README.md 夏楚 2020-03-28 15:50:02 +0800
• c145f5f8ba 修复#247 xiongziliang 2020-03-26 17:12:21 +0800
• 402d5f83e5 不全部转换rtsp或rtmp xiongziliang 2020-03-26 10:24:05 +0800
• e5c0b5ebb8 修复#245 xiongziliang 2020-03-23 10:35:35 +0800
• ace200716a 修复无人播放事件触发延时不准确的bug xiongziliang 2020-03-23 10:21:17 +0800
• 1168174c2b tab统一替换为4个空格键：#242 xiongziliang 2020-03-20 11:51:24 +0800
• 2a0d78fd12 添加tab替换工具 xiongziliang 2020-03-20 11:22:05 +0800
• 21d31b8801 Merge remote-tracking branch 'origin/master' xiongziliang 2020-03-20 09:57:54 +0800
• c7d9e7b38e 删除多余代码 xiongziliang 2020-03-20 09:46:29 +0800
• 8324bab507
  Update README.md 夏楚 2020-03-18 22:19:33 +0800
• 8dfed858c1
  Update README.md 夏楚 2020-03-18 22:16:59 +0800
• e0da4de5e1
  Update README.md 夏楚 2020-03-18 15:33:18 +0800
• cec5af0dfa
  Merge pull request #1 from xiongziliang/master SnowfallDan 2020-03-17 17:23:06 +0800
• 935aea057a
  Merge pull request #11 from xiongziliang/master baiyfcu 2020-03-16 18:05:15 +0800
• b15cd86514 新增HTTP HEAD命令的支持，目的是兼容一些播放器 xiongziliang 2020-03-16 09:33:00 +0800
• 1c14239d89 修复编译问题 xiongziliang 2020-03-13 18:34:12 +0800
• a6928a0bfe 优化url编解码 xiongziliang 2020-03-12 18:19:22 +0800
• 119d90bc58 优化url编解码 xiongziliang 2020-03-12 18:14:47 +0800
• e4e5400641 优化虚拟主机相关 xiongziliang 2020-03-12 12:47:15 +0800
• e90319a1f2 http服务器支持OPTIONS命令 xiongziliang 2020-03-11 20:58:41 +0800
• 2b592780ad 修复aac rtp解包内存越界的bug xiongziliang 2020-03-11 18:52:28 +0800
• f76a203768 完善注释 xiongziliang 2020-03-10 23:22:48 +0800
• 038617a6c4 新增拉流代理源相关api xiongziliang 2020-03-10 22:56:56 +0800
• 891b86e7ea 新增拉流代理源相关api xiongziliang 2020-03-10 22:55:19 +0800
• b3554fb721 消除编译警告 xiongziliang 2020-03-09 16:04:34 +0800
• 800b0d81f3 完善readme xiongziliang 2020-03-08 22:29:31 +0800
• 502e3bff5f 解决ps rtp解包问题 xiongziliang 2020-03-08 22:10:37 +0800
• 10884340b0 优化rtp推流相关代码 xiongziliang 2020-03-08 21:19:20 +0800
• ae45c24fa3 解决ts误判的问题 xiongziliang 2020-03-07 16:09:57 +0800
• 87d4a8ed78
  Merge pull request #10 from xiongziliang/master baiyfcu 2020-03-06 14:54:21 +0800
• 069bde09c1 支持ts rtp流 xiongziliang 2020-03-06 13:00:06 +0800
• d35f1d0bfe 优化接口命名 xiongziliang 2020-03-06 11:11:27 +0800
• a89e81d3f3 完善日志 xiongziliang 2020-03-05 18:04:34 +0800
• 448f6fa3c7 优化rtp代理超时管理 xiongziliang 2020-03-05 11:36:31 +0800
• c77f82f02c 尝试添加rtp类型自动判断逻辑 xiongziliang 2020-03-04 22:25:00 +0800
• f384f5e025 解决死锁问题 xiongziliang 2020-03-04 21:57:31 +0800
• 6cc56a758a Merge remote-tracking branch 'origin/master' xiongziliang 2020-02-29 10:28:20 +0800
• 899dcc7386 修复拼写错误 xiongziliang 2020-02-29 10:27:30 +0800
• a245e6bec2
  Update README.md 夏楚 2020-02-28 23:08:44 +0800
• 0a4f2ad42c
  Update README.md 夏楚 2020-02-28 22:55:47 +0800
• 1e53500eb0 mk_media接口支持无人观看事件 xiongziliang 2020-02-28 17:53:21 +0800
• 109fab2cb1 RTP代理支持完整的事件 xiongziliang 2020-02-28 16:25:14 +0800
• 5acdf1f789 完善注释 xiongziliang 2020-02-27 15:48:52 +0800
• e6eee321ea 优化临界状态丢起始帧的问题 xiongziliang 2020-02-27 12:31:57 +0800
• 38584a7478 添加mk_media_init_complete接口 xiongziliang 2020-02-27 11:40:38 +0800
• a0001bf2f4 优化日志友好度 xiongziliang 2020-02-25 19:00:22 +0800
• 86b053db3b 优化代码 xiongziliang 2020-02-25 18:53:11 +0800
• d60101b93c 优化单Track情况下等待3秒的情况 xiongziliang 2020-02-25 14:59:40 +0800
• f76109c629 兼容ssrc为0的rtp推流 xiongziliang 2020-02-23 12:16:20 +0800
• 618b028da4 修复拼写错误 xiongziliang 2020-02-21 11:35:53 +0800
• c56a0a0624 更新ZLToolKit xiongziliang 2020-02-18 21:13:30 +0800
• 2ecb9c6887 更新ZLToolKit xiongziliang 2020-02-18 11:25:39 +0800
• a7a376b3f2 流量汇报事件添加id参数 xiongziliang 2020-02-13 12:10:08 +0800
• 7e25537957 流量汇报事件添加客户端ip和端口参数 xiongziliang 2020-02-13 11:33:59 +0800
• ead8b5a89c ios默认只生成c静态库 xiongziliang 2020-02-05 23:34:51 +0800
• 8dc22498c8
  Merge pull request #1 from xiongziliang/master tiger7chan 2020-02-05 16:21:24 +0800
• 89e191f7fd 添加接口：getMp4RecordFile xiongziliang 2020-02-01 23:26:33 +0800
• 51e0c71007 添加更多录制相关方法 xiongziliang 2020-02-01 22:58:58 +0800
• e8ba94ba09 还原代码 xiongziliang 2020-02-01 22:58:21 +0800
• 6a97fcb3de 媒体注册、重置事件改成同步触发 xiongziliang 2020-02-01 22:57:48 +0800
• 075a615a92 Merge branch 'research' of https://gitee.com/liuziloong/FreeNVR xiongziliang 2020-02-01 21:20:57 +0800
• 92f69c3915 优化纯音频流的延时 xiongziliang 2020-01-24 22:16:28 +0800
• a9539eb626 HLS遇到I帧才切片:#226 xiongziliang 2020-01-24 22:00:55 +0800
• 224a35dbd5 解决单音频无法录制mp4的bug xiongziliang 2020-01-24 21:09:47 +0800
• 90c6dd4bfa 修复关闭hls后无法编译通过的问题 xiongziliang 2020-01-24 20:54:39 +0800
• 4470f2e427 添加addTrackCompleted方法，缩短流注册延时 xiongziliang 2020-01-22 19:09:53 +0800
• ac33592319 修复死锁的问题 xiongziliang 2020-01-21 11:05:51 +0800
• f5187e8b0d 优化GOP相关逻辑 xiongziliang 2020-01-20 16:22:25 +0800
• f453668683 去除侦探gop长度的逻辑 xiongziliang 2020-01-20 15:34:06 +0800
• 795860a019 修复目录级别错误 liuziloong 2020-01-20 15:22:20 +0800
• 2384aa5bbd MP4录像增加一级目录，按照：年月/年月日/*.mp4存储； 增加按月，按天查询mp4录像； 消除一处编译器警告； liuziloong 2020-01-20 15:02:45 +0800
• ee2ca4bda5 Merge branch 'master' into research liuziloong 2020-01-19 15:09:34 +0800
• d2d84680c0 temp liuziloong 2020-01-19 14:54:31 +0800
• cbd6cd4e60 替换不可调试的宏代码 xiongziliang 2020-01-17 11:44:20 +0800
• 81d3e54d45 mark Luke 2020-01-16 11:08:15 +0800
• 22d5ec7796 Merge remote-tracking branch 'origin/master' xiongziliang 2020-01-15 20:00:05 +0800
• 95c8474d48 修复GOP缓存相关小bug xiongziliang 2020-01-15 19:59:47 +0800
• 114d447dac
  Merge pull request #215 from gemfield/master 夏楚 2020-01-15 15:31:14 +0800
• caa870c37e websocket服务器支持根据url选择不同的运行逻辑 xiongziliang 2020-01-15 15:11:42 +0800
• 34e3e9f720 优化及时推拉流秒开成功率 xiongziliang 2020-01-15 11:55:16 +0800
• 2610ba7c8b 修复rtmp注册时还未生成完整config包的bug xiongziliang 2020-01-15 11:46:15 +0800