diff --git a/projects/Platform/Api/Api/SiteController.cs b/projects/Platform/Api/Api/SiteController.cs index a7b5b1df..aaec855a 100644 --- a/projects/Platform/Api/Api/SiteController.cs +++ b/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 { diff --git a/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf b/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf index dbda3adf..e55f73ef 100644 --- a/publish/src/linux-x64/publish/conf/srs/conf/srs.dev.conf +++ b/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{ - enabled on; - listen 8000; +rtc_server { + enabled on; + listen 8000; candidate *; } vhost __defaultVhost__ { @@ -32,12 +32,11 @@ vhost __defaultVhost__ { enabled on; bframe discard; } - tcp_nodelay on - min_latency on; + tcp_nodelay on min_latency on; play { - gop_cache off; - queue_length 10; - mw_latency 100; + gop_cache off; + queue_length 10; + mw_latency 100; } publish { mr off; @@ -60,26 +59,23 @@ vhost __defaultVhost__ { output ./objs/nginx/html/[app]/[stream].png; } engine ff { - enabled off; - vfilter { - } - vcodec libx264; - vbitrate 500; - vfps 25; - vwidth 768; - vheight 320; - vthreads 12; - vprofile main; - vpreset medium; - vparams { - } - acodec libfdk_aac; - abitrate 70; - asample_rate 44100; - achannels 2; - aparams { - } - output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine]; + enabled off; + vfilter; + vcodec libx264; + vbitrate 500; + vfps 25; + vwidth 768; + vheight 320; + vthreads 12; + vprofile main; + vpreset medium; + vparams; + acodec libfdk_aac; + abitrate 70; + asample_rate 44100; + achannels 2; + aparams; + output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine]; } } http_remux {