update

Former-commit-id: b9b9cb102b98c6fae6a849569c2cbf8aebb97a58
Former-commit-id: 80fee546de7ab32a87cb6d6d632600f293bbb0bd

projects/Platform/Api/Api/SiteController.cs

@@ -112,9 +112,8 @@ namespace Platform.Api
                 .Include(o => o.Buildings)
                 .FirstOrDefault();
             organ.Buildings.ToTree();
-            var rootBuildingId = this._buildingRepo.ReadOnlyTable().Where(o => o.ParentId == null).Select(o => o.Id).FirstOrDefault();
             organ.Buildings = organ.Buildings
-                .Where(o => o.ParentId == rootBuildingId)
+                .Where(o => o.Parent == null)
                 .ToList();
             var model = new
             {

publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf

@@ -22,9 +22,9 @@ stats {
     network 0;
     disk sda sdb xvda xvdb;
 }
-rtc_server{
+rtc_server {
-    enabled    on;
+    enabled on;
-    listen    8000;
+    listen 8000;
     candidate *;
 }
 vhost __defaultVhost__ {
@@ -32,12 +32,11 @@ vhost __defaultVhost__ {
         enabled on;
         bframe discard;
     }
-    tcp_nodelay     on
+    tcp_nodelay on min_latency on;
-    min_latency     on;
     play {
-        gop_cache       off;
+        gop_cache off;
-        queue_length    10;
+        queue_length 10;
-        mw_latency      100;
+        mw_latency 100;
     }
     publish {
         mr off;
@@ -60,26 +59,23 @@ vhost __defaultVhost__ {
             output ./objs/nginx/html/[app]/[stream].png;
         }
         engine ff {
-            enabled         off;
+            enabled off;
-            vfilter {
+            vfilter;
-            }
+            vcodec libx264;
-            vcodec          libx264;
+            vbitrate 500;
-            vbitrate        500;
+            vfps 25;
-            vfps            25;
+            vwidth 768;
-            vwidth          768;
+            vheight 320;
-            vheight         320;
+            vthreads 12;
-            vthreads        12;
+            vprofile main;
-            vprofile        main;
+            vpreset medium;
-            vpreset         medium;
+            vparams;
-            vparams {
+            acodec libfdk_aac;
-            }
+            abitrate 70;
-            acodec          libfdk_aac;
+            asample_rate 44100;
-            abitrate        70;
+            achannels 2;
-            asample_rate    44100;
+            aparams;
-            achannels       2;
+            output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
-            aparams {
-            }
-            output          rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];
         }
     }
     http_remux {