Fix missed backport change

This stupid file is back; looks like its location changed in .NET 3.0
versus .NET 2.2. Just revert it back to its original location.

Related to #1859

.ci/azure-pipelines-abi.yml

@@ -1,89 +0,0 @@
-parameters:
-- name: Packages
-  type: object
-  default: {}
-- name: LinuxImage
-  type: string
-  default: "ubuntu-latest"
-- name: DotNetSdkVersion
-  type: string
-  default: 3.1.100
-
-jobs:
-  - job: CompatibilityCheck
-    displayName: Compatibility Check
-    pool:
-      vmImage: "${{ parameters.LinuxImage }}"
-    # only execute for pull requests
-    condition: and(succeeded(), variables['System.PullRequest.PullRequestNumber'])
-    strategy:
-      matrix:
-        ${{ each Package in parameters.Packages }}:
-          ${{ Package.key }}:
-            NugetPackageName: ${{ Package.value.NugetPackageName }}
-            AssemblyFileName: ${{ Package.value.AssemblyFileName }}
-      maxParallel: 2
-    dependsOn: Build
-    steps:
-      - checkout: none
-
-      - task: UseDotNet@2
-        displayName: "Update DotNet"
-        inputs:
-          packageType: sdk
-          version: ${{ parameters.DotNetSdkVersion }}
-
-      - task: DotNetCoreCLI@2
-        displayName: 'Install ABI CompatibilityChecker tool'
-        inputs:
-          command: custom
-          custom: tool
-          arguments: 'update compatibilitychecker -g'
-
-      - task: DownloadPipelineArtifact@2
-        displayName: "Download New Assembly Build Artifact"
-        inputs:
-          source: "current"
-          artifact: "$(NugetPackageName)"
-          path: "$(System.ArtifactsDirectory)/new-artifacts"
-          runVersion: "latest"
-
-      - task: CopyFiles@2
-        displayName: "Copy New Assembly Build Artifact"
-        inputs:
-          sourceFolder: $(System.ArtifactsDirectory)/new-artifacts
-          contents: "**/*.dll"
-          targetFolder: $(System.ArtifactsDirectory)/new-release
-          cleanTargetFolder: true
-          overWrite: true
-          flattenFolders: true
-
-      - task: DownloadPipelineArtifact@2
-        displayName: "Download Reference Assembly Build Artifact"
-        inputs:
-          source: "specific"
-          artifact: "$(NugetPackageName)"
-          path: "$(System.ArtifactsDirectory)/current-artifacts"
-          project: "$(System.TeamProjectId)"
-          pipeline: "$(System.DefinitionId)"
-          runVersion: "latestFromBranch"
-          runBranch: "refs/heads/$(System.PullRequest.TargetBranch)"
-
-      - task: CopyFiles@2
-        displayName: "Copy Reference Assembly Build Artifact"
-        inputs:
-          sourceFolder: $(System.ArtifactsDirectory)/current-artifacts
-          contents: "**/*.dll"
-          targetFolder: $(System.ArtifactsDirectory)/current-release
-          cleanTargetFolder: true
-          overWrite: true
-          flattenFolders: true
-
-      # The `--warnings-only` switch will swallow the return code and not emit any errors.
-      - task: DotNetCoreCLI@2
-        displayName: 'Execute ABI Compatibility Check Tool'
-        inputs:
-          command: custom
-          custom: compat
-          arguments: 'current-release/$(AssemblyFileName) new-release/$(AssemblyFileName) --azure-pipelines --warnings-only'
-          workingDirectory: $(System.ArtifactsDirectory)

.ci/azure-pipelines-main.yml

@@ -1,93 +0,0 @@
-parameters:
-  LinuxImage: 'ubuntu-latest'
-  RestoreBuildProjects: 'Jellyfin.Server/Jellyfin.Server.csproj'
-  DotNetSdkVersion: 3.1.100
-
-jobs:
-  - job: Build
-    displayName: Build
-    strategy:
-      matrix:
-        Release:
-          BuildConfiguration: Release
-        Debug:
-          BuildConfiguration: Debug
-    pool:
-      vmImage: '${{ parameters.LinuxImage }}'
-    steps:
-      - checkout: self
-        clean: true
-        submodules: true
-        persistCredentials: true
-
-      - task: DownloadPipelineArtifact@2
-        displayName: 'Download Web Branch'
-        condition: in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion')
-        inputs:
-          path: '$(Agent.TempDirectory)'
-          artifact: 'jellyfin-web-production'
-          source: 'specific'
-          project: 'jellyfin'
-          pipeline: 'Jellyfin Web'
-          runBranch: variables['Build.SourceBranch']
-
-      - task: DownloadPipelineArtifact@2
-        displayName: 'Download Web Target'
-        condition: eq(variables['Build.Reason'], 'PullRequest')
-        inputs:
-          path: '$(Agent.TempDirectory)'
-          artifact: 'jellyfin-web-production'
-          source: 'specific'
-          project: 'jellyfin'
-          pipeline: 'Jellyfin Web'
-          runBranch: variables['System.PullRequest.TargetBranch']
-
-      - task: ExtractFiles@1
-        displayName: 'Extract Web Client'
-        inputs:
-          archiveFilePatterns: '$(Agent.TempDirectory)/*.zip'
-          destinationFolder: '$(Build.SourcesDirectory)/MediaBrowser.WebDashboard'
-          cleanDestinationFolder: false
-
-      - task: UseDotNet@2
-        displayName: 'Update DotNet'
-        inputs:
-          packageType: sdk
-          version: ${{ parameters.DotNetSdkVersion }}
-
-      - task: DotNetCoreCLI@2
-        displayName: 'Publish Server'
-        inputs:
-          command: publish
-          publishWebProjects: false
-          projects: '${{ parameters.RestoreBuildProjects }}'
-          arguments: '--configuration $(BuildConfiguration) --output $(Build.ArtifactStagingDirectory)'
-          zipAfterPublish: false
-
-      - task: PublishPipelineArtifact@0
-        displayName: 'Publish Artifact Naming'
-        condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
-        inputs:
-          targetPath: '$(build.ArtifactStagingDirectory)/Jellyfin.Server/Emby.Naming.dll'
-          artifactName: 'Jellyfin.Naming'
-
-      - task: PublishPipelineArtifact@0
-        displayName: 'Publish Artifact Controller'
-        condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
-        inputs:
-          targetPath: '$(build.ArtifactStagingDirectory)/Jellyfin.Server/MediaBrowser.Controller.dll'
-          artifactName: 'Jellyfin.Controller'
-
-      - task: PublishPipelineArtifact@0
-        displayName: 'Publish Artifact Model'
-        condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
-        inputs:
-          targetPath: '$(build.ArtifactStagingDirectory)/Jellyfin.Server/MediaBrowser.Model.dll'
-          artifactName: 'Jellyfin.Model'
-
-      - task: PublishPipelineArtifact@0
-        displayName: 'Publish Artifact Common'
-        condition: and(succeeded(), eq(variables['BuildConfiguration'], 'Release'))
-        inputs:
-          targetPath: '$(build.ArtifactStagingDirectory)/Jellyfin.Server/MediaBrowser.Common.dll'
-          artifactName: 'Jellyfin.Common'

.ci/azure-pipelines-package.yml

@@ -1,171 +0,0 @@
-jobs:
-- job: BuildPackage
-  displayName: 'Build Packages'
-
-  strategy:
-    matrix:
-      CentOS.amd64:
-        BuildConfiguration: centos.amd64
-      Fedora.amd64:
-        BuildConfiguration: fedora.amd64
-      Debian.amd64:
-        BuildConfiguration: debian.amd64
-      Debian.arm64:
-        BuildConfiguration: debian.arm64
-      Debian.armhf:
-        BuildConfiguration: debian.armhf
-      Ubuntu.amd64:
-        BuildConfiguration: ubuntu.amd64
-      Ubuntu.arm64:
-        BuildConfiguration: ubuntu.arm64
-      Ubuntu.armhf:
-        BuildConfiguration: ubuntu.armhf
-      Linux.amd64:
-        BuildConfiguration: linux.amd64
-      Windows.amd64:
-        BuildConfiguration: windows.amd64
-      MacOS:
-        BuildConfiguration: macos
-      Portable:
-        BuildConfiguration: portable
-
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - script: 'docker build -f deployment/Dockerfile.$(BuildConfiguration) -t jellyfin-server-$(BuildConfiguration) deployment'
-    displayName: 'Build Dockerfile'
-
-  - script: 'docker image ls -a && docker run -v $(pwd)/deployment/dist:/dist -v $(pwd):/jellyfin -e IS_UNSTABLE="yes" -e BUILD_ID=$(Build.BuildNumber) jellyfin-server-$(BuildConfiguration)'
-    displayName: 'Run Dockerfile (unstable)'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
-
-  - script: 'docker image ls -a && docker run -v $(pwd)/deployment/dist:/dist -v $(pwd):/jellyfin -e IS_UNSTABLE="no" -e BUILD_ID=$(Build.BuildNumber) jellyfin-server-$(BuildConfiguration)'
-    displayName: 'Run Dockerfile (stable)'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
-
-  - task: PublishPipelineArtifact@1
-    displayName: 'Publish Release'
-    inputs:
-      targetPath: '$(Build.SourcesDirectory)/deployment/dist'
-      artifactName: 'jellyfin-server-$(BuildConfiguration)'
-
-  - task: SSH@0
-    displayName: 'Create target directory on repository server'
-    inputs:
-      sshEndpoint: repository
-      runOptions: 'inline'
-      inline: 'mkdir -p /srv/repository/incoming/azure/$(Build.BuildNumber)/$(BuildConfiguration)'
-
-  - task: CopyFilesOverSSH@0
-    displayName: 'Upload artifacts to repository server'
-    inputs:
-      sshEndpoint: repository
-      sourceFolder: '$(Build.SourcesDirectory)/deployment/dist'
-      contents: '**'
-      targetFolder: '/srv/repository/incoming/azure/$(Build.BuildNumber)/$(BuildConfiguration)'
-
-- job: BuildDocker
-  displayName: 'Build Docker'
-
-  strategy:
-    matrix:
-      amd64:
-        BuildConfiguration: amd64
-      arm64:
-        BuildConfiguration: arm64
-      armhf:
-        BuildConfiguration: armhf
-
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  variables:
-  - name: JellyfinVersion
-    value: 0.0.0
-
-  steps:
-  - script: echo "##vso[task.setvariable variable=JellyfinVersion]$( awk -F '/' '{ print $NF }' <<<'$(Build.SourceBranch)' | sed 's/^v//' )"
-    displayName: Set release version (stable)
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
-
-  - task: Docker@2
-    displayName: 'Push Unstable Image'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
-    inputs:
-      repository: 'jellyfin/jellyfin-server'
-      command: buildAndPush
-      buildContext: '.'
-      Dockerfile: 'deployment/Dockerfile.docker.$(BuildConfiguration)'
-      containerRegistry: Docker Hub
-      tags: |
-        unstable-$(Build.BuildNumber)-$(BuildConfiguration)
-        unstable-$(BuildConfiguration)
-
-  - task: Docker@2
-    displayName: 'Push Stable Image'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
-    inputs:
-      repository: 'jellyfin/jellyfin-server'
-      command: buildAndPush
-      buildContext: '.'
-      Dockerfile: 'deployment/Dockerfile.docker.$(BuildConfiguration)'
-      containerRegistry: Docker Hub
-      tags: |
-        stable-$(Build.BuildNumber)-$(BuildConfiguration)
-        $(JellyfinVersion)-$(BuildConfiguration)
-
-- job: CollectArtifacts
-  displayName: 'Collect Artifacts'
-  dependsOn:
-  - BuildPackage
-  - BuildDocker
-  condition: and(succeeded('BuildPackage'), succeeded('BuildDocker'))
-
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - task: SSH@0
-    displayName: 'Update Unstable Repository'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
-    inputs:
-      sshEndpoint: repository
-      runOptions: 'inline'
-      inline: |
-        sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) unstable
-        rm $0
-        exit
-
-  - task: SSH@0
-    displayName: 'Update Stable Repository'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
-    inputs:
-      sshEndpoint: repository
-      runOptions: 'inline'
-      inline: |
-        sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber)
-        rm $0
-        exit
-
-- job: PublishNuget
-  displayName: 'Publish NuGet packages'
-  dependsOn:
-  - BuildPackage
-  condition: and(succeeded('BuildPackage'), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
-  
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - task: NuGetCommand@2
-    inputs:
-      command: 'pack'
-      packagesToPack: Jellyfin.Data/Jellyfin.Data.csproj;MediaBrowser.Common/MediaBrowser.Common.csproj;MediaBrowser.Controller/MediaBrowser.Controller.csproj;MediaBrowser.Model/MediaBrowser.Model.csproj;Emby.Naming/Emby.Naming.csproj
-      packDestination: '$(Build.ArtifactStagingDirectory)'
-
-  - task: NuGetCommand@2
-    inputs:
-      command: 'push'
-      packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg'
-      includeNugetOrg: 'true'

.ci/azure-pipelines-test.yml

@@ -1,93 +0,0 @@
-parameters:
-- name: ImageNames
-  type: object
-  default:
-    Linux: "ubuntu-latest"
-    Windows: "windows-latest"
-    macOS: "macos-latest"
-- name: TestProjects
-  type: string
-  default: "tests/**/*Tests.csproj"
-- name: DotNetSdkVersion
-  type: string
-  default: 3.1.100
-
-jobs:
-  - job: Test
-    displayName: Test
-    strategy:
-      matrix:
-        ${{ each imageName in parameters.ImageNames }}:
-          ${{ imageName.key }}:
-            ImageName: ${{ imageName.value }}
-    pool:
-      vmImage: "$(ImageName)"
-    steps:
-      - checkout: self
-        clean: true
-        submodules: true
-        persistCredentials: false
-
-      # This is required for the SonarCloud analyzer
-      - task: UseDotNet@2
-        displayName: "Install .NET Core SDK 2.1"
-        condition: eq(variables['ImageName'], 'ubuntu-latest')
-        inputs:
-          packageType: sdk
-          version: '2.1.805'
-
-      - task: UseDotNet@2
-        displayName: "Update DotNet"
-        inputs:
-          packageType: sdk
-          version: ${{ parameters.DotNetSdkVersion }}
-
-      - task: SonarCloudPrepare@1
-        displayName: 'Prepare analysis on SonarCloud'
-        condition: eq(variables['ImageName'], 'ubuntu-latest')
-        enabled: false
-        inputs:
-          SonarCloud: 'Sonarcloud for Jellyfin'
-          organization: 'jellyfin'
-          projectKey: 'jellyfin_jellyfin'
-
-      - task: DotNetCoreCLI@2
-        displayName: 'Run CLI Tests'
-        inputs:
-          command: "test"
-          projects: ${{ parameters.TestProjects }}
-          arguments: '--configuration Release --collect:"XPlat Code Coverage" --settings tests/coverletArgs.runsettings --verbosity minimal "-p:GenerateDocumentationFile=False"'
-          publishTestResults: true
-          testRunTitle: $(Agent.JobName)
-          workingDirectory: "$(Build.SourcesDirectory)"
-
-      - task: SonarCloudAnalyze@1
-        displayName: 'Run Code Analysis'
-        condition: eq(variables['ImageName'], 'ubuntu-latest')
-        enabled: false
-
-      - task: SonarCloudPublish@1
-        displayName: 'Publish Quality Gate Result'
-        condition: eq(variables['ImageName'], 'ubuntu-latest')
-        enabled: false
-
-      - task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging
-        displayName: 'Run ReportGenerator'
-        enabled: false
-        inputs:
-          reports: "$(Agent.TempDirectory)/**/coverage.cobertura.xml"
-          targetdir: "$(Agent.TempDirectory)/merged/"
-          reporttypes: "Cobertura"
-
-      ## V2 is already in the repository but it does not work "wrong number of segments" YAML error.
-      - task: PublishCodeCoverageResults@1
-        condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) # !! THIS is for V1 only V2 will/should support merging
-        displayName: 'Publish Code Coverage'
-        enabled: false
-        inputs:
-          codeCoverageTool: "cobertura"
-          #summaryFileLocation: '$(Agent.TempDirectory)/**/coverage.cobertura.xml' # !!THIS IS FOR V2
-          summaryFileLocation: "$(Agent.TempDirectory)/merged/**.xml"
-          pathToSources: $(Build.SourcesDirectory)
-          failIfCoverageEmpty: true

.ci/azure-pipelines.yml

@@ -1,12 +1,10 @@
 name: $(Date:yyyyMMdd)$(Rev:.r)
 
 variables:
-- name: TestProjects
-  value: 'tests/**/*Tests.csproj'
-- name: RestoreBuildProjects
-  value: 'Jellyfin.Server/Jellyfin.Server.csproj'
-- name: DotNetSdkVersion
-  value: 3.1.100
+  - name: TestProjects
+    value: 'tests/Jellyfin.Common.Tests/Jellyfin.Common.Tests.csproj'
+  - name: RestoreBuildProjects
+    value: 'Jellyfin.Server/Jellyfin.Server.csproj'
 
 pr:
   autoCancel: true
@@ -15,24 +13,271 @@ trigger:
   batch: true
 
 jobs:
-- ${{ if not(or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))) }}:
-  - template: azure-pipelines-main.yml
-    parameters:
-      LinuxImage: 'ubuntu-latest'
-      RestoreBuildProjects: $(RestoreBuildProjects)
+  - job: main_build
+    displayName: Main Build
+    pool:
+      vmImage: ubuntu-latest
+    strategy:
+      matrix:
+        release:
+          BuildConfiguration: Release
+        debug:
+          BuildConfiguration: Debug
+      maxParallel: 2
+    steps:
+    - checkout: self
+      clean: true
+      submodules: true
+      persistCredentials: true
 
-- ${{ if not(or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))) }}:
-  - template: azure-pipelines-test.yml
-    parameters:
-      ImageNames:
-        Linux: 'ubuntu-latest'
-        Windows: 'windows-latest'
-        macOS: 'macos-latest'
+    - task: CmdLine@2
+      displayName: "Check out web"
+      condition: and(succeeded(), or(contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        script: 'git clone --single-branch --branch $(Build.SourceBranchName) --depth=1 https://github.com/jellyfin/jellyfin-web.git $(Agent.TempDirectory)/jellyfin-web'
 
-- ${{ if not(or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master'))) }}:
-  - template: azure-pipelines-abi.yml
-    parameters:
-      Packages:
+    - task: CmdLine@2
+      displayName: "Check out web (PR)"
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest'))
+      inputs:
+        script: 'git clone --single-branch --branch $(System.PullRequest.TargetBranch) --depth 1 https://github.com/jellyfin/jellyfin-web.git $(Agent.TempDirectory)/jellyfin-web'
+
+    - task: NodeTool@0
+      displayName: 'Install Node.js'
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        versionSpec: '10.x'
+
+    - task: CmdLine@2
+      displayName: "Build Web UI"
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        script: yarn install
+        workingDirectory: $(Agent.TempDirectory)/jellyfin-web
+
+    - task: CopyFiles@2
+      displayName: Copy the web UI
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist # Optional
+        contents: '**'
+        targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web
+        cleanTargetFolder: true # Optional
+        overWrite: true # Optional
+        flattenFolders: false # Optional
+
+    - task: DotNetCoreCLI@2
+      displayName: Publish
+      inputs:
+        command: publish
+        publishWebProjects: false
+        projects: '$(RestoreBuildProjects)'
+        arguments: '--configuration $(BuildConfiguration) --output $(build.artifactstagingdirectory)'
+        zipAfterPublish: false
+
+    - task: PublishPipelineArtifact@0
+      displayName: 'Publish Artifact Naming'
+      condition: and(eq(variables['BuildConfiguration'], 'Release'), succeeded())
+      inputs:
+        targetPath: '$(build.artifactstagingdirectory)/Jellyfin.Server/Emby.Naming.dll'
+        artifactName: 'Jellyfin.Naming'
+
+    - task: PublishPipelineArtifact@0
+      displayName: 'Publish Artifact Controller'
+      condition: and(eq(variables['BuildConfiguration'], 'Release'), succeeded())
+      inputs:
+        targetPath: '$(build.artifactstagingdirectory)/Jellyfin.Server/MediaBrowser.Controller.dll'
+        artifactName: 'Jellyfin.Controller'
+
+    - task: PublishPipelineArtifact@0
+      displayName: 'Publish Artifact Model'
+      condition: and(eq(variables['BuildConfiguration'], 'Release'), succeeded())
+      inputs:
+        targetPath: '$(build.artifactstagingdirectory)/Jellyfin.Server/MediaBrowser.Model.dll'
+        artifactName: 'Jellyfin.Model'
+
+    - task: PublishPipelineArtifact@0
+      displayName: 'Publish Artifact Common'
+      condition: and(eq(variables['BuildConfiguration'], 'Release'), succeeded())
+      inputs:
+        targetPath: '$(build.artifactstagingdirectory)/Jellyfin.Server/MediaBrowser.Common.dll'
+        artifactName: 'Jellyfin.Common'
+
+  - job: main_test
+    displayName: Main Test
+    pool:
+      vmImage: windows-latest
+    steps:
+    - checkout: self
+      clean: true
+      submodules: true
+      persistCredentials: false
+
+    - task: DotNetCoreCLI@2
+      displayName: Build
+      inputs:
+        command: build
+        publishWebProjects: false
+        projects: '$(TestProjects)'
+        arguments: '--configuration $(BuildConfiguration)'
+        zipAfterPublish: false
+
+    - task: VisualStudioTestPlatformInstaller@1
+      inputs:
+        packageFeedSelector: 'nugetOrg' # Options: nugetOrg, customFeed, netShare
+        versionSelector: 'latestPreRelease' # Required when packageFeedSelector == NugetOrg || PackageFeedSelector == CustomFeed# Options: latestPreRelease, latestStable, specificVersion
+
+    - task: VSTest@2
+      inputs:
+        testSelector: 'testAssemblies' # Options: testAssemblies, testPlan, testRun
+        testAssemblyVer2: | # Required when testSelector == TestAssemblies
+          **\bin\$(BuildConfiguration)\**\*test*.dll
+          !**\obj\**
+          !**\xunit.runner.visualstudio.testadapter.dll
+          !**\xunit.runner.visualstudio.dotnetcore.testadapter.dll
+        #testPlan: # Required when testSelector == TestPlan
+        #testSuite: # Required when testSelector == TestPlan
+        #testConfiguration: # Required when testSelector == TestPlan
+        #tcmTestRun: '$(test.RunId)' # Optional
+        searchFolder: '$(System.DefaultWorkingDirectory)'
+        #testFiltercriteria: # Optional
+        #runOnlyImpactedTests: False # Optional
+        #runAllTestsAfterXBuilds: '50' # Optional
+        #uiTests: false # Optional
+        #vstestLocationMethod: 'version' # Optional. Options: version, location
+        #vsTestVersion: 'latest' # Optional. Options: latest, 16.0, 15.0, 14.0, toolsInstaller
+        #vstestLocation: # Optional
+        #runSettingsFile: # Optional
+        #overrideTestrunParameters: # Optional
+        #pathtoCustomTestAdapters: # Optional
+        runInParallel: True # Optional
+        runTestsInIsolation: True # Optional
+        codeCoverageEnabled: True # Optional
+        #otherConsoleOptions: # Optional
+        #distributionBatchType: 'basedOnTestCases' # Optional. Options: basedOnTestCases, basedOnExecutionTime, basedOnAssembly
+        #batchingBasedOnAgentsOption: 'autoBatchSize' # Optional. Options: autoBatchSize, customBatchSize
+        #customBatchSizeValue: '10' # Required when distributionBatchType == BasedOnTestCases && BatchingBasedOnAgentsOption == CustomBatchSize
+        #batchingBasedOnExecutionTimeOption: 'autoBatchSize' # Optional. Options: autoBatchSize, customTimeBatchSize
+        #customRunTimePerBatchValue: '60' # Required when distributionBatchType == BasedOnExecutionTime && BatchingBasedOnExecutionTimeOption == CustomTimeBatchSize
+        #dontDistribute: False # Optional
+        #testRunTitle: # Optional
+        #platform: # Optional
+        configuration: 'Debug' # Optional
+        publishRunAttachments: true # Optional
+        #diagnosticsEnabled: false # Optional
+        #collectDumpOn: 'onAbortOnly' # Optional. Options: onAbortOnly, always, never
+        #rerunFailedTests: False # Optional
+        #rerunType: 'basedOnTestFailurePercentage' # Optional. Options: basedOnTestFailurePercentage, basedOnTestFailureCount
+        #rerunFailedThreshold: '30' # Optional
+        #rerunFailedTestCasesMaxLimit: '5' # Optional
+        #rerunMaxAttempts: '3' # Optional
+
+    # - task: PublishTestResults@2
+    #   inputs:
+    #     testResultsFormat: 'VSTest' # Options: JUnit, NUnit, VSTest, xUnit, cTest
+    #     testResultsFiles: '**/*.trx'
+    #     #searchFolder: '$(System.DefaultWorkingDirectory)' # Optional
+    #     mergeTestResults: true # Optional
+    #     #failTaskOnFailedTests: false # Optional
+    #     #testRunTitle: # Optional
+    #     #buildPlatform: # Optional
+    #     #buildConfiguration: # Optional
+    #     #publishRunAttachments: true # Optional
+
+  - job: main_build_win
+    displayName: Main Build Windows
+    pool:
+      vmImage: windows-latest
+    strategy:
+      matrix:
+        release:
+          BuildConfiguration: Release
+      maxParallel: 2
+    steps:
+    - checkout: self
+      clean: true
+      submodules: true
+      persistCredentials: true
+
+    - task: CmdLine@2
+      displayName: "Check out web"
+      condition: and(succeeded(), or(contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        script: 'git clone --single-branch --branch $(Build.SourceBranchName) --depth=1 https://github.com/jellyfin/jellyfin-web.git $(Agent.TempDirectory)/jellyfin-web'
+
+    - task: CmdLine@2
+      displayName: "Check out web (PR)"
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest'))
+      inputs:
+        script: 'git clone --single-branch --branch $(System.PullRequest.TargetBranch) --depth 1 https://github.com/jellyfin/jellyfin-web.git $(Agent.TempDirectory)/jellyfin-web'
+
+    - task: NodeTool@0
+      displayName: 'Install Node.js'
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        versionSpec: '10.x'
+
+    - task: CmdLine@2
+      displayName: "Build Web UI"
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        script: yarn install
+        workingDirectory: $(Agent.TempDirectory)/jellyfin-web
+
+    - task: CopyFiles@2
+      displayName: Copy the web UI
+      condition: and(succeeded(), or(contains(variables['System.PullRequest.TargetBranch'], 'release'), contains(variables['System.PullRequest.TargetBranch'], 'master'), contains(variables['Build.SourceBranch'], 'release'), contains(variables['Build.SourceBranch'], 'master')) ,eq(variables['BuildConfiguration'], 'Release'), in(variables['Build.Reason'], 'PullRequest', 'IndividualCI', 'BatchedCI', 'BuildCompletion'))
+      inputs:
+        sourceFolder: $(Agent.TempDirectory)/jellyfin-web/dist # Optional
+        contents: '**'
+        targetFolder: $(Build.SourcesDirectory)/MediaBrowser.WebDashboard/jellyfin-web
+        cleanTargetFolder: true # Optional
+        overWrite: true # Optional
+        flattenFolders: false # Optional
+
+    - task: CmdLine@2
+      displayName: Clone the UX repository
+      inputs:
+        script: git clone --depth=1 https://github.com/jellyfin/jellyfin-ux $(Agent.TempDirectory)\jellyfin-ux
+
+    - task: PowerShell@2
+      displayName: Build the NSIS Installer
+      inputs:
+        targetType: 'filePath' # Optional. Options: filePath, inline
+        filePath: ./deployment/windows/build-jellyfin.ps1 # Required when targetType == FilePath
+        arguments: -InstallFFMPEG -InstallNSSM -MakeNSIS -InstallTrayApp -UXLocation $(Agent.TempDirectory)\jellyfin-ux -InstallLocation $(build.artifactstagingdirectory)
+        #script: '# Write your PowerShell commands here.Write-Host Hello World' # Required when targetType == Inline
+        errorActionPreference: 'stop' # Optional. Options: stop, continue, silentlyContinue
+        #failOnStderr: false # Optional
+        #ignoreLASTEXITCODE: false # Optional
+        #pwsh: false # Optional
+        workingDirectory: $(Build.SourcesDirectory) # Optional
+
+    - task: CopyFiles@2
+      displayName: Copy the NSIS Installer to the artifact directory
+      inputs:
+        sourceFolder: $(Build.SourcesDirectory)/deployment/windows/ # Optional
+        contents: 'jellyfin*.exe'
+        targetFolder: $(System.ArtifactsDirectory)/setup
+        cleanTargetFolder: true # Optional
+        overWrite: true # Optional
+        flattenFolders: true # Optional
+
+    - task: PublishPipelineArtifact@0
+      displayName: 'Publish Setup Artifact'
+      condition: and(eq(variables['BuildConfiguration'], 'Release'), succeeded())
+      inputs:
+        targetPath: '$(build.artifactstagingdirectory)/setup'
+        artifactName: 'Jellyfin Server Setup'
+
+  - job: dotnet_compat
+    displayName: Compatibility Check
+    pool:
+      vmImage: ubuntu-latest
+    dependsOn: main_build
+    condition: and(succeeded(), variables['System.PullRequest.PullRequestNumber']) # Only execute if the pullrequest numer is defined. (So not for normal CI builds)
+    strategy:
+      matrix:
         Naming:
           NugetPackageName: Jellyfin.Naming
           AssemblyFileName: Emby.Naming.dll
@@ -45,7 +290,82 @@ jobs:
         Common:
           NugetPackageName: Jellyfin.Common
           AssemblyFileName: MediaBrowser.Common.dll
-      LinuxImage: 'ubuntu-latest'
+      maxParallel: 2
+    steps:
+    - checkout: none
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Download the New Assembly Build Artifact
+      inputs:
+        source: 'current' # Options: current, specific
+        #preferTriggeringPipeline: false # Optional
+        #tags: # Optional
+        artifact: '$(NugetPackageName)' # Optional
+        #patterns: '**' # Optional
+        path: '$(System.ArtifactsDirectory)/new-artifacts'
+        #project: # Required when source == Specific
+        #pipeline: # Required when source == Specific
+        runVersion: 'latest' # Required when source == Specific. Options: latest, latestFromBranch, specific
+        #runBranch: 'refs/heads/master' # Required when source == Specific && runVersion == LatestFromBranch
+        #runId: # Required when source == Specific && runVersion == Specific
+
+    - task: CopyFiles@2
+      displayName: Copy New Assembly to new-release folder
+      inputs:
+        sourceFolder: $(System.ArtifactsDirectory)/new-artifacts # Optional
+        contents: '**/*.dll'
+        targetFolder: $(System.ArtifactsDirectory)/new-release
+        cleanTargetFolder: true # Optional
+        overWrite: true # Optional
+        flattenFolders: true # Optional
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Download the Reference Assembly Build Artifact
+      inputs:
+        source: 'specific' # Options: current, specific
+        #preferTriggeringPipeline: false # Optional
+        #tags: # Optional
+        artifact: '$(NugetPackageName)' # Optional
+        #patterns: '**' # Optional
+        path: '$(System.ArtifactsDirectory)/current-artifacts'
+        project: '$(System.TeamProjectId)' # Required when source == Specific
+        pipeline: '$(System.DefinitionId)' # Required when source == Specific
+        runVersion: 'latestFromBranch' # Required when source == Specific. Options: latest, latestFromBranch, specific
+        runBranch: 'refs/heads/$(System.PullRequest.TargetBranch)' # Required when source == Specific && runVersion == LatestFromBranch
+        #runId: # Required when source == Specific && runVersion == Specific
+
+    - task: CopyFiles@2
+      displayName: Copy Reference Assembly to current-release folder
+      inputs:
+        sourceFolder: $(System.ArtifactsDirectory)/current-artifacts # Optional
+        contents: '**/*.dll'
+        targetFolder: $(System.ArtifactsDirectory)/current-release
+        cleanTargetFolder: true # Optional
+        overWrite: true # Optional
+        flattenFolders: true # Optional
+
+    - task: DownloadGitHubRelease@0
+      displayName: Download ABI compatibility check tool from GitHub
+      inputs:
+        connection: Jellyfin Release Download
+        userRepository: EraYaN/dotnet-compatibility
+        defaultVersionType: 'latest' # Options: latest, specificVersion, specificTag
+        #version: # Required when defaultVersionType != Latest
+        itemPattern: '**-ci.zip' # Optional
+        downloadPath: '$(System.ArtifactsDirectory)'
+
+    - task: ExtractFiles@1
+      displayName: Extract ABI compatibility check tool
+      inputs:
+        archiveFilePatterns: '$(System.ArtifactsDirectory)/*-ci.zip'
+        destinationFolder: $(System.ArtifactsDirectory)/tools
+        cleanDestinationFolder: true
+
+    - task: CmdLine@2
+      displayName: Execute ABI compatibility check tool
+      inputs:
+        script: 'dotnet tools/CompatibilityCheckerCoreCLI.dll current-release/$(AssemblyFileName) new-release/$(AssemblyFileName) --azure-pipelines'
+        workingDirectory: $(System.ArtifactsDirectory) # Optional
+        #failOnStderr: false # Optional
+
 
-- ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
-  - template: azure-pipelines-package.yml

.ci/publish-nightly.yml

@@ -0,0 +1,46 @@
+name: Nightly-$(date:yyyyMMdd).$(rev:r)
+
+variables:
+  - name: Version
+    value: '1.0.0'
+
+trigger: none
+pr: none
+
+jobs:
+  - job: publish_artifacts_nightly
+    displayName: Publish Artifacts Nightly
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - checkout: none
+    - task: DownloadPipelineArtifact@2
+      displayName: Download the Windows Setup Artifact
+      inputs:
+        source: 'specific' # Options: current, specific
+        artifact: 'Jellyfin Server Setup' # Optional
+        path: '$(System.ArtifactsDirectory)/win-installer'
+        project: '$(System.TeamProjectId)' # Required when source == Specific
+        pipelineId: 1 # Required when source == Specific
+        runVersion: 'latestFromBranch' # Required when source == Specific. Options: latest, latestFromBranch, specific
+        runBranch: 'refs/heads/master' # Required when source == Specific && runVersion == LatestFromBranch
+
+    - task: SSH@0
+      displayName: 'Create Drop directory'
+      inputs:
+        sshEndpoint: 'Jellyfin Build Server'
+        commands: 'mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer && ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_nightly_azure_upload'
+
+    - task: CopyFilesOverSSH@0
+      displayName: 'Copy the Windows Setup to the Repo'
+      inputs:
+        sshEndpoint: 'Jellyfin Build Server'
+        sourceFolder: '$(System.ArtifactsDirectory)/win-installer'
+        contents: 'jellyfin_*.exe'
+        targetFolder: '/srv/incoming/jellyfin_nightly_azure_upload/win-installer'
+
+    - task: SSH@0
+      displayName: 'Clean up SCP symlink'
+      inputs:
+        sshEndpoint: 'Jellyfin Build Server'
+        commands: 'rm -f /srv/incoming/jellyfin_nightly_azure_upload'

.ci/publish-release.yml

@@ -0,0 +1,48 @@
+name: Release-$(Version)-$(date:yyyyMMdd).$(rev:r)
+
+variables:
+  - name: Version
+    value: '1.0.0'
+  - name: UsedRunId
+    value: 0
+
+trigger: none
+pr: none
+
+jobs:
+  - job: publish_artifacts_release
+    displayName: Publish Artifacts Release
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+    - checkout: none
+    - task: DownloadPipelineArtifact@2
+      displayName: Download the Windows Setup Artifact
+      inputs:
+        source: 'specific' # Options: current, specific
+        artifact: 'Jellyfin Server Setup' # Optional
+        path: '$(System.ArtifactsDirectory)/win-installer'
+        project: '$(System.TeamProjectId)' # Required when source == Specific
+        pipelineId: 1 # Required when source == Specific
+        runVersion: 'specific' # Required when source == Specific. Options: latest, latestFromBranch, specific
+        runId: $(UsedRunId)
+
+    - task: SSH@0
+      displayName: 'Create Drop directory'
+      inputs:
+        sshEndpoint: 'Jellyfin Build Server'
+        commands: 'mkdir -p /srv/incoming/jellyfin_$(Version)/win-installer && ln -s /srv/incoming/jellyfin_$(Version) /srv/incoming/jellyfin_release_azure_upload'
+
+    - task: CopyFilesOverSSH@0
+      displayName: 'Copy the Windows Setup to the Repo'
+      inputs:
+        sshEndpoint: 'Jellyfin Build Server'
+        sourceFolder: '$(System.ArtifactsDirectory)/win-installer'
+        contents: 'jellyfin_*.exe'
+        targetFolder: '/srv/incoming/jellyfin_release_azure_upload/win-installer'
+
+    - task: SSH@0
+      displayName: 'Clean up SCP symlink'
+      inputs:
+        sshEndpoint: 'Jellyfin Build Server'
+        commands: 'rm -f /srv/incoming/jellyfin_release_azure_upload'

.copr/Makefile

@@ -1 +0,0 @@
-../fedora/Makefile

.copr/Makefile

@@ -0,0 +1,59 @@
+VERSION := $(shell sed -ne '/^Version:/s/.*  *//p'                      \
+                   deployment/fedora-package-x64/pkg-src/jellyfin.spec)
+
+deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz:
+	curl -f -L -o deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz \
+         https://github.com/jellyfin/jellyfin-web/archive/v$(VERSION).tar.gz \
+	|| curl -f -L -o deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz \
+         https://github.com/jellyfin/jellyfin-web/archive/master.tar.gz \
+
+srpm: deployment/fedora-package-x64/pkg-src/jellyfin-web-$(VERSION).tar.gz
+	cd deployment/fedora-package-x64;                                             \
+    SOURCE_DIR=../..                                                              \
+    WORKDIR="$${PWD}";                                                            \
+    package_temporary_dir="$${WORKDIR}/pkg-dist-tmp";                             \
+    pkg_src_dir="$${WORKDIR}/pkg-src";                                            \
+    GNU_TAR=1;                                                                    \
+    tar                                                                           \
+    --transform "s,^\.,jellyfin-$(VERSION),"                                      \
+    --exclude='.git*'                                                             \
+    --exclude='**/.git'                                                           \
+    --exclude='**/.hg'                                                            \
+    --exclude='**/.vs'                                                            \
+    --exclude='**/.vscode'                                                        \
+    --exclude='deployment'                                                        \
+    --exclude='**/bin'                                                            \
+    --exclude='**/obj'                                                            \
+    --exclude='**/.nuget'                                                         \
+    --exclude='*.deb'                                                             \
+    --exclude='*.rpm'                                                             \
+    -czf "pkg-src/jellyfin-$(VERSION).tar.gz"                                     \
+    -C $${SOURCE_DIR} ./ || GNU_TAR=0;                                            \
+    if [ $${GNU_TAR} -eq 0 ]; then                                                \
+        package_temporary_dir="$$(mktemp -d)";                                    \
+        mkdir -p "$${package_temporary_dir}/jellyfin";                            \
+        tar                                                                       \
+        --exclude='.git*'                                                         \
+        --exclude='**/.git'                                                       \
+        --exclude='**/.hg'                                                        \
+        --exclude='**/.vs'                                                        \
+        --exclude='**/.vscode'                                                    \
+        --exclude='deployment'                                                    \
+        --exclude='**/bin'                                                        \
+        --exclude='**/obj'                                                        \
+        --exclude='**/.nuget'                                                     \
+        --exclude='*.deb'                                                         \
+        --exclude='*.rpm'                                                         \
+        -czf "$${package_temporary_dir}/jellyfin/jellyfin-$(VERSION).tar.gz"      \
+        -C $${SOURCE_DIR} ./;                                                     \
+        mkdir -p "$${package_temporary_dir}/jellyfin-$(VERSION)";                 \
+        tar -xzf "$${package_temporary_dir}/jellyfin/jellyfin-$(VERSION).tar.gz"  \
+            -C "$${package_temporary_dir}/jellyfin-$(VERSION);                    \
+        rm -f "$${package_temporary_dir}/jellyfin/jellyfin-$(VERSION).tar.gz";    \
+        tar -czf "$${SOURCE_DIR}/SOURCES/pkg-src/jellyfin-$(VERSION).tar.gz"      \
+            -C "$${package_temporary_dir}" "jellyfin-$(VERSION);                  \
+        rm -rf $${package_temporary_dir};                                         \
+	fi;                                                                           \
+	rpmbuild -bs pkg-src/jellyfin.spec                                            \
+	         --define "_sourcedir $$PWD/pkg-src/"                                 \
+	         --define "_srcrpmdir $(outdir)"

.editorconfig

@@ -13,7 +13,7 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
-max_line_length = off
+max_line_length = null
 
 # YAML indentation
 [*.{yml,yaml}]
@@ -22,7 +22,6 @@ indent_size = 2
 # XML indentation
 [*.{csproj,xml}]
 indent_size = 2
-
 ###############################
 # .NET Coding Conventions     #
 ###############################
@@ -52,12 +51,11 @@ dotnet_style_explicit_tuple_names = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_prefer_inferred_tuple_names = true:suggestion
+dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_auto_properties = true:silent
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
-
 ###############################
 # Naming Conventions          #
 ###############################
@@ -69,7 +67,7 @@ dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non
 dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.style = non_private_static_field_style
 
 dotnet_naming_symbols.non_private_static_fields.applicable_kinds = field
-dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected_internal, private_protected
+dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected internal, private protected
 dotnet_naming_symbols.non_private_static_fields.required_modifiers = static
 
 dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case
@@ -161,7 +159,6 @@ csharp_style_deconstructed_variable_declaration = true:suggestion
 csharp_prefer_simple_default_expression = true:suggestion
 csharp_style_pattern_local_over_anonymous_function = true:suggestion
 csharp_style_inlined_variable_declaration = true:suggestion
-
 ###############################
 # C# Formatting Rules         #
 ###############################
@@ -192,3 +189,9 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
+###############################
+# VB Coding Conventions       #
+###############################
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

.github/CODEOWNERS

@@ -1,3 +0,0 @@
-# Joshua must review all changes to deployment and build.sh
-deployment/*    @joshuaboniface
-build.sh        @joshuaboniface

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,19 +10,6 @@ assignees: ''
 **Describe the bug**
 <!-- A clear and concise description of what the bug is. -->
 
-**System (please complete the following information):**
- - OS: [e.g. Debian, Windows]
- - Virtualization: [e.g. Docker, KVM, LXC]
- - Clients: [Browser, Android, Fire Stick, etc.]
- - Browser: [e.g. Firefox 72, Chrome 80, Safari 13]
- - Jellyfin Version: [e.g. 10.4.3, nightly 20191231]
- - Playback: [Direct Play, Remux, Direct Stream, Transcode] 
- - Installed Plugins: [e.g. none, Fanart, Anime, etc.]
- - Reverse Proxy: [e.g. none, nginx, apache, etc.]
- - Base URL: [e.g. none, yes: /example]
- - Networking: [e.g. Host, Bridge/NAT]
- - Storage: [e.g. local, NFS, cloud]
-
 **To Reproduce**
 <!-- Steps to reproduce the behavior: -->
 1. Go to '...'
@@ -39,5 +26,11 @@ assignees: ''
 **Screenshots**
 <!-- If applicable, add screenshots to help explain your problem. -->
 
+**System (please complete the following information):**
+ - OS: [e.g. Docker, Debian, Windows]
+ - Browser: [e.g. Firefox, Chrome, Safari]
+ - Jellyfin Version: [e.g. 10.0.1]
+ - Reverse proxy: [e.g. no, nginx, apache, etc.]
+
 **Additional context**
 <!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,13 +0,0 @@
----
-name: Feature Request
-about: Request a new feature
-title: ''
-labels: feature-request
-assignees: ''
----
-
-**PLEASE DO NOT OPEN FEATURE REQUEST ISSUES ON GITHUB**
-
-**Feature requests should be opened on our dedicated [feature request](https://features.jellyfin.org/) hub so they can be appropriately discussed and prioritized.**
-
-However, if you are willing to contribute to the project by adding a new feature yourself, then please ensure that you first review our [documentation](https://docs.jellyfin.org/general/contributing/development.html) on contributing code. Once you have reviewed the documentation, feel free to come back here and open an issue here outlining your proposed approach so that it can be documented, tracked, and discussed by other team members.

.github/ISSUE_TEMPLATE/media_playback.md

@@ -11,10 +11,7 @@ assignees: ''
 <!-- Use the Media Info tool (set to text format, download here: https://mediaarea.net/en/MediaInfo) or copy the info from the web ui for the file with the playback issue. -->
 
 **Logs**
-<!-- Please paste any log messages from during the playback issue. -->
-
-**FFmpeg Logs**
-<!-- Please paste any FFmpeg logs if remuxing or transcoding appears to be part of the issue. -->
+<!-- Please paste any log message from during the playback issue, for example the ffmpeg command line can be very useful. -->
 
 **Stats for Nerds Screenshots**
 <!-- If available, add screenshots of the stats for nerds screen to help show the issue problem. -->
@@ -32,3 +29,4 @@ assignees: ''
  - Client: [e.g. Web/Browser, webOS, Android, Android TV, Electron]
  - Browser (if Web client): [e.g. Firefox, Chrome, Safari]
  - Client and Browser Version: [e.g. 10.3.4 and 68.0]
+

.github/dependabot.yml

@@ -1,9 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: nuget
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: '12:00'
-  open-pull-requests-limit: 10
-  

.github/stale.yml

@@ -1,7 +1,7 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 120
+daysUntilStale: 90
 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 21
+daysUntilClose: 14
 # Issues with these labels will never be considered stale
 exemptLabels:
   - regression
@@ -11,15 +11,12 @@ exemptLabels:
   - future
   - feature
   - enhancement
-  - confirmed
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
-  This issue has gone 120 days without comment. To avoid abandoned issues, it will be closed in 21 days if there are no new comments.
-  
-  If you're the original submitter of this issue, please comment confirming if this issue still affects you in the latest release or nightlies, or close the issue if it has been fixed. If you're another user also affected by this bug, please comment confirming so. Either action will remove the stale label.
-
-  This bot exists to prevent issues from becoming stale and forgotten. Jellyfin is always moving forward, and bugs are often fixed as side effects of other changes. We therefore ask that bug report authors remain vigilant about their issues to ensure they are closed if fixed, or re-confirmed - perhaps with fresh logs or reproduction examples - regularly. If you have any questions you can reach us on [Matrix or Social Media](https://docs.jellyfin.org/general/getting-help.html).
+  Issues go stale after 90d of inactivity. Mark the issue as fresh by adding a comment or commit. Stale issues close after an additional 14d of inactivity.
+  If this issue is safe to close now please do so.
+  If you have any questions you can reach us on [Matrix or Social Media](https://docs.jellyfin.org/general/getting-help.html).
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: false

.gitignore

@@ -244,14 +244,14 @@ pip-log.txt
 #########################
 
 # Artifacts for debian-x64
-debian/.debhelper/
-debian/*.debhelper
-debian/debhelper-build-stamp
-debian/files
-debian/jellyfin.substvars
-debian/jellyfin/
+deployment/debian-package-x64/pkg-src/.debhelper/
+deployment/debian-package-x64/pkg-src/*.debhelper
+deployment/debian-package-x64/pkg-src/debhelper-build-stamp
+deployment/debian-package-x64/pkg-src/files
+deployment/debian-package-x64/pkg-src/jellyfin.substvars
+deployment/debian-package-x64/pkg-src/jellyfin/
 # Don't ignore the debian/bin folder
-!debian/bin/
+!deployment/debian-package-x64/pkg-src/bin/
 
 deployment/**/dist/
 deployment/**/pkg-dist/
@@ -268,11 +268,3 @@ doc/
 # Deployment artifacts
 dist
 *.exe
-
-# BenchmarkDotNet artifacts
-BenchmarkDotNet.Artifacts
-
-# Ignore web artifacts from native builds
-web/
-web-src.*
-MediaBrowser.WebDashboard/jellyfin-web

.vscode/extensions.json

@@ -1,14 +0,0 @@
-{
-	// See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-	// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-	// List of extensions which should be recommended for users of this workspace.
-	"recommendations": [
-        "ms-dotnettools.csharp",
-        "editorconfig.editorconfig"
-	],
-	// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
-	"unwantedRecommendations": [
-
-	]
-}

.vscode/launch.json

@@ -1,13 +1,16 @@
 {
-    "version": "0.2.0",
-    "configurations": [
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
         {
             "name": ".NET Core Launch (console)",
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/netcoreapp3.1/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/netcoreapp2.1/jellyfin.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
@@ -21,8 +24,5 @@
             "request": "attach",
             "processId": "${command:pickProcess}"
         }
-    ],
-    "env": {
-        "DOTNET_CLI_TELEMETRY_OPTOUT": "1"
-    }
-}
+    ,]
+}

.vscode/tasks.json

@@ -10,21 +10,6 @@
                 "${workspaceFolder}/Jellyfin.Server/Jellyfin.Server.csproj"
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "api tests",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "test",
-                "${workspaceFolder}/tests/MediaBrowser.Api.Tests/MediaBrowser.Api.Tests.csproj"
-            ],
-            "problemMatcher": "$msCompile"
         }
-    ],
-    "options": {
-        "env": {
-            "DOTNET_CLI_TELEMETRY_OPTOUT": "1"
-        }
-    }
-}
+    ]
+}

BDInfo/BDInfo.csproj

@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <Compile Include="..\SharedVersion.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+
+</Project>

BDInfo/BDInfoSettings.cs

@@ -0,0 +1,33 @@
+
+namespace BDInfo
+{
+    class BDInfoSettings
+    {
+        public static bool GenerateStreamDiagnostics => true;
+
+        public static bool EnableSSIF => true;
+
+        public static bool AutosaveReport => false;
+
+        public static bool GenerateFrameDataFile => false;
+
+        public static bool FilterLoopingPlaylists => true;
+
+        public static bool FilterShortPlaylists => false;
+
+        public static int FilterShortPlaylistsValue => 0;
+
+        public static bool UseImagePrefix => false;
+
+        public static string UseImagePrefixValue => null;
+
+        /// <summary>
+        /// Setting this to false throws an IComparer error on some discs.
+        /// </summary>
+        public static bool KeepStreamOrder => true;
+
+        public static bool GenerateTextSummary => false;
+
+        public static string LastPath => string.Empty;
+    }
+}

BDInfo/BDROM.cs

@@ -0,0 +1,449 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using MediaBrowser.Model.IO;
+
+namespace BDInfo
+{
+    public class BDROM
+    {
+        public FileSystemMetadata DirectoryRoot = null;
+        public FileSystemMetadata DirectoryBDMV = null;
+        public FileSystemMetadata DirectoryBDJO = null;
+        public FileSystemMetadata DirectoryCLIPINF = null;
+        public FileSystemMetadata DirectoryPLAYLIST = null;
+        public FileSystemMetadata DirectorySNP = null;
+        public FileSystemMetadata DirectorySSIF = null;
+        public FileSystemMetadata DirectorySTREAM = null;
+
+        public string VolumeLabel = null;
+        public ulong Size = 0;
+        public bool IsBDPlus = false;
+        public bool IsBDJava = false;
+        public bool IsDBOX = false;
+        public bool IsPSP = false;
+        public bool Is3D = false;
+        public bool Is50Hz = false;
+
+        private readonly IFileSystem _fileSystem;
+
+        public Dictionary<string, TSPlaylistFile> PlaylistFiles =
+            new Dictionary<string, TSPlaylistFile>();
+        public Dictionary<string, TSStreamClipFile> StreamClipFiles =
+            new Dictionary<string, TSStreamClipFile>();
+        public Dictionary<string, TSStreamFile> StreamFiles =
+            new Dictionary<string, TSStreamFile>();
+        public Dictionary<string, TSInterleavedFile> InterleavedFiles =
+            new Dictionary<string, TSInterleavedFile>();
+
+        public delegate bool OnStreamClipFileScanError(
+            TSStreamClipFile streamClipFile, Exception ex);
+
+        public event OnStreamClipFileScanError StreamClipFileScanError;
+
+        public delegate bool OnStreamFileScanError(
+            TSStreamFile streamClipFile, Exception ex);
+
+        public event OnStreamFileScanError StreamFileScanError;
+
+        public delegate bool OnPlaylistFileScanError(
+            TSPlaylistFile playlistFile, Exception ex);
+
+        public event OnPlaylistFileScanError PlaylistFileScanError;
+
+        public BDROM(string path, IFileSystem fileSystem)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentNullException(nameof(path));
+            }
+
+            _fileSystem = fileSystem;
+            //
+            // Locate BDMV directories.
+            //
+
+            DirectoryBDMV =
+                GetDirectoryBDMV(path);
+
+            if (DirectoryBDMV == null)
+            {
+                throw new Exception("Unable to locate BD structure.");
+            }
+
+            DirectoryRoot =
+                _fileSystem.GetDirectoryInfo(Path.GetDirectoryName(DirectoryBDMV.FullName));
+            DirectoryBDJO =
+                GetDirectory("BDJO", DirectoryBDMV, 0);
+            DirectoryCLIPINF =
+                GetDirectory("CLIPINF", DirectoryBDMV, 0);
+            DirectoryPLAYLIST =
+                GetDirectory("PLAYLIST", DirectoryBDMV, 0);
+            DirectorySNP =
+                GetDirectory("SNP", DirectoryRoot, 0);
+            DirectorySTREAM =
+                GetDirectory("STREAM", DirectoryBDMV, 0);
+            DirectorySSIF =
+                GetDirectory("SSIF", DirectorySTREAM, 0);
+
+            if (DirectoryCLIPINF == null
+                || DirectoryPLAYLIST == null)
+            {
+                throw new Exception("Unable to locate BD structure.");
+            }
+
+            //
+            // Initialize basic disc properties.
+            //
+
+            VolumeLabel = GetVolumeLabel(DirectoryRoot);
+            Size = (ulong)GetDirectorySize(DirectoryRoot);
+
+            if (null != GetDirectory("BDSVM", DirectoryRoot, 0))
+            {
+                IsBDPlus = true;
+            }
+            if (null != GetDirectory("SLYVM", DirectoryRoot, 0))
+            {
+                IsBDPlus = true;
+            }
+            if (null != GetDirectory("ANYVM", DirectoryRoot, 0))
+            {
+                IsBDPlus = true;
+            }
+
+            if (DirectoryBDJO != null &&
+                _fileSystem.GetFilePaths(DirectoryBDJO.FullName).Any())
+            {
+                IsBDJava = true;
+            }
+
+            if (DirectorySNP != null &&
+                GetFilePaths(DirectorySNP.FullName, ".mnv").Any())
+            {
+                IsPSP = true;
+            }
+
+            if (DirectorySSIF != null &&
+                _fileSystem.GetFilePaths(DirectorySSIF.FullName).Any())
+            {
+                Is3D = true;
+            }
+
+            if (File.Exists(Path.Combine(DirectoryRoot.FullName, "FilmIndex.xml")))
+            {
+                IsDBOX = true;
+            }
+
+            //
+            // Initialize file lists.
+            //
+
+            if (DirectoryPLAYLIST != null)
+            {
+                FileSystemMetadata[] files = GetFiles(DirectoryPLAYLIST.FullName, ".mpls").ToArray();
+                foreach (var file in files)
+                {
+                    PlaylistFiles.Add(
+                        file.Name.ToUpper(), new TSPlaylistFile(this, file));
+                }
+            }
+
+            if (DirectorySTREAM != null)
+            {
+                FileSystemMetadata[] files = GetFiles(DirectorySTREAM.FullName, ".m2ts").ToArray();
+                foreach (var file in files)
+                {
+                    StreamFiles.Add(
+                        file.Name.ToUpper(), new TSStreamFile(file, _fileSystem));
+                }
+            }
+
+            if (DirectoryCLIPINF != null)
+            {
+                FileSystemMetadata[] files = GetFiles(DirectoryCLIPINF.FullName, ".clpi").ToArray();
+                foreach (var file in files)
+                {
+                    StreamClipFiles.Add(
+                        file.Name.ToUpper(), new TSStreamClipFile(file));
+                }
+            }
+
+            if (DirectorySSIF != null)
+            {
+                FileSystemMetadata[] files = GetFiles(DirectorySSIF.FullName, ".ssif").ToArray();
+                foreach (var file in files)
+                {
+                    InterleavedFiles.Add(
+                        file.Name.ToUpper(), new TSInterleavedFile(file));
+                }
+            }
+        }
+
+        private IEnumerable<FileSystemMetadata> GetFiles(string path, string extension)
+        {
+            return _fileSystem.GetFiles(path, new[] { extension }, false, false);
+        }
+
+        private IEnumerable<string> GetFilePaths(string path, string extension)
+        {
+            return _fileSystem.GetFilePaths(path, new[] { extension }, false, false);
+        }
+
+        public void Scan()
+        {
+            foreach (var streamClipFile in StreamClipFiles.Values)
+            {
+                try
+                {
+                    streamClipFile.Scan();
+                }
+                catch (Exception ex)
+                {
+                    if (StreamClipFileScanError != null)
+                    {
+                        if (StreamClipFileScanError(streamClipFile, ex))
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    else throw;
+                }
+            }
+
+            foreach (var streamFile in StreamFiles.Values)
+            {
+                string ssifName = Path.GetFileNameWithoutExtension(streamFile.Name) + ".SSIF";
+                if (InterleavedFiles.ContainsKey(ssifName))
+                {
+                    streamFile.InterleavedFile = InterleavedFiles[ssifName];
+                }
+            }
+
+            TSStreamFile[] streamFiles = new TSStreamFile[StreamFiles.Count];
+            StreamFiles.Values.CopyTo(streamFiles, 0);
+            Array.Sort(streamFiles, CompareStreamFiles);
+
+            foreach (var playlistFile in PlaylistFiles.Values)
+            {
+                try
+                {
+                    playlistFile.Scan(StreamFiles, StreamClipFiles);
+                }
+                catch (Exception ex)
+                {
+                    if (PlaylistFileScanError != null)
+                    {
+                        if (PlaylistFileScanError(playlistFile, ex))
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    else throw;
+                }
+            }
+
+            foreach (var streamFile in streamFiles)
+            {
+                try
+                {
+                    var playlists = new List<TSPlaylistFile>();
+                    foreach (var playlist in PlaylistFiles.Values)
+                    {
+                        foreach (var streamClip in playlist.StreamClips)
+                        {
+                            if (streamClip.Name == streamFile.Name)
+                            {
+                                playlists.Add(playlist);
+                                break;
+                            }
+                        }
+                    }
+                    streamFile.Scan(playlists, false);
+                }
+                catch (Exception ex)
+                {
+                    if (StreamFileScanError != null)
+                    {
+                        if (StreamFileScanError(streamFile, ex))
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    else throw;
+                }
+            }
+
+            foreach (var playlistFile in PlaylistFiles.Values)
+            {
+                playlistFile.Initialize();
+                if (!Is50Hz)
+                {
+                    foreach (var videoStream in playlistFile.VideoStreams)
+                    {
+                        if (videoStream.FrameRate == TSFrameRate.FRAMERATE_25 ||
+                            videoStream.FrameRate == TSFrameRate.FRAMERATE_50)
+                        {
+                            Is50Hz = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        private FileSystemMetadata GetDirectoryBDMV(
+            string path)
+        {
+            if (string.IsNullOrEmpty(path))
+            {
+                throw new ArgumentNullException(nameof(path));
+            }
+
+            FileSystemMetadata dir = _fileSystem.GetDirectoryInfo(path);
+
+            while (dir != null)
+            {
+                if (string.Equals(dir.Name, "BDMV", StringComparison.OrdinalIgnoreCase))
+                {
+                    return dir;
+                }
+                var parentFolder = Path.GetDirectoryName(dir.FullName);
+                if (string.IsNullOrEmpty(parentFolder))
+                {
+                    dir = null;
+                }
+                else
+                {
+                    dir = _fileSystem.GetDirectoryInfo(parentFolder);
+                }
+            }
+
+            return GetDirectory("BDMV", _fileSystem.GetDirectoryInfo(path), 0);
+        }
+
+        private FileSystemMetadata GetDirectory(
+            string name,
+            FileSystemMetadata dir,
+            int searchDepth)
+        {
+            if (dir != null)
+            {
+                FileSystemMetadata[] children = _fileSystem.GetDirectories(dir.FullName).ToArray();
+                foreach (var child in children)
+                {
+                    if (string.Equals(child.Name, name, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return child;
+                    }
+                }
+                if (searchDepth > 0)
+                {
+                    foreach (var child in children)
+                    {
+                        GetDirectory(
+                            name, child, searchDepth - 1);
+                    }
+                }
+            }
+            return null;
+        }
+
+        private long GetDirectorySize(FileSystemMetadata directoryInfo)
+        {
+            long size = 0;
+
+            //if (!ExcludeDirs.Contains(directoryInfo.Name.ToUpper()))  // TODO: Keep?
+            {
+                FileSystemMetadata[] pathFiles = _fileSystem.GetFiles(directoryInfo.FullName).ToArray();
+                foreach (var pathFile in pathFiles)
+                {
+                    if (pathFile.Extension.ToUpper() == ".SSIF")
+                    {
+                        continue;
+                    }
+                    size += pathFile.Length;
+                }
+
+                FileSystemMetadata[] pathChildren = _fileSystem.GetDirectories(directoryInfo.FullName).ToArray();
+                foreach (var pathChild in pathChildren)
+                {
+                    size += GetDirectorySize(pathChild);
+                }
+            }
+
+            return size;
+        }
+
+        private string GetVolumeLabel(FileSystemMetadata dir)
+        {
+            return dir.Name;
+        }
+
+        public int CompareStreamFiles(
+            TSStreamFile x,
+            TSStreamFile y)
+        {
+            // TODO: Use interleaved file sizes
+
+            if ((x == null || x.FileInfo == null) && (y == null || y.FileInfo == null))
+            {
+                return 0;
+            }
+            else if ((x == null || x.FileInfo == null) && (y != null && y.FileInfo != null))
+            {
+                return 1;
+            }
+            else if ((x != null && x.FileInfo != null) && (y == null || y.FileInfo == null))
+            {
+                return -1;
+            }
+            else
+            {
+                if (x.FileInfo.Length > y.FileInfo.Length)
+                {
+                    return 1;
+                }
+                else if (y.FileInfo.Length > x.FileInfo.Length)
+                {
+                    return -1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+        }
+    }
+}

BDInfo/LanguageCodes.cs

@@ -0,0 +1,493 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class LanguageCodes
+    {
+        public static string GetName(string code)
+        {
+            switch (code)
+            {
+                case "abk": return "Abkhazian";
+                case "ace": return "Achinese";
+                case "ach": return "Acoli";
+                case "ada": return "Adangme";
+                case "aar": return "Afar";
+                case "afh": return "Afrihili";
+                case "afr": return "Afrikaans";
+                case "afa": return "Afro-Asiatic (Other)";
+                case "aka": return "Akan";
+                case "akk": return "Akkadian";
+                case "alb": return "Albanian";
+                case "sqi": return "Albanian";
+                case "ale": return "Aleut";
+                case "alg": return "Algonquian languages";
+                case "tut": return "Altaic (Other)";
+                case "amh": return "Amharic";
+                case "apa": return "Apache languages";
+                case "ara": return "Arabic";
+                case "arc": return "Aramaic";
+                case "arp": return "Arapaho";
+                case "arn": return "Araucanian";
+                case "arw": return "Arawak";
+                case "arm": return "Armenian";
+                case "hye": return "Armenian";
+                case "art": return "Artificial (Other)";
+                case "asm": return "Assamese";
+                case "ath": return "Athapascan languages";
+                case "aus": return "Australian languages";
+                case "map": return "Austronesian (Other)";
+                case "ava": return "Avaric";
+                case "ave": return "Avestan";
+                case "awa": return "Awadhi";
+                case "aym": return "Aymara";
+                case "aze": return "Azerbaijani";
+                case "ban": return "Balinese";
+                case "bat": return "Baltic (Other)";
+                case "bal": return "Baluchi";
+                case "bam": return "Bambara";
+                case "bai": return "Bamileke languages";
+                case "bad": return "Banda";
+                case "bnt": return "Bantu (Other)";
+                case "bas": return "Basa";
+                case "bak": return "Bashkir";
+                case "baq": return "Basque";
+                case "eus": return "Basque";
+                case "btk": return "Batak (Indonesia)";
+                case "bej": return "Beja";
+                case "bel": return "Belarusian";
+                case "bem": return "Bemba";
+                case "ben": return "Bengali";
+                case "ber": return "Berber (Other)";
+                case "bho": return "Bhojpuri";
+                case "bih": return "Bihari";
+                case "bik": return "Bikol";
+                case "bin": return "Bini";
+                case "bis": return "Bislama";
+                case "bos": return "Bosnian";
+                case "bra": return "Braj";
+                case "bre": return "Breton";
+                case "bug": return "Buginese";
+                case "bul": return "Bulgarian";
+                case "bua": return "Buriat";
+                case "bur": return "Burmese";
+                case "mya": return "Burmese";
+                case "cad": return "Caddo";
+                case "car": return "Carib";
+                case "cat": return "Catalan";
+                case "cau": return "Caucasian (Other)";
+                case "ceb": return "Cebuano";
+                case "cel": return "Celtic (Other)";
+                case "cai": return "Central American Indian (Other)";
+                case "chg": return "Chagatai";
+                case "cmc": return "Chamic languages";
+                case "cha": return "Chamorro";
+                case "che": return "Chechen";
+                case "chr": return "Cherokee";
+                case "chy": return "Cheyenne";
+                case "chb": return "Chibcha";
+                case "chi": return "Chinese";
+                case "zho": return "Chinese";
+                case "chn": return "Chinook jargon";
+                case "chp": return "Chipewyan";
+                case "cho": return "Choctaw";
+                case "chu": return "Church Slavic";
+                case "chk": return "Chuukese";
+                case "chv": return "Chuvash";
+                case "cop": return "Coptic";
+                case "cor": return "Cornish";
+                case "cos": return "Corsican";
+                case "cre": return "Cree";
+                case "mus": return "Creek";
+                case "crp": return "Creoles and pidgins (Other)";
+                case "cpe": return "Creoles and pidgins,";
+                case "cpf": return "Creoles and pidgins,";
+                case "cpp": return "Creoles and pidgins,";
+                case "scr": return "Croatian";
+                case "hrv": return "Croatian";
+                case "cus": return "Cushitic (Other)";
+                case "cze": return "Czech";
+                case "ces": return "Czech";
+                case "dak": return "Dakota";
+                case "dan": return "Danish";
+                case "day": return "Dayak";
+                case "del": return "Delaware";
+                case "din": return "Dinka";
+                case "div": return "Divehi";
+                case "doi": return "Dogri";
+                case "dgr": return "Dogrib";
+                case "dra": return "Dravidian (Other)";
+                case "dua": return "Duala";
+                case "dut": return "Dutch";
+                case "nld": return "Dutch";
+                case "dum": return "Dutch, Middle (ca. 1050-1350)";
+                case "dyu": return "Dyula";
+                case "dzo": return "Dzongkha";
+                case "efi": return "Efik";
+                case "egy": return "Egyptian (Ancient)";
+                case "eka": return "Ekajuk";
+                case "elx": return "Elamite";
+                case "eng": return "English";
+                case "enm": return "English, Middle (1100-1500)";
+                case "ang": return "English, Old (ca.450-1100)";
+                case "epo": return "Esperanto";
+                case "est": return "Estonian";
+                case "ewe": return "Ewe";
+                case "ewo": return "Ewondo";
+                case "fan": return "Fang";
+                case "fat": return "Fanti";
+                case "fao": return "Faroese";
+                case "fij": return "Fijian";
+                case "fin": return "Finnish";
+                case "fiu": return "Finno-Ugrian (Other)";
+                case "fon": return "Fon";
+                case "fre": return "French";
+                case "fra": return "French";
+                case "frm": return "French, Middle (ca.1400-1600)";
+                case "fro": return "French, Old (842-ca.1400)";
+                case "fry": return "Frisian";
+                case "fur": return "Friulian";
+                case "ful": return "Fulah";
+                case "gaa": return "Ga";
+                case "glg": return "Gallegan";
+                case "lug": return "Ganda";
+                case "gay": return "Gayo";
+                case "gba": return "Gbaya";
+                case "gez": return "Geez";
+                case "geo": return "Georgian";
+                case "kat": return "Georgian";
+                case "ger": return "German";
+                case "deu": return "German";
+                case "nds": return "Saxon";
+                case "gmh": return "German, Middle High (ca.1050-1500)";
+                case "goh": return "German, Old High (ca.750-1050)";
+                case "gem": return "Germanic (Other)";
+                case "gil": return "Gilbertese";
+                case "gon": return "Gondi";
+                case "gor": return "Gorontalo";
+                case "got": return "Gothic";
+                case "grb": return "Grebo";
+                case "grc": return "Greek, Ancient (to 1453)";
+                case "gre": return "Greek";
+                case "ell": return "Greek";
+                case "grn": return "Guarani";
+                case "guj": return "Gujarati";
+                case "gwi": return "Gwich´in";
+                case "hai": return "Haida";
+                case "hau": return "Hausa";
+                case "haw": return "Hawaiian";
+                case "heb": return "Hebrew";
+                case "her": return "Herero";
+                case "hil": return "Hiligaynon";
+                case "him": return "Himachali";
+                case "hin": return "Hindi";
+                case "hmo": return "Hiri Motu";
+                case "hit": return "Hittite";
+                case "hmn": return "Hmong";
+                case "hun": return "Hungarian";
+                case "hup": return "Hupa";
+                case "iba": return "Iban";
+                case "ice": return "Icelandic";
+                case "isl": return "Icelandic";
+                case "ibo": return "Igbo";
+                case "ijo": return "Ijo";
+                case "ilo": return "Iloko";
+                case "inc": return "Indic (Other)";
+                case "ine": return "Indo-European (Other)";
+                case "ind": return "Indonesian";
+                case "ina": return "Interlingua (International";
+                case "ile": return "Interlingue";
+                case "iku": return "Inuktitut";
+                case "ipk": return "Inupiaq";
+                case "ira": return "Iranian (Other)";
+                case "gle": return "Irish";
+                case "mga": return "Irish, Middle (900-1200)";
+                case "sga": return "Irish, Old (to 900)";
+                case "iro": return "Iroquoian languages";
+                case "ita": return "Italian";
+                case "jpn": return "Japanese";
+                case "jav": return "Javanese";
+                case "jrb": return "Judeo-Arabic";
+                case "jpr": return "Judeo-Persian";
+                case "kab": return "Kabyle";
+                case "kac": return "Kachin";
+                case "kal": return "Kalaallisut";
+                case "kam": return "Kamba";
+                case "kan": return "Kannada";
+                case "kau": return "Kanuri";
+                case "kaa": return "Kara-Kalpak";
+                case "kar": return "Karen";
+                case "kas": return "Kashmiri";
+                case "kaw": return "Kawi";
+                case "kaz": return "Kazakh";
+                case "kha": return "Khasi";
+                case "khm": return "Khmer";
+                case "khi": return "Khoisan (Other)";
+                case "kho": return "Khotanese";
+                case "kik": return "Kikuyu";
+                case "kmb": return "Kimbundu";
+                case "kin": return "Kinyarwanda";
+                case "kir": return "Kirghiz";
+                case "kom": return "Komi";
+                case "kon": return "Kongo";
+                case "kok": return "Konkani";
+                case "kor": return "Korean";
+                case "kos": return "Kosraean";
+                case "kpe": return "Kpelle";
+                case "kro": return "Kru";
+                case "kua": return "Kuanyama";
+                case "kum": return "Kumyk";
+                case "kur": return "Kurdish";
+                case "kru": return "Kurukh";
+                case "kut": return "Kutenai";
+                case "lad": return "Ladino";
+                case "lah": return "Lahnda";
+                case "lam": return "Lamba";
+                case "lao": return "Lao";
+                case "lat": return "Latin";
+                case "lav": return "Latvian";
+                case "ltz": return "Letzeburgesch";
+                case "lez": return "Lezghian";
+                case "lin": return "Lingala";
+                case "lit": return "Lithuanian";
+                case "loz": return "Lozi";
+                case "lub": return "Luba-Katanga";
+                case "lua": return "Luba-Lulua";
+                case "lui": return "Luiseno";
+                case "lun": return "Lunda";
+                case "luo": return "Luo (Kenya and Tanzania)";
+                case "lus": return "Lushai";
+                case "mac": return "Macedonian";
+                case "mkd": return "Macedonian";
+                case "mad": return "Madurese";
+                case "mag": return "Magahi";
+                case "mai": return "Maithili";
+                case "mak": return "Makasar";
+                case "mlg": return "Malagasy";
+                case "may": return "Malay";
+                case "msa": return "Malay";
+                case "mal": return "Malayalam";
+                case "mlt": return "Maltese";
+                case "mnc": return "Manchu";
+                case "mdr": return "Mandar";
+                case "man": return "Mandingo";
+                case "mni": return "Manipuri";
+                case "mno": return "Manobo languages";
+                case "glv": return "Manx";
+                case "mao": return "Maori";
+                case "mri": return "Maori";
+                case "mar": return "Marathi";
+                case "chm": return "Mari";
+                case "mah": return "Marshall";
+                case "mwr": return "Marwari";
+                case "mas": return "Masai";
+                case "myn": return "Mayan languages";
+                case "men": return "Mende";
+                case "mic": return "Micmac";
+                case "min": return "Minangkabau";
+                case "mis": return "Miscellaneous languages";
+                case "moh": return "Mohawk";
+                case "mol": return "Moldavian";
+                case "mkh": return "Mon-Khmer (Other)";
+                case "lol": return "Mongo";
+                case "mon": return "Mongolian";
+                case "mos": return "Mossi";
+                case "mul": return "Multiple languages";
+                case "mun": return "Munda languages";
+                case "nah": return "Nahuatl";
+                case "nau": return "Nauru";
+                case "nav": return "Navajo";
+                case "nde": return "Ndebele, North";
+                case "nbl": return "Ndebele, South";
+                case "ndo": return "Ndonga";
+                case "nep": return "Nepali";
+                case "new": return "Newari";
+                case "nia": return "Nias";
+                case "nic": return "Niger-Kordofanian (Other)";
+                case "ssa": return "Nilo-Saharan (Other)";
+                case "niu": return "Niuean";
+                case "non": return "Norse, Old";
+                case "nai": return "North American Indian (Other)";
+                case "sme": return "Northern Sami";
+                case "nor": return "Norwegian";
+                case "nob": return "Norwegian Bokmål";
+                case "nno": return "Norwegian Nynorsk";
+                case "nub": return "Nubian languages";
+                case "nym": return "Nyamwezi";
+                case "nya": return "Nyanja";
+                case "nyn": return "Nyankole";
+                case "nyo": return "Nyoro";
+                case "nzi": return "Nzima";
+                case "oci": return "Occitan";
+                case "oji": return "Ojibwa";
+                case "ori": return "Oriya";
+                case "orm": return "Oromo";
+                case "osa": return "Osage";
+                case "oss": return "Ossetian";
+                case "oto": return "Otomian languages";
+                case "pal": return "Pahlavi";
+                case "pau": return "Palauan";
+                case "pli": return "Pali";
+                case "pam": return "Pampanga";
+                case "pag": return "Pangasinan";
+                case "pan": return "Panjabi";
+                case "pap": return "Papiamento";
+                case "paa": return "Papuan (Other)";
+                case "per": return "Persian";
+                case "fas": return "Persian";
+                case "peo": return "Persian, Old (ca.600-400 B.C.)";
+                case "phi": return "Philippine (Other)";
+                case "phn": return "Phoenician";
+                case "pon": return "Pohnpeian";
+                case "pol": return "Polish";
+                case "por": return "Portuguese";
+                case "pra": return "Prakrit languages";
+                case "pro": return "Provençal";
+                case "pus": return "Pushto";
+                case "que": return "Quechua";
+                case "roh": return "Raeto-Romance";
+                case "raj": return "Rajasthani";
+                case "rap": return "Rapanui";
+                case "rar": return "Rarotongan";
+                case "roa": return "Romance (Other)";
+                case "rum": return "Romanian";
+                case "ron": return "Romanian";
+                case "rom": return "Romany";
+                case "run": return "Rundi";
+                case "rus": return "Russian";
+                case "sal": return "Salishan languages";
+                case "sam": return "Samaritan Aramaic";
+                case "smi": return "Sami languages (Other)";
+                case "smo": return "Samoan";
+                case "sad": return "Sandawe";
+                case "sag": return "Sango";
+                case "san": return "Sanskrit";
+                case "sat": return "Santali";
+                case "srd": return "Sardinian";
+                case "sas": return "Sasak";
+                case "sco": return "Scots";
+                case "gla": return "Gaelic";
+                case "sel": return "Selkup";
+                case "sem": return "Semitic (Other)";
+                case "scc": return "Serbian";
+                case "srp": return "Serbian";
+                case "srr": return "Serer";
+                case "shn": return "Shan";
+                case "sna": return "Shona";
+                case "sid": return "Sidamo";
+                case "sgn": return "Sign languages";
+                case "bla": return "Siksika";
+                case "snd": return "Sindhi";
+                case "sin": return "Sinhalese";
+                case "sit": return "Sino-Tibetan (Other)";
+                case "sio": return "Siouan languages";
+                case "den": return "Slave (Athapascan)";
+                case "sla": return "Slavic (Other)";
+                case "slo": return "Slovak";
+                case "slk": return "Slovak";
+                case "slv": return "Slovenian";
+                case "sog": return "Sogdian";
+                case "som": return "Somali";
+                case "son": return "Songhai";
+                case "snk": return "Soninke";
+                case "wen": return "Sorbian languages";
+                case "nso": return "Sotho, Northern";
+                case "sot": return "Sotho, Southern";
+                case "sai": return "South American Indian (Other)";
+                case "spa": return "Spanish";
+                case "suk": return "Sukuma";
+                case "sux": return "Sumerian";
+                case "sun": return "Sundanese";
+                case "sus": return "Susu";
+                case "swa": return "Swahili";
+                case "ssw": return "Swati";
+                case "swe": return "Swedish";
+                case "syr": return "Syriac";
+                case "tgl": return "Tagalog";
+                case "tah": return "Tahitian";
+                case "tai": return "Tai (Other)";
+                case "tgk": return "Tajik";
+                case "tmh": return "Tamashek";
+                case "tam": return "Tamil";
+                case "tat": return "Tatar";
+                case "tel": return "Telugu";
+                case "ter": return "Tereno";
+                case "tet": return "Tetum";
+                case "tha": return "Thai";
+                case "tib": return "Tibetan";
+                case "bod": return "Tibetan";
+                case "tig": return "Tigre";
+                case "tir": return "Tigrinya";
+                case "tem": return "Timne";
+                case "tiv": return "Tiv";
+                case "tli": return "Tlingit";
+                case "tpi": return "Tok Pisin";
+                case "tkl": return "Tokelau";
+                case "tog": return "Tonga (Nyasa)";
+                case "ton": return "Tonga (Tonga Islands)";
+                case "tsi": return "Tsimshian";
+                case "tso": return "Tsonga";
+                case "tsn": return "Tswana";
+                case "tum": return "Tumbuka";
+                case "tur": return "Turkish";
+                case "ota": return "Turkish, Ottoman (1500-1928)";
+                case "tuk": return "Turkmen";
+                case "tvl": return "Tuvalu";
+                case "tyv": return "Tuvinian";
+                case "twi": return "Twi";
+                case "uga": return "Ugaritic";
+                case "uig": return "Uighur";
+                case "ukr": return "Ukrainian";
+                case "umb": return "Umbundu";
+                case "und": return "Undetermined";
+                case "urd": return "Urdu";
+                case "uzb": return "Uzbek";
+                case "vai": return "Vai";
+                case "ven": return "Venda";
+                case "vie": return "Vietnamese";
+                case "vol": return "Volapük";
+                case "vot": return "Votic";
+                case "wak": return "Wakashan languages";
+                case "wal": return "Walamo";
+                case "war": return "Waray";
+                case "was": return "Washo";
+                case "wel": return "Welsh";
+                case "cym": return "Welsh";
+                case "wol": return "Wolof";
+                case "xho": return "Xhosa";
+                case "sah": return "Yakut";
+                case "yao": return "Yao";
+                case "yap": return "Yapese";
+                case "yid": return "Yiddish";
+                case "yor": return "Yoruba";
+                case "ypk": return "Yupik languages";
+                case "znd": return "Zande";
+                case "zap": return "Zapotec";
+                case "zen": return "Zenaga";
+                case "zha": return "Zhuang";
+                case "zul": return "Zulu";
+                case "zun": return "Zuni";
+
+                default: return code;
+            }
+        }
+    }
+}

BDInfo/Properties/AssemblyInfo.cs

@@ -0,0 +1,21 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("BDInfo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Jellyfin Project")]
+[assembly: AssemblyProduct("Jellyfin Server")]
+[assembly: AssemblyCopyright("Copyright ©  2016 CinemaSquid. Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]

BDInfo/ReadMe.txt

@@ -0,0 +1,5 @@
+The source is taken from the BDRom folder of this project:
+
+http://www.cinemasquid.com/blu-ray/tools/bdinfo
+
+BDInfoSettings was taken from the FormSettings class, and changed so that the settings all return defaults.

BDInfo/TSCodecAC3.cs

@@ -0,0 +1,309 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+#undef DEBUG
+using System.IO;
+
+namespace BDInfo
+{
+    public abstract class TSCodecAC3
+    {
+        private static byte[] eac3_blocks = new byte[] { 1, 2, 3, 6 };
+
+        public static void Scan(
+            TSAudioStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            if (stream.IsInitialized) return;
+
+            byte[] sync = buffer.ReadBytes(2);
+            if (sync == null ||
+                sync[0] != 0x0B ||
+                sync[1] != 0x77)
+            {
+                return;
+            }
+
+            int sr_code = 0;
+            int frame_size = 0;
+            int frame_size_code = 0;
+            int channel_mode = 0;
+            int lfe_on = 0;
+            int dial_norm = 0;
+            int num_blocks = 0;
+
+            byte[] hdr = buffer.ReadBytes(4);
+            int bsid = (hdr[3] & 0xF8) >> 3;
+            buffer.Seek(-4, SeekOrigin.Current);
+            if (bsid <= 10)
+            {
+                byte[] crc = buffer.ReadBytes(2);
+                sr_code = buffer.ReadBits(2);
+                frame_size_code = buffer.ReadBits(6);
+                bsid = buffer.ReadBits(5);
+                int bsmod = buffer.ReadBits(3);
+
+                channel_mode = buffer.ReadBits(3);
+                int cmixlev = 0;
+                if (((channel_mode & 0x1) > 0) && (channel_mode != 0x1))
+                {
+                    cmixlev = buffer.ReadBits(2);
+                }
+                int surmixlev = 0;
+                if ((channel_mode & 0x4) > 0)
+                {
+                    surmixlev = buffer.ReadBits(2);
+                }
+                int dsurmod = 0;
+                if (channel_mode == 0x2)
+                {
+                    dsurmod = buffer.ReadBits(2);
+                    if (dsurmod == 0x2)
+                    {
+                        stream.AudioMode = TSAudioMode.Surround;
+                    }
+                }
+                lfe_on = buffer.ReadBits(1);
+                dial_norm = buffer.ReadBits(5);
+                int compr = 0;
+                if (1 == buffer.ReadBits(1))
+                {
+                    compr = buffer.ReadBits(8);
+                }
+                int langcod = 0;
+                if (1 == buffer.ReadBits(1))
+                {
+                    langcod = buffer.ReadBits(8);
+                }
+                int mixlevel = 0;
+                int roomtyp = 0;
+                if (1 == buffer.ReadBits(1))
+                {
+                    mixlevel = buffer.ReadBits(5);
+                    roomtyp = buffer.ReadBits(2);
+                }
+                if (channel_mode == 0)
+                {
+                    int dialnorm2 = buffer.ReadBits(5);
+                    int compr2 = 0;
+                    if (1 == buffer.ReadBits(1))
+                    {
+                        compr2 = buffer.ReadBits(8);
+                    }
+                    int langcod2 = 0;
+                    if (1 == buffer.ReadBits(1))
+                    {
+                        langcod2 = buffer.ReadBits(8);
+                    }
+                    int mixlevel2 = 0;
+                    int roomtyp2 = 0;
+                    if (1 == buffer.ReadBits(1))
+                    {
+                        mixlevel2 = buffer.ReadBits(5);
+                        roomtyp2 = buffer.ReadBits(2);
+                    }
+                }
+                int copyrightb = buffer.ReadBits(1);
+                int origbs = buffer.ReadBits(1);
+                if (bsid == 6)
+                {
+                    if (1 == buffer.ReadBits(1))
+                    {
+                        int dmixmod = buffer.ReadBits(2);
+                        int ltrtcmixlev = buffer.ReadBits(3);
+                        int ltrtsurmixlev = buffer.ReadBits(3);
+                        int lorocmixlev = buffer.ReadBits(3);
+                        int lorosurmixlev = buffer.ReadBits(3);
+                    }
+                    if (1 == buffer.ReadBits(1))
+                    {
+                        int dsurexmod = buffer.ReadBits(2);
+                        int dheadphonmod = buffer.ReadBits(2);
+                        if (dheadphonmod == 0x2)
+                        {
+                            // TODO
+                        }
+                        int adconvtyp = buffer.ReadBits(1);
+                        int xbsi2 = buffer.ReadBits(8);
+                        int encinfo = buffer.ReadBits(1);
+                        if (dsurexmod == 2)
+                        {
+                            stream.AudioMode = TSAudioMode.Extended;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                int frame_type = buffer.ReadBits(2);
+                int substreamid = buffer.ReadBits(3);
+                frame_size = (buffer.ReadBits(11) + 1) << 1;
+
+                sr_code = buffer.ReadBits(2);
+                if (sr_code == 3)
+                {
+                    sr_code = buffer.ReadBits(2);
+                }
+                else
+                {
+                    num_blocks = buffer.ReadBits(2);
+                }
+                channel_mode = buffer.ReadBits(3);
+                lfe_on = buffer.ReadBits(1);
+            }
+
+            switch (channel_mode)
+            {
+                case 0: // 1+1
+                    stream.ChannelCount = 2;
+                    if (stream.AudioMode == TSAudioMode.Unknown)
+                    {
+                        stream.AudioMode = TSAudioMode.DualMono;
+                    }
+                    break;
+                case 1: // 1/0
+                    stream.ChannelCount = 1;
+                    break;
+                case 2: // 2/0
+                    stream.ChannelCount = 2;
+                    if (stream.AudioMode == TSAudioMode.Unknown)
+                    {
+                        stream.AudioMode = TSAudioMode.Stereo;
+                    }
+                    break;
+                case 3: // 3/0
+                    stream.ChannelCount = 3;
+                    break;
+                case 4: // 2/1
+                    stream.ChannelCount = 3;
+                    break;
+                case 5: // 3/1
+                    stream.ChannelCount = 4;
+                    break;
+                case 6: // 2/2
+                    stream.ChannelCount = 4;
+                    break;
+                case 7: // 3/2
+                    stream.ChannelCount = 5;
+                    break;
+                default:
+                    stream.ChannelCount = 0;
+                    break;
+            }
+
+            switch (sr_code)
+            {
+                case 0:
+                    stream.SampleRate = 48000;
+                    break;
+                case 1:
+                    stream.SampleRate = 44100;
+                    break;
+                case 2:
+                    stream.SampleRate = 32000;
+                    break;
+                default:
+                    stream.SampleRate = 0;
+                    break;
+            }
+
+            if (bsid <= 10)
+            {
+                switch (frame_size_code >> 1)
+                {
+                    case 18:
+                        stream.BitRate = 640000;
+                        break;
+                    case 17:
+                        stream.BitRate = 576000;
+                        break;
+                    case 16:
+                        stream.BitRate = 512000;
+                        break;
+                    case 15:
+                        stream.BitRate = 448000;
+                        break;
+                    case 14:
+                        stream.BitRate = 384000;
+                        break;
+                    case 13:
+                        stream.BitRate = 320000;
+                        break;
+                    case 12:
+                        stream.BitRate = 256000;
+                        break;
+                    case 11:
+                        stream.BitRate = 224000;
+                        break;
+                    case 10:
+                        stream.BitRate = 192000;
+                        break;
+                    case 9:
+                        stream.BitRate = 160000;
+                        break;
+                    case 8:
+                        stream.BitRate = 128000;
+                        break;
+                    case 7:
+                        stream.BitRate = 112000;
+                        break;
+                    case 6:
+                        stream.BitRate = 96000;
+                        break;
+                    case 5:
+                        stream.BitRate = 80000;
+                        break;
+                    case 4:
+                        stream.BitRate = 64000;
+                        break;
+                    case 3:
+                        stream.BitRate = 56000;
+                        break;
+                    case 2:
+                        stream.BitRate = 48000;
+                        break;
+                    case 1:
+                        stream.BitRate = 40000;
+                        break;
+                    case 0:
+                        stream.BitRate = 32000;
+                        break;
+                    default:
+                        stream.BitRate = 0;
+                        break;
+                }
+            }
+            else
+            {
+                stream.BitRate = (long)
+                    (4.0 * frame_size * stream.SampleRate / (num_blocks * 256));
+            }
+
+            stream.LFE = lfe_on;
+            if (stream.StreamType != TSStreamType.AC3_PLUS_AUDIO &&
+                stream.StreamType != TSStreamType.AC3_PLUS_SECONDARY_AUDIO)
+            {
+                stream.DialNorm = dial_norm - 31;
+            }
+            stream.IsVBR = false;
+            stream.IsInitialized = true;
+        }
+    }
+}

BDInfo/TSCodecAVC.cs

@@ -0,0 +1,148 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecAVC
+    {
+        public static void Scan(
+            TSVideoStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            uint parse = 0;
+            byte accessUnitDelimiterParse = 0;
+            byte sequenceParameterSetParse = 0;
+            string profile = null;
+            string level = null;
+            byte constraintSet0Flag = 0;
+            byte constraintSet1Flag = 0;
+            byte constraintSet2Flag = 0;
+            byte constraintSet3Flag = 0;
+
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                parse = (parse << 8) + buffer.ReadByte();
+
+                if (parse == 0x00000109)
+                {
+                    accessUnitDelimiterParse = 1;
+                }
+                else if (accessUnitDelimiterParse > 0)
+                {
+                    --accessUnitDelimiterParse;
+                    if (accessUnitDelimiterParse == 0)
+                    {
+                        switch ((parse & 0xFF) >> 5)
+                        {
+                            case 0: // I
+                            case 3: // SI
+                            case 5: // I, SI
+                                tag = "I";
+                                break;
+
+                            case 1: // I, P
+                            case 4: // SI, SP
+                            case 6: // I, SI, P, SP
+                                tag = "P";
+                                break;
+
+                            case 2: // I, P, B
+                            case 7: // I, SI, P, SP, B
+                                tag = "B";
+                                break;
+                        }
+                        if (stream.IsInitialized) return;
+                    }
+                }
+                else if (parse == 0x00000127 || parse == 0x00000167)
+                {
+                    sequenceParameterSetParse = 3;
+                }
+                else if (sequenceParameterSetParse > 0)
+                {
+                    --sequenceParameterSetParse;
+                    switch (sequenceParameterSetParse)
+                    {
+                        case 2:
+                            switch (parse & 0xFF)
+                            {
+                                case 66:
+                                    profile = "Baseline Profile";
+                                    break;
+                                case 77:
+                                    profile = "Main Profile";
+                                    break;
+                                case 88:
+                                    profile = "Extended Profile";
+                                    break;
+                                case 100:
+                                    profile = "High Profile";
+                                    break;
+                                case 110:
+                                    profile = "High 10 Profile";
+                                    break;
+                                case 122:
+                                    profile = "High 4:2:2 Profile";
+                                    break;
+                                case 144:
+                                    profile = "High 4:4:4 Profile";
+                                    break;
+                                default:
+                                    profile = "Unknown Profile";
+                                    break;
+                            }
+                            break;
+
+                        case 1:
+                            constraintSet0Flag = (byte)
+                                ((parse & 0x80) >> 7);
+                            constraintSet1Flag = (byte)
+                                ((parse & 0x40) >> 6);
+                            constraintSet2Flag = (byte)
+                                ((parse & 0x20) >> 5);
+                            constraintSet3Flag = (byte)
+                                ((parse & 0x10) >> 4);
+                            break;
+
+                        case 0:
+                            byte b = (byte)(parse & 0xFF);
+                            if (b == 11 && constraintSet3Flag == 1)
+                            {
+                                level = "1b";
+                            }
+                            else
+                            {
+                                level = string.Format(
+                                    "{0:D}.{1:D}",
+                                    b / 10, (b - ((b / 10) * 10)));
+                            }
+                            stream.EncodingProfile = string.Format(
+                                "{0} {1}", profile, level);
+                            stream.IsVBR = true;
+                            stream.IsInitialized = true;
+                            break;
+                    }
+                }
+            }
+            return;
+        }
+    }
+}

BDInfo/TSCodecDTS.cs

@@ -0,0 +1,159 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecDTS
+    {
+        private static int[] dca_sample_rates =
+        {
+            0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0,
+            12000, 24000, 48000, 96000, 192000
+        };
+
+        private static int[] dca_bit_rates =
+        {
+            32000, 56000, 64000, 96000, 112000, 128000,
+            192000, 224000, 256000, 320000, 384000,
+            448000, 512000, 576000, 640000, 768000,
+            896000, 1024000, 1152000, 1280000, 1344000,
+            1408000, 1411200, 1472000, 1509000, 1920000,
+            2048000, 3072000, 3840000, 1/*open*/, 2/*variable*/, 3/*lossless*/
+        };
+
+        private static int[] dca_channels =
+        {
+            1, 2, 2, 2, 2, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 8
+        };
+
+        private static int[] dca_bits_per_sample =
+        {
+            16, 16, 20, 20, 0, 24, 24
+        };
+
+        public static void Scan(
+            TSAudioStream stream,
+            TSStreamBuffer buffer,
+            long bitrate,
+            ref string tag)
+        {
+            if (stream.IsInitialized) return;
+
+            bool syncFound = false;
+            uint sync = 0;
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                sync = (sync << 8) + buffer.ReadByte();
+                if (sync == 0x7FFE8001)
+                {
+                    syncFound = true;
+                    break;
+                }
+            }
+            if (!syncFound) return;
+
+            int frame_type = buffer.ReadBits(1);
+            int samples_deficit = buffer.ReadBits(5);
+            int crc_present = buffer.ReadBits(1);
+            int sample_blocks = buffer.ReadBits(7);
+            int frame_size = buffer.ReadBits(14);
+            if (frame_size < 95)
+            {
+                return;
+            }
+            int amode = buffer.ReadBits(6);
+            int sample_rate = buffer.ReadBits(4);
+            if (sample_rate < 0 || sample_rate >= dca_sample_rates.Length)
+            {
+                return;
+            }
+            int bit_rate = buffer.ReadBits(5);
+            if (bit_rate < 0 || bit_rate >= dca_bit_rates.Length)
+            {
+                return;
+            }
+            int downmix = buffer.ReadBits(1);
+            int dynrange = buffer.ReadBits(1);
+            int timestamp = buffer.ReadBits(1);
+            int aux_data = buffer.ReadBits(1);
+            int hdcd = buffer.ReadBits(1);
+            int ext_descr = buffer.ReadBits(3);
+            int ext_coding = buffer.ReadBits(1);
+            int aspf = buffer.ReadBits(1);
+            int lfe = buffer.ReadBits(2);
+            int predictor_history = buffer.ReadBits(1);
+            if (crc_present == 1)
+            {
+                int crc = buffer.ReadBits(16);
+            }
+            int multirate_inter = buffer.ReadBits(1);
+            int version = buffer.ReadBits(4);
+            int copy_history = buffer.ReadBits(2);
+            int source_pcm_res = buffer.ReadBits(3);
+            int front_sum = buffer.ReadBits(1);
+            int surround_sum = buffer.ReadBits(1);
+            int dialog_norm = buffer.ReadBits(4);
+            if (source_pcm_res < 0 || source_pcm_res >= dca_bits_per_sample.Length)
+            {
+                return;
+            }
+            int subframes = buffer.ReadBits(4);
+            int total_channels = buffer.ReadBits(3) + 1 + ext_coding;
+
+            stream.SampleRate = dca_sample_rates[sample_rate];
+            stream.ChannelCount = total_channels;
+            stream.LFE = (lfe > 0 ? 1 : 0);
+            stream.BitDepth = dca_bits_per_sample[source_pcm_res];
+            stream.DialNorm = -dialog_norm;
+            if ((source_pcm_res & 0x1) == 0x1)
+            {
+                stream.AudioMode = TSAudioMode.Extended;
+            }
+
+            stream.BitRate = (uint)dca_bit_rates[bit_rate];
+            switch (stream.BitRate)
+            {
+                case 1:
+                    if (bitrate > 0)
+                    {
+                        stream.BitRate = bitrate;
+                        stream.IsVBR = false;
+                        stream.IsInitialized = true;
+                    }
+                    else
+                    {
+                        stream.BitRate = 0;
+                    }
+                    break;
+
+                case 2:
+                case 3:
+                    stream.IsVBR = true;
+                    stream.IsInitialized = true;
+                    break;
+
+                default:
+                    stream.IsVBR = false;
+                    stream.IsInitialized = true;
+                    break;
+            }
+        }
+    }
+}

BDInfo/TSCodecDTSHD.cs

@@ -0,0 +1,246 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecDTSHD
+    {
+        private static int[] SampleRates = new int[]
+        { 0x1F40, 0x3E80, 0x7D00, 0x0FA00, 0x1F400, 0x5622, 0x0AC44, 0x15888, 0x2B110, 0x56220, 0x2EE0, 0x5DC0, 0x0BB80, 0x17700, 0x2EE00, 0x5DC00 };
+
+        public static void Scan(
+            TSAudioStream stream,
+            TSStreamBuffer buffer,
+            long bitrate,
+            ref string tag)
+        {
+            if (stream.IsInitialized &&
+                (stream.StreamType == TSStreamType.DTS_HD_SECONDARY_AUDIO ||
+                (stream.CoreStream != null &&
+                 stream.CoreStream.IsInitialized))) return;
+
+            bool syncFound = false;
+            uint sync = 0;
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                sync = (sync << 8) + buffer.ReadByte();
+                if (sync == 0x64582025)
+                {
+                    syncFound = true;
+                    break;
+                }
+            }
+
+            if (!syncFound)
+            {
+                tag = "CORE";
+                if (stream.CoreStream == null)
+                {
+                    stream.CoreStream = new TSAudioStream();
+                    stream.CoreStream.StreamType = TSStreamType.DTS_AUDIO;
+                }
+                if (!stream.CoreStream.IsInitialized)
+                {
+                    buffer.BeginRead();
+                    TSCodecDTS.Scan(stream.CoreStream, buffer, bitrate, ref tag);
+                }
+                return;
+            }
+
+            tag = "HD";
+            int temp1 = buffer.ReadBits(8);
+            int nuSubStreamIndex = buffer.ReadBits(2);
+            int nuExtSSHeaderSize = 0;
+            int nuExtSSFSize = 0;
+            int bBlownUpHeader = buffer.ReadBits(1);
+            if (1 == bBlownUpHeader)
+            {
+                nuExtSSHeaderSize = buffer.ReadBits(12) + 1;
+                nuExtSSFSize = buffer.ReadBits(20) + 1;
+            }
+            else
+            {
+                nuExtSSHeaderSize = buffer.ReadBits(8) + 1;
+                nuExtSSFSize = buffer.ReadBits(16) + 1;
+            }
+            int nuNumAudioPresent = 1;
+            int nuNumAssets = 1;
+            int bStaticFieldsPresent = buffer.ReadBits(1);
+            if (1 == bStaticFieldsPresent)
+            {
+                int nuRefClockCode = buffer.ReadBits(2);
+                int nuExSSFrameDurationCode = buffer.ReadBits(3) + 1;
+                long nuTimeStamp = 0;
+                if (1 == buffer.ReadBits(1))
+                {
+                    nuTimeStamp = (buffer.ReadBits(18) << 18) + buffer.ReadBits(18);
+                }
+                nuNumAudioPresent = buffer.ReadBits(3) + 1;
+                nuNumAssets = buffer.ReadBits(3) + 1;
+                int[] nuActiveExSSMask = new int[nuNumAudioPresent];
+                for (int i = 0; i < nuNumAudioPresent; i++)
+                {
+                    nuActiveExSSMask[i] = buffer.ReadBits(nuSubStreamIndex + 1); //?
+                }
+                for (int i = 0; i < nuNumAudioPresent; i++)
+                {
+                    for (int j = 0; j < nuSubStreamIndex + 1; j++)
+                    {
+                        if (((j + 1) % 2) == 1)
+                        {
+                            int mask = buffer.ReadBits(8);
+                        }
+                    }
+                }
+                if (1 == buffer.ReadBits(1))
+                {
+                    int nuMixMetadataAdjLevel = buffer.ReadBits(2);
+                    int nuBits4MixOutMask = buffer.ReadBits(2) * 4 + 4;
+                    int nuNumMixOutConfigs = buffer.ReadBits(2) + 1;
+                    int[] nuMixOutChMask = new int[nuNumMixOutConfigs];
+                    for (int i = 0; i < nuNumMixOutConfigs; i++)
+                    {
+                        nuMixOutChMask[i] = buffer.ReadBits(nuBits4MixOutMask);
+                    }
+                }
+            }
+            int[] AssetSizes = new int[nuNumAssets];
+            for (int i = 0; i < nuNumAssets; i++)
+            {
+                if (1 == bBlownUpHeader)
+                {
+                    AssetSizes[i] = buffer.ReadBits(20) + 1;
+                }
+                else
+                {
+                    AssetSizes[i] = buffer.ReadBits(16) + 1;
+                }
+            }
+            for (int i = 0; i < nuNumAssets; i++)
+            {
+                long bufferPosition = buffer.Position;
+                int nuAssetDescriptorFSIZE = buffer.ReadBits(9) + 1;
+                int DescriptorDataForAssetIndex = buffer.ReadBits(3);
+                if (1 == bStaticFieldsPresent)
+                {
+                    int AssetTypeDescrPresent = buffer.ReadBits(1);
+                    if (1 == AssetTypeDescrPresent)
+                    {
+                        int AssetTypeDescriptor = buffer.ReadBits(4);
+                    }
+                    int LanguageDescrPresent = buffer.ReadBits(1);
+                    if (1 == LanguageDescrPresent)
+                    {
+                        int LanguageDescriptor = buffer.ReadBits(24);
+                    }
+                    int bInfoTextPresent = buffer.ReadBits(1);
+                    if (1 == bInfoTextPresent)
+                    {
+                        int nuInfoTextByteSize = buffer.ReadBits(10) + 1;
+                        int[] InfoText = new int[nuInfoTextByteSize];
+                        for (int j = 0; j < nuInfoTextByteSize; j++)
+                        {
+                            InfoText[j] = buffer.ReadBits(8);
+                        }
+                    }
+                    int nuBitResolution = buffer.ReadBits(5) + 1;
+                    int nuMaxSampleRate = buffer.ReadBits(4);
+                    int nuTotalNumChs = buffer.ReadBits(8) + 1;
+                    int bOne2OneMapChannels2Speakers = buffer.ReadBits(1);
+                    int nuSpkrActivityMask = 0;
+                    if (1 == bOne2OneMapChannels2Speakers)
+                    {
+                        int bEmbeddedStereoFlag = 0;
+                        if (nuTotalNumChs > 2)
+                        {
+                            bEmbeddedStereoFlag = buffer.ReadBits(1);
+                        }
+                        int bEmbeddedSixChFlag = 0;
+                        if (nuTotalNumChs > 6)
+                        {
+                            bEmbeddedSixChFlag = buffer.ReadBits(1);
+                        }
+                        int bSpkrMaskEnabled = buffer.ReadBits(1);
+                        int nuNumBits4SAMask = 0;
+                        if (1 == bSpkrMaskEnabled)
+                        {
+                            nuNumBits4SAMask = buffer.ReadBits(2);
+                            nuNumBits4SAMask = nuNumBits4SAMask * 4 + 4;
+                            nuSpkrActivityMask = buffer.ReadBits(nuNumBits4SAMask);
+                        }
+                        // TODO...
+                    }
+                    stream.SampleRate = SampleRates[nuMaxSampleRate];
+                    stream.BitDepth = nuBitResolution;
+
+                    stream.LFE = 0;
+                    if ((nuSpkrActivityMask & 0x8) == 0x8)
+                    {
+                        ++stream.LFE;
+                    }
+                    if ((nuSpkrActivityMask & 0x1000) == 0x1000)
+                    {
+                        ++stream.LFE;
+                    }
+                    stream.ChannelCount = nuTotalNumChs - stream.LFE;
+                }
+                if (nuNumAssets > 1)
+                {
+                    // TODO...
+                    break;
+                }
+            }
+
+            // TODO
+            if (stream.CoreStream != null)
+            {
+                var coreStream = (TSAudioStream)stream.CoreStream;
+                if (coreStream.AudioMode == TSAudioMode.Extended &&
+                    stream.ChannelCount == 5)
+                {
+                    stream.AudioMode = TSAudioMode.Extended;
+                }
+                /*
+                if (coreStream.DialNorm != 0)
+                {
+                    stream.DialNorm = coreStream.DialNorm;
+                }
+                */
+            }
+
+            if (stream.StreamType == TSStreamType.DTS_HD_MASTER_AUDIO)
+            {
+                stream.IsVBR = true;
+                stream.IsInitialized = true;
+            }
+            else if (bitrate > 0)
+            {
+                stream.IsVBR = false;
+                stream.BitRate = bitrate;
+                if (stream.CoreStream != null)
+                {
+                    stream.BitRate += stream.CoreStream.BitRate;
+                    stream.IsInitialized = true;
+                }
+                stream.IsInitialized = (stream.BitRate > 0 ? true : false);
+            }
+        }
+    }
+}

BDInfo/TSCodecLPCM.cs

@@ -0,0 +1,123 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecLPCM
+    {
+        public static void Scan(
+            TSAudioStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            if (stream.IsInitialized) return;
+
+            byte[] header = buffer.ReadBytes(4);
+            int flags = (header[2] << 8) + header[3];
+
+            switch ((flags & 0xF000) >> 12)
+            {
+                case 1: // 1/0/0
+                    stream.ChannelCount = 1;
+                    stream.LFE = 0;
+                    break;
+                case 3: // 2/0/0
+                    stream.ChannelCount = 2;
+                    stream.LFE = 0;
+                    break;
+                case 4: // 3/0/0
+                    stream.ChannelCount = 3;
+                    stream.LFE = 0;
+                    break;
+                case 5: // 2/1/0
+                    stream.ChannelCount = 3;
+                    stream.LFE = 0;
+                    break;
+                case 6: // 3/1/0
+                    stream.ChannelCount = 4;
+                    stream.LFE = 0;
+                    break;
+                case 7: // 2/2/0
+                    stream.ChannelCount = 4;
+                    stream.LFE = 0;
+                    break;
+                case 8: // 3/2/0
+                    stream.ChannelCount = 5;
+                    stream.LFE = 0;
+                    break;
+                case 9: // 3/2/1
+                    stream.ChannelCount = 5;
+                    stream.LFE = 1;
+                    break;
+                case 10: // 3/4/0
+                    stream.ChannelCount = 7;
+                    stream.LFE = 0;
+                    break;
+                case 11: // 3/4/1
+                    stream.ChannelCount = 7;
+                    stream.LFE = 1;
+                    break;
+                default:
+                    stream.ChannelCount = 0;
+                    stream.LFE = 0;
+                    break;
+            }
+
+            switch ((flags & 0xC0) >> 6)
+            {
+                case 1:
+                    stream.BitDepth = 16;
+                    break;
+                case 2:
+                    stream.BitDepth = 20;
+                    break;
+                case 3:
+                    stream.BitDepth = 24;
+                    break;
+                default:
+                    stream.BitDepth = 0;
+                    break;
+            }
+
+            switch ((flags & 0xF00) >> 8)
+            {
+                case 1:
+                    stream.SampleRate = 48000;
+                    break;
+                case 4:
+                    stream.SampleRate = 96000;
+                    break;
+                case 5:
+                    stream.SampleRate = 192000;
+                    break;
+                default:
+                    stream.SampleRate = 0;
+                    break;
+            }
+
+            stream.BitRate = (uint)
+                (stream.SampleRate * stream.BitDepth *
+                 (stream.ChannelCount + stream.LFE));
+
+            stream.IsVBR = false;
+            stream.IsInitialized = true;
+        }
+    }
+}

BDInfo/TSCodecMPEG2.cs

@@ -0,0 +1,208 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+#undef DEBUG
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecMPEG2
+    {
+        public static void Scan(
+            TSVideoStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            int parse = 0;
+            int pictureParse = 0;
+            int sequenceHeaderParse = 0;
+            int extensionParse = 0;
+            int sequenceExtensionParse = 0;
+
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                parse = (parse << 8) + buffer.ReadByte();
+
+                if (parse == 0x00000100)
+                {
+                    pictureParse = 2;
+                }
+                else if (parse == 0x000001B3)
+                {
+                    sequenceHeaderParse = 7;
+                }
+                else if (sequenceHeaderParse > 0)
+                {
+                    --sequenceHeaderParse;
+                    switch (sequenceHeaderParse)
+                    {
+#if DEBUG
+                        case 6:
+                            break;
+
+                        case 5:
+                            break;
+
+                        case 4:
+                            stream.Width =
+                                (int)((parse & 0xFFF000) >> 12);
+                            stream.Height =
+                                (int)(parse & 0xFFF);
+                            break;
+
+                        case 3:
+                            stream.AspectRatio =
+                                (TSAspectRatio)((parse & 0xF0) >> 4);
+
+                            switch ((parse & 0xF0) >> 4)
+                            {
+                                case 0: // Forbidden
+                                    break;
+                                case 1: // Square
+                                    break;
+                                case 2: // 4:3
+                                    break;
+                                case 3: // 16:9
+                                    break;
+                                case 4: // 2.21:1
+                                    break;
+                                default: // Reserved
+                                    break;
+                            }
+
+                            switch (parse & 0xF)
+                            {
+                                case 0: // Forbidden
+                                    break;
+                                case 1: // 23.976
+                                    stream.FrameRateEnumerator = 24000;
+                                    stream.FrameRateDenominator = 1001;
+                                    break;
+                                case 2: // 24
+                                    stream.FrameRateEnumerator = 24000;
+                                    stream.FrameRateDenominator = 1000;
+                                    break;
+                                case 3: // 25
+                                    stream.FrameRateEnumerator = 25000;
+                                    stream.FrameRateDenominator = 1000;
+                                    break;
+                                case 4: // 29.97
+                                    stream.FrameRateEnumerator = 30000;
+                                    stream.FrameRateDenominator = 1001;
+                                    break;
+                                case 5: // 30
+                                    stream.FrameRateEnumerator = 30000;
+                                    stream.FrameRateDenominator = 1000;
+                                    break;
+                                case 6: // 50
+                                    stream.FrameRateEnumerator = 50000;
+                                    stream.FrameRateDenominator = 1000;
+                                    break;
+                                case 7: // 59.94
+                                    stream.FrameRateEnumerator = 60000;
+                                    stream.FrameRateDenominator = 1001;
+                                    break;
+                                case 8: // 60
+                                    stream.FrameRateEnumerator = 60000;
+                                    stream.FrameRateDenominator = 1000;
+                                    break;
+                                default: // Reserved
+                                    stream.FrameRateEnumerator = 0;
+                                    stream.FrameRateDenominator = 0;
+                                    break;
+                            }
+                            break;
+
+                        case 2:
+                            break;
+
+                        case 1:
+                            break;
+#endif
+
+                        case 0:
+#if DEBUG
+                            stream.BitRate =
+                                (((parse & 0xFFFFC0) >> 6) * 200);
+#endif
+                            stream.IsVBR = true;
+                            stream.IsInitialized = true;
+                            break;
+                    }
+                }
+                else if (pictureParse > 0)
+                {
+                    --pictureParse;
+                    if (pictureParse == 0)
+                    {
+                        switch ((parse & 0x38) >> 3)
+                        {
+                            case 1:
+                                tag = "I";
+                                break;
+                            case 2:
+                                tag = "P";
+                                break;
+                            case 3:
+                                tag = "B";
+                                break;
+                            default:
+                                break;
+                        }
+                        if (stream.IsInitialized) return;
+                    }
+                }
+                else if (parse == 0x000001B5)
+                {
+                    extensionParse = 1;
+                }
+                else if (extensionParse > 0)
+                {
+                    --extensionParse;
+                    if (extensionParse == 0)
+                    {
+                        if ((parse & 0xF0) == 0x10)
+                        {
+                            sequenceExtensionParse = 1;
+                        }
+                    }
+                }
+                else if (sequenceExtensionParse > 0)
+                {
+                    --sequenceExtensionParse;
+#if DEBUG
+                    if (sequenceExtensionParse == 0)
+                    {
+                        uint sequenceExtension =
+                            ((parse & 0x8) >> 3);
+                        if (sequenceExtension == 0)
+                        {
+                            stream.IsInterlaced = true;
+                        }
+                        else
+                        {
+                            stream.IsInterlaced = false;
+                        }
+                    }
+#endif
+                }
+            }
+        }
+    }
+}

BDInfo/TSCodecMVC.cs

@@ -0,0 +1,36 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    // TODO: Do something more interesting here...
+
+    public abstract class TSCodecMVC
+    {
+        public static void Scan(
+            TSVideoStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            stream.IsVBR = true;
+            stream.IsInitialized = true;
+        }
+    }
+}

BDInfo/TSCodecTrueHD.cs

@@ -0,0 +1,186 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecTrueHD
+    {
+        public static void Scan(
+            TSAudioStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            if (stream.IsInitialized &&
+                stream.CoreStream != null &&
+                stream.CoreStream.IsInitialized) return;
+
+            bool syncFound = false;
+            uint sync = 0;
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                sync = (sync << 8) + buffer.ReadByte();
+                if (sync == 0xF8726FBA)
+                {
+                    syncFound = true;
+                    break;
+                }
+            }
+
+            if (!syncFound)
+            {
+                tag = "CORE";
+                if (stream.CoreStream == null)
+                {
+                    stream.CoreStream = new TSAudioStream();
+                    stream.CoreStream.StreamType = TSStreamType.AC3_AUDIO;
+                }
+                if (!stream.CoreStream.IsInitialized)
+                {
+                    buffer.BeginRead();
+                    TSCodecAC3.Scan(stream.CoreStream, buffer, ref tag);
+                }
+                return;
+            }
+
+            tag = "HD";
+            int ratebits = buffer.ReadBits(4);
+            if (ratebits != 0xF)
+            {
+                stream.SampleRate =
+                    (((ratebits & 8) > 0 ? 44100 : 48000) << (ratebits & 7));
+            }
+            int temp1 = buffer.ReadBits(8);
+            int channels_thd_stream1 = buffer.ReadBits(5);
+            int temp2 = buffer.ReadBits(2);
+
+            stream.ChannelCount = 0;
+            stream.LFE = 0;
+            int c_LFE2 = buffer.ReadBits(1);
+            if (c_LFE2 == 1)
+            {
+                stream.LFE += 1;
+            }
+            int c_Cvh = buffer.ReadBits(1);
+            if (c_Cvh == 1)
+            {
+                stream.ChannelCount += 1;
+            }
+            int c_LRw = buffer.ReadBits(1);
+            if (c_LRw == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+            int c_LRsd = buffer.ReadBits(1);
+            if (c_LRsd == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+            int c_Ts = buffer.ReadBits(1);
+            if (c_Ts == 1)
+            {
+                stream.ChannelCount += 1;
+            }
+            int c_Cs = buffer.ReadBits(1);
+            if (c_Cs == 1)
+            {
+                stream.ChannelCount += 1;
+            }
+            int c_LRrs = buffer.ReadBits(1);
+            if (c_LRrs == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+            int c_LRc = buffer.ReadBits(1);
+            if (c_LRc == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+            int c_LRvh = buffer.ReadBits(1);
+            if (c_LRvh == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+            int c_LRs = buffer.ReadBits(1);
+            if (c_LRs == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+            int c_LFE = buffer.ReadBits(1);
+            if (c_LFE == 1)
+            {
+                stream.LFE += 1;
+            }
+            int c_C = buffer.ReadBits(1);
+            if (c_C == 1)
+            {
+                stream.ChannelCount += 1;
+            }
+            int c_LR = buffer.ReadBits(1);
+            if (c_LR == 1)
+            {
+                stream.ChannelCount += 2;
+            }
+
+            int access_unit_size = 40 << (ratebits & 7);
+            int access_unit_size_pow2 = 64 << (ratebits & 7);
+
+            int a1 = buffer.ReadBits(16);
+            int a2 = buffer.ReadBits(16);
+            int a3 = buffer.ReadBits(16);
+
+            int is_vbr = buffer.ReadBits(1);
+            int peak_bitrate = buffer.ReadBits(15);
+            peak_bitrate = (peak_bitrate * stream.SampleRate) >> 4;
+
+            double peak_bitdepth =
+                (double)peak_bitrate /
+                (stream.ChannelCount + stream.LFE) /
+                stream.SampleRate;
+            if (peak_bitdepth > 14)
+            {
+                stream.BitDepth = 24;
+            }
+            else
+            {
+                stream.BitDepth = 16;
+            }
+
+#if DEBUG
+            System.Diagnostics.Debug.WriteLine(string.Format(
+                "{0}\t{1}\t{2:F2}",
+                stream.PID, peak_bitrate, peak_bitdepth));
+#endif
+            /*
+            // TODO: Get THD dialnorm from metadata
+            if (stream.CoreStream != null)
+            {
+                TSAudioStream coreStream = (TSAudioStream)stream.CoreStream;
+                if (coreStream.DialNorm != 0)
+                {
+                    stream.DialNorm = coreStream.DialNorm;
+                }
+            }
+            */
+
+            stream.IsVBR = true;
+            stream.IsInitialized = true;
+        }
+    }
+}

BDInfo/TSCodecVC1.cs

@@ -0,0 +1,131 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+
+namespace BDInfo
+{
+    public abstract class TSCodecVC1
+    {
+        public static void Scan(
+            TSVideoStream stream,
+            TSStreamBuffer buffer,
+            ref string tag)
+        {
+            int parse = 0;
+            byte frameHeaderParse = 0;
+            byte sequenceHeaderParse = 0;
+            bool isInterlaced = false;
+
+            for (int i = 0; i < buffer.Length; i++)
+            {
+                parse = (parse << 8) + buffer.ReadByte();
+
+                if (parse == 0x0000010D)
+                {
+                    frameHeaderParse = 4;
+                }
+                else if (frameHeaderParse > 0)
+                {
+                    --frameHeaderParse;
+                    if (frameHeaderParse == 0)
+                    {
+                        uint pictureType = 0;
+                        if (isInterlaced)
+                        {
+                            if ((parse & 0x80000000) == 0)
+                            {
+                                pictureType =
+                                    (uint)((parse & 0x78000000) >> 13);
+                            }
+                            else
+                            {
+                                pictureType =
+                                    (uint)((parse & 0x3c000000) >> 12);
+                            }
+                        }
+                        else
+                        {
+                            pictureType =
+                                (uint)((parse & 0xf0000000) >> 14);
+                        }
+
+                        if ((pictureType & 0x20000) == 0)
+                        {
+                            tag = "P";
+                        }
+                        else if ((pictureType & 0x10000) == 0)
+                        {
+                            tag = "B";
+                        }
+                        else if ((pictureType & 0x8000) == 0)
+                        {
+                            tag = "I";
+                        }
+                        else if ((pictureType & 0x4000) == 0)
+                        {
+                            tag = "BI";
+                        }
+                        else
+                        {
+                            tag = null;
+                        }
+                        if (stream.IsInitialized) return;
+                    }
+                }
+                else if (parse == 0x0000010F)
+                {
+                    sequenceHeaderParse = 6;
+                }
+                else if (sequenceHeaderParse > 0)
+                {
+                    --sequenceHeaderParse;
+                    switch (sequenceHeaderParse)
+                    {
+                        case 5:
+                            int profileLevel = ((parse & 0x38) >> 3);
+                            if (((parse & 0xC0) >> 6) == 3)
+                            {
+                                stream.EncodingProfile = string.Format(
+                                    "Advanced Profile {0}", profileLevel);
+                            }
+                            else
+                            {
+                                stream.EncodingProfile = string.Format(
+                                    "Main Profile {0}", profileLevel);
+                            }
+                            break;
+
+                        case 0:
+                            if (((parse & 0x40) >> 6) > 0)
+                            {
+                                isInterlaced = true;
+                            }
+                            else
+                            {
+                                isInterlaced = false;
+                            }
+                            break;
+                    }
+                    stream.IsVBR = true;
+                    stream.IsInitialized = true;
+                }
+            }
+        }
+    }
+}

BDInfo/TSInterleavedFile.cs

@@ -0,0 +1,37 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+using MediaBrowser.Model.IO;
+
+// TODO: Do more interesting things here...
+
+namespace BDInfo
+{
+    public class TSInterleavedFile
+    {
+        public FileSystemMetadata FileInfo = null;
+        public string Name = null;
+
+        public TSInterleavedFile(FileSystemMetadata fileInfo)
+        {
+            FileInfo = fileInfo;
+            Name = fileInfo.Name.ToUpper();
+        }
+    }
+}

BDInfo/TSStream.cs

@@ -0,0 +1,780 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+using System;
+using System.Collections.Generic;
+
+namespace BDInfo
+{
+    public enum TSStreamType : byte
+    {
+        Unknown = 0,
+        MPEG1_VIDEO = 0x01,
+        MPEG2_VIDEO = 0x02,
+        AVC_VIDEO = 0x1b,
+        MVC_VIDEO = 0x20,
+        VC1_VIDEO = 0xea,
+        MPEG1_AUDIO = 0x03,
+        MPEG2_AUDIO = 0x04,
+        LPCM_AUDIO = 0x80,
+        AC3_AUDIO = 0x81,
+        AC3_PLUS_AUDIO = 0x84,
+        AC3_PLUS_SECONDARY_AUDIO = 0xA1,
+        AC3_TRUE_HD_AUDIO = 0x83,
+        DTS_AUDIO = 0x82,
+        DTS_HD_AUDIO = 0x85,
+        DTS_HD_SECONDARY_AUDIO = 0xA2,
+        DTS_HD_MASTER_AUDIO = 0x86,
+        PRESENTATION_GRAPHICS = 0x90,
+        INTERACTIVE_GRAPHICS = 0x91,
+        SUBTITLE = 0x92
+    }
+
+    public enum TSVideoFormat : byte
+    {
+        Unknown = 0,
+        VIDEOFORMAT_480i = 1,
+        VIDEOFORMAT_576i = 2,
+        VIDEOFORMAT_480p = 3,
+        VIDEOFORMAT_1080i = 4,
+        VIDEOFORMAT_720p = 5,
+        VIDEOFORMAT_1080p = 6,
+        VIDEOFORMAT_576p = 7,
+    }
+
+    public enum TSFrameRate : byte
+    {
+        Unknown = 0,
+        FRAMERATE_23_976 = 1,
+        FRAMERATE_24 = 2,
+        FRAMERATE_25 = 3,
+        FRAMERATE_29_97 = 4,
+        FRAMERATE_50 = 6,
+        FRAMERATE_59_94 = 7
+    }
+
+    public enum TSChannelLayout : byte
+    {
+        Unknown = 0,
+        CHANNELLAYOUT_MONO = 1,
+        CHANNELLAYOUT_STEREO = 3,
+        CHANNELLAYOUT_MULTI = 6,
+        CHANNELLAYOUT_COMBO = 12
+    }
+
+    public enum TSSampleRate : byte
+    {
+        Unknown = 0,
+        SAMPLERATE_48 = 1,
+        SAMPLERATE_96 = 4,
+        SAMPLERATE_192 = 5,
+        SAMPLERATE_48_192 = 12,
+        SAMPLERATE_48_96 = 14
+    }
+
+    public enum TSAspectRatio
+    {
+        Unknown = 0,
+        ASPECT_4_3 = 2,
+        ASPECT_16_9 = 3,
+        ASPECT_2_21 = 4
+    }
+
+    public class TSDescriptor
+    {
+        public byte Name;
+        public byte[] Value;
+
+        public TSDescriptor(byte name, byte length)
+        {
+            Name = name;
+            Value = new byte[length];
+        }
+
+        public TSDescriptor Clone()
+        {
+            var descriptor =
+                new TSDescriptor(Name, (byte)Value.Length);
+            Value.CopyTo(descriptor.Value, 0);
+            return descriptor;
+        }
+    }
+
+    public abstract class TSStream
+    {
+        public TSStream()
+        {
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0} ({1})", CodecShortName, PID);
+        }
+
+        public ushort PID;
+        public TSStreamType StreamType;
+        public List<TSDescriptor> Descriptors = null;
+        public long BitRate = 0;
+        public long ActiveBitRate = 0;
+        public bool IsVBR = false;
+        public bool IsInitialized = false;
+        public string LanguageName;
+        public bool IsHidden = false;
+
+        public ulong PayloadBytes = 0;
+        public ulong PacketCount = 0;
+        public double PacketSeconds = 0;
+        public int AngleIndex = 0;
+
+        public ulong PacketSize => PacketCount * 192;
+
+        private string _LanguageCode;
+        public string LanguageCode
+        {
+            get => _LanguageCode;
+            set
+            {
+                _LanguageCode = value;
+                LanguageName = LanguageCodes.GetName(value);
+            }
+        }
+
+        public bool IsVideoStream
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.MPEG1_VIDEO:
+                    case TSStreamType.MPEG2_VIDEO:
+                    case TSStreamType.AVC_VIDEO:
+                    case TSStreamType.MVC_VIDEO:
+                    case TSStreamType.VC1_VIDEO:
+                        return true;
+
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        public bool IsAudioStream
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.MPEG1_AUDIO:
+                    case TSStreamType.MPEG2_AUDIO:
+                    case TSStreamType.LPCM_AUDIO:
+                    case TSStreamType.AC3_AUDIO:
+                    case TSStreamType.AC3_PLUS_AUDIO:
+                    case TSStreamType.AC3_PLUS_SECONDARY_AUDIO:
+                    case TSStreamType.AC3_TRUE_HD_AUDIO:
+                    case TSStreamType.DTS_AUDIO:
+                    case TSStreamType.DTS_HD_AUDIO:
+                    case TSStreamType.DTS_HD_SECONDARY_AUDIO:
+                    case TSStreamType.DTS_HD_MASTER_AUDIO:
+                        return true;
+
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        public bool IsGraphicsStream
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.PRESENTATION_GRAPHICS:
+                    case TSStreamType.INTERACTIVE_GRAPHICS:
+                        return true;
+
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        public bool IsTextStream
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.SUBTITLE:
+                        return true;
+
+                    default:
+                        return false;
+                }
+            }
+        }
+
+        public string CodecName
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.MPEG1_VIDEO:
+                        return "MPEG-1 Video";
+                    case TSStreamType.MPEG2_VIDEO:
+                        return "MPEG-2 Video";
+                    case TSStreamType.AVC_VIDEO:
+                        return "MPEG-4 AVC Video";
+                    case TSStreamType.MVC_VIDEO:
+                        return "MPEG-4 MVC Video";
+                    case TSStreamType.VC1_VIDEO:
+                        return "VC-1 Video";
+                    case TSStreamType.MPEG1_AUDIO:
+                        return "MP1 Audio";
+                    case TSStreamType.MPEG2_AUDIO:
+                        return "MP2 Audio";
+                    case TSStreamType.LPCM_AUDIO:
+                        return "LPCM Audio";
+                    case TSStreamType.AC3_AUDIO:
+                        if (((TSAudioStream)this).AudioMode == TSAudioMode.Extended)
+                            return "Dolby Digital EX Audio";
+                        else
+                            return "Dolby Digital Audio";
+                    case TSStreamType.AC3_PLUS_AUDIO:
+                    case TSStreamType.AC3_PLUS_SECONDARY_AUDIO:
+                        return "Dolby Digital Plus Audio";
+                    case TSStreamType.AC3_TRUE_HD_AUDIO:
+                        return "Dolby TrueHD Audio";
+                    case TSStreamType.DTS_AUDIO:
+                        if (((TSAudioStream)this).AudioMode == TSAudioMode.Extended)
+                            return "DTS-ES Audio";
+                        else
+                            return "DTS Audio";
+                    case TSStreamType.DTS_HD_AUDIO:
+                        return "DTS-HD High-Res Audio";
+                    case TSStreamType.DTS_HD_SECONDARY_AUDIO:
+                        return "DTS Express";
+                    case TSStreamType.DTS_HD_MASTER_AUDIO:
+                        return "DTS-HD Master Audio";
+                    case TSStreamType.PRESENTATION_GRAPHICS:
+                        return "Presentation Graphics";
+                    case TSStreamType.INTERACTIVE_GRAPHICS:
+                        return "Interactive Graphics";
+                    case TSStreamType.SUBTITLE:
+                        return "Subtitle";
+                    default:
+                        return "UNKNOWN";
+                }
+            }
+        }
+
+        public string CodecAltName
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.MPEG1_VIDEO:
+                        return "MPEG-1";
+                    case TSStreamType.MPEG2_VIDEO:
+                        return "MPEG-2";
+                    case TSStreamType.AVC_VIDEO:
+                        return "AVC";
+                    case TSStreamType.MVC_VIDEO:
+                        return "MVC";
+                    case TSStreamType.VC1_VIDEO:
+                        return "VC-1";
+                    case TSStreamType.MPEG1_AUDIO:
+                        return "MP1";
+                    case TSStreamType.MPEG2_AUDIO:
+                        return "MP2";
+                    case TSStreamType.LPCM_AUDIO:
+                        return "LPCM";
+                    case TSStreamType.AC3_AUDIO:
+                        return "DD AC3";
+                    case TSStreamType.AC3_PLUS_AUDIO:
+                    case TSStreamType.AC3_PLUS_SECONDARY_AUDIO:
+                        return "DD AC3+";
+                    case TSStreamType.AC3_TRUE_HD_AUDIO:
+                        return "Dolby TrueHD";
+                    case TSStreamType.DTS_AUDIO:
+                        return "DTS";
+                    case TSStreamType.DTS_HD_AUDIO:
+                        return "DTS-HD Hi-Res";
+                    case TSStreamType.DTS_HD_SECONDARY_AUDIO:
+                        return "DTS Express";
+                    case TSStreamType.DTS_HD_MASTER_AUDIO:
+                        return "DTS-HD Master";
+                    case TSStreamType.PRESENTATION_GRAPHICS:
+                        return "PGS";
+                    case TSStreamType.INTERACTIVE_GRAPHICS:
+                        return "IGS";
+                    case TSStreamType.SUBTITLE:
+                        return "SUB";
+                    default:
+                        return "UNKNOWN";
+                }
+            }
+        }
+
+        public string CodecShortName
+        {
+            get
+            {
+                switch (StreamType)
+                {
+                    case TSStreamType.MPEG1_VIDEO:
+                        return "MPEG-1";
+                    case TSStreamType.MPEG2_VIDEO:
+                        return "MPEG-2";
+                    case TSStreamType.AVC_VIDEO:
+                        return "AVC";
+                    case TSStreamType.MVC_VIDEO:
+                        return "MVC";
+                    case TSStreamType.VC1_VIDEO:
+                        return "VC-1";
+                    case TSStreamType.MPEG1_AUDIO:
+                        return "MP1";
+                    case TSStreamType.MPEG2_AUDIO:
+                        return "MP2";
+                    case TSStreamType.LPCM_AUDIO:
+                        return "LPCM";
+                    case TSStreamType.AC3_AUDIO:
+                        if (((TSAudioStream)this).AudioMode == TSAudioMode.Extended)
+                            return "AC3-EX";
+                        else
+                            return "AC3";
+                    case TSStreamType.AC3_PLUS_AUDIO:
+                    case TSStreamType.AC3_PLUS_SECONDARY_AUDIO:
+                        return "AC3+";
+                    case TSStreamType.AC3_TRUE_HD_AUDIO:
+                        return "TrueHD";
+                    case TSStreamType.DTS_AUDIO:
+                        if (((TSAudioStream)this).AudioMode == TSAudioMode.Extended)
+                            return "DTS-ES";
+                        else
+                            return "DTS";
+                    case TSStreamType.DTS_HD_AUDIO:
+                        return "DTS-HD HR";
+                    case TSStreamType.DTS_HD_SECONDARY_AUDIO:
+                        return "DTS Express";
+                    case TSStreamType.DTS_HD_MASTER_AUDIO:
+                        return "DTS-HD MA";
+                    case TSStreamType.PRESENTATION_GRAPHICS:
+                        return "PGS";
+                    case TSStreamType.INTERACTIVE_GRAPHICS:
+                        return "IGS";
+                    case TSStreamType.SUBTITLE:
+                        return "SUB";
+                    default:
+                        return "UNKNOWN";
+                }
+            }
+        }
+
+        public virtual string Description => "";
+
+        public abstract TSStream Clone();
+
+        protected void CopyTo(TSStream stream)
+        {
+            stream.PID = PID;
+            stream.StreamType = StreamType;
+            stream.IsVBR = IsVBR;
+            stream.BitRate = BitRate;
+            stream.IsInitialized = IsInitialized;
+            stream.LanguageCode = _LanguageCode;
+            if (Descriptors != null)
+            {
+                stream.Descriptors = new List<TSDescriptor>();
+                foreach (var descriptor in Descriptors)
+                {
+                    stream.Descriptors.Add(descriptor.Clone());
+                }
+            }
+        }
+    }
+
+    public class TSVideoStream : TSStream
+    {
+        public TSVideoStream()
+        {
+        }
+
+        public int Width;
+        public int Height;
+        public bool IsInterlaced;
+        public int FrameRateEnumerator;
+        public int FrameRateDenominator;
+        public TSAspectRatio AspectRatio;
+        public string EncodingProfile;
+
+        private TSVideoFormat _VideoFormat;
+        public TSVideoFormat VideoFormat
+        {
+            get => _VideoFormat;
+            set
+            {
+                _VideoFormat = value;
+                switch (value)
+                {
+                    case TSVideoFormat.VIDEOFORMAT_480i:
+                        Height = 480;
+                        IsInterlaced = true;
+                        break;
+                    case TSVideoFormat.VIDEOFORMAT_480p:
+                        Height = 480;
+                        IsInterlaced = false;
+                        break;
+                    case TSVideoFormat.VIDEOFORMAT_576i:
+                        Height = 576;
+                        IsInterlaced = true;
+                        break;
+                    case TSVideoFormat.VIDEOFORMAT_576p:
+                        Height = 576;
+                        IsInterlaced = false;
+                        break;
+                    case TSVideoFormat.VIDEOFORMAT_720p:
+                        Height = 720;
+                        IsInterlaced = false;
+                        break;
+                    case TSVideoFormat.VIDEOFORMAT_1080i:
+                        Height = 1080;
+                        IsInterlaced = true;
+                        break;
+                    case TSVideoFormat.VIDEOFORMAT_1080p:
+                        Height = 1080;
+                        IsInterlaced = false;
+                        break;
+                }
+            }
+        }
+
+        private TSFrameRate _FrameRate;
+        public TSFrameRate FrameRate
+        {
+            get => _FrameRate;
+            set
+            {
+                _FrameRate = value;
+                switch (value)
+                {
+                    case TSFrameRate.FRAMERATE_23_976:
+                        FrameRateEnumerator = 24000;
+                        FrameRateDenominator = 1001;
+                        break;
+                    case TSFrameRate.FRAMERATE_24:
+                        FrameRateEnumerator = 24000;
+                        FrameRateDenominator = 1000;
+                        break;
+                    case TSFrameRate.FRAMERATE_25:
+                        FrameRateEnumerator = 25000;
+                        FrameRateDenominator = 1000;
+                        break;
+                    case TSFrameRate.FRAMERATE_29_97:
+                        FrameRateEnumerator = 30000;
+                        FrameRateDenominator = 1001;
+                        break;
+                    case TSFrameRate.FRAMERATE_50:
+                        FrameRateEnumerator = 50000;
+                        FrameRateDenominator = 1000;
+                        break;
+                    case TSFrameRate.FRAMERATE_59_94:
+                        FrameRateEnumerator = 60000;
+                        FrameRateDenominator = 1001;
+                        break;
+                }
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                string description = "";
+
+                if (Height > 0)
+                {
+                    description += string.Format("{0:D}{1} / ",
+                        Height,
+                        IsInterlaced ? "i" : "p");
+                }
+                if (FrameRateEnumerator > 0 &&
+                    FrameRateDenominator > 0)
+                {
+                    if (FrameRateEnumerator % FrameRateDenominator == 0)
+                    {
+                        description += string.Format("{0:D} fps / ",
+                            FrameRateEnumerator / FrameRateDenominator);
+                    }
+                    else
+                    {
+                        description += string.Format("{0:F3} fps / ",
+                            (double)FrameRateEnumerator / FrameRateDenominator);
+                    }
+
+                }
+                if (AspectRatio == TSAspectRatio.ASPECT_4_3)
+                {
+                    description += "4:3 / ";
+                }
+                else if (AspectRatio == TSAspectRatio.ASPECT_16_9)
+                {
+                    description += "16:9 / ";
+                }
+                if (EncodingProfile != null)
+                {
+                    description += EncodingProfile + " / ";
+                }
+                if (description.EndsWith(" / "))
+                {
+                    description = description.Substring(0, description.Length - 3);
+                }
+                return description;
+            }
+        }
+
+        public override TSStream Clone()
+        {
+            var stream = new TSVideoStream();
+            CopyTo(stream);
+
+            stream.VideoFormat = _VideoFormat;
+            stream.FrameRate = _FrameRate;
+            stream.Width = Width;
+            stream.Height = Height;
+            stream.IsInterlaced = IsInterlaced;
+            stream.FrameRateEnumerator = FrameRateEnumerator;
+            stream.FrameRateDenominator = FrameRateDenominator;
+            stream.AspectRatio = AspectRatio;
+            stream.EncodingProfile = EncodingProfile;
+
+            return stream;
+        }
+    }
+
+    public enum TSAudioMode
+    {
+        Unknown,
+        DualMono,
+        Stereo,
+        Surround,
+        Extended
+    }
+
+    public class TSAudioStream : TSStream
+    {
+        public TSAudioStream()
+        {
+        }
+
+        public int SampleRate;
+        public int ChannelCount;
+        public int BitDepth;
+        public int LFE;
+        public int DialNorm;
+        public TSAudioMode AudioMode;
+        public TSAudioStream CoreStream;
+        public TSChannelLayout ChannelLayout;
+
+        public static int ConvertSampleRate(
+            TSSampleRate sampleRate)
+        {
+            switch (sampleRate)
+            {
+                case TSSampleRate.SAMPLERATE_48:
+                    return 48000;
+
+                case TSSampleRate.SAMPLERATE_96:
+                case TSSampleRate.SAMPLERATE_48_96:
+                    return 96000;
+
+                case TSSampleRate.SAMPLERATE_192:
+                case TSSampleRate.SAMPLERATE_48_192:
+                    return 192000;
+            }
+            return 0;
+        }
+
+        public string ChannelDescription
+        {
+            get
+            {
+                if (ChannelLayout == TSChannelLayout.CHANNELLAYOUT_MONO &&
+                    ChannelCount == 2)
+                {
+                }
+
+                string description = "";
+                if (ChannelCount > 0)
+                {
+                    description += string.Format(
+                        "{0:D}.{1:D}",
+                        ChannelCount, LFE);
+                }
+                else
+                {
+                    switch (ChannelLayout)
+                    {
+                        case TSChannelLayout.CHANNELLAYOUT_MONO:
+                            description += "1.0";
+                            break;
+                        case TSChannelLayout.CHANNELLAYOUT_STEREO:
+                            description += "2.0";
+                            break;
+                        case TSChannelLayout.CHANNELLAYOUT_MULTI:
+                            description += "5.1";
+                            break;
+                    }
+                }
+                if (AudioMode == TSAudioMode.Extended)
+                {
+                    if (StreamType == TSStreamType.AC3_AUDIO)
+                    {
+                        description += "-EX";
+                    }
+                    if (StreamType == TSStreamType.DTS_AUDIO ||
+                        StreamType == TSStreamType.DTS_HD_AUDIO ||
+                        StreamType == TSStreamType.DTS_HD_MASTER_AUDIO)
+                    {
+                        description += "-ES";
+                    }
+                }
+                return description;
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                string description = ChannelDescription;
+
+                if (SampleRate > 0)
+                {
+                    description += string.Format(
+                        " / {0:D} kHz", SampleRate / 1000);
+                }
+                if (BitRate > 0)
+                {
+                    description += string.Format(
+                        " / {0:D} kbps", (uint)Math.Round((double)BitRate / 1000));
+                }
+                if (BitDepth > 0)
+                {
+                    description += string.Format(
+                        " / {0:D}-bit", BitDepth);
+                }
+                if (DialNorm != 0)
+                {
+                    description += string.Format(
+                        " / DN {0}dB", DialNorm);
+                }
+                if (ChannelCount == 2)
+                {
+                    switch (AudioMode)
+                    {
+                        case TSAudioMode.DualMono:
+                            description += " / Dual Mono";
+                            break;
+
+                        case TSAudioMode.Surround:
+                            description += " / Dolby Surround";
+                            break;
+                    }
+                }
+                if (description.EndsWith(" / "))
+                {
+                    description = description.Substring(0, description.Length - 3);
+                }
+                if (CoreStream != null)
+                {
+                    string codec = "";
+                    switch (CoreStream.StreamType)
+                    {
+                        case TSStreamType.AC3_AUDIO:
+                            codec = "AC3 Embedded";
+                            break;
+                        case TSStreamType.DTS_AUDIO:
+                            codec = "DTS Core";
+                            break;
+                    }
+                    description += string.Format(
+                        " ({0}: {1})",
+                        codec,
+                        CoreStream.Description);
+                }
+                return description;
+            }
+        }
+
+        public override TSStream Clone()
+        {
+            var stream = new TSAudioStream();
+            CopyTo(stream);
+
+            stream.SampleRate = SampleRate;
+            stream.ChannelLayout = ChannelLayout;
+            stream.ChannelCount = ChannelCount;
+            stream.BitDepth = BitDepth;
+            stream.LFE = LFE;
+            stream.DialNorm = DialNorm;
+            stream.AudioMode = AudioMode;
+            if (CoreStream != null)
+            {
+                stream.CoreStream = (TSAudioStream)CoreStream.Clone();
+            }
+
+            return stream;
+        }
+    }
+
+    public class TSGraphicsStream : TSStream
+    {
+        public TSGraphicsStream()
+        {
+            IsVBR = true;
+            IsInitialized = true;
+        }
+
+        public override TSStream Clone()
+        {
+            var stream = new TSGraphicsStream();
+            CopyTo(stream);
+            return stream;
+        }
+    }
+
+    public class TSTextStream : TSStream
+    {
+        public TSTextStream()
+        {
+            IsVBR = true;
+            IsInitialized = true;
+        }
+
+        public override TSStream Clone()
+        {
+            var stream = new TSTextStream();
+            CopyTo(stream);
+            return stream;
+        }
+    }
+}

BDInfo/TSStreamBuffer.cs

@@ -0,0 +1,130 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+using System;
+using System.Collections.Specialized;
+using System.IO;
+
+namespace BDInfo
+{
+    public class TSStreamBuffer
+    {
+        private MemoryStream Stream = new MemoryStream();
+        private int SkipBits = 0;
+        private byte[] Buffer;
+        private int BufferLength = 0;
+        public int TransferLength = 0;
+
+        public TSStreamBuffer()
+        {
+            Buffer = new byte[4096];
+            Stream = new MemoryStream(Buffer);
+        }
+
+        public long Length => (long)BufferLength;
+
+        public long Position => Stream.Position;
+
+        public void Add(
+            byte[] buffer,
+            int offset,
+            int length)
+        {
+            TransferLength += length;
+
+            if (BufferLength + length >= Buffer.Length)
+            {
+                length = Buffer.Length - BufferLength;
+            }
+            if (length > 0)
+            {
+                Array.Copy(buffer, offset, Buffer, BufferLength, length);
+                BufferLength += length;
+            }
+        }
+
+        public void Seek(
+            long offset,
+            SeekOrigin loc)
+        {
+            Stream.Seek(offset, loc);
+        }
+
+        public void Reset()
+        {
+            BufferLength = 0;
+            TransferLength = 0;
+        }
+
+        public void BeginRead()
+        {
+            SkipBits = 0;
+            Stream.Seek(0, SeekOrigin.Begin);
+        }
+
+        public void EndRead()
+        {
+        }
+
+        public byte[] ReadBytes(int bytes)
+        {
+            if (Stream.Position + bytes >= BufferLength)
+            {
+                return null;
+            }
+
+            byte[] value = new byte[bytes];
+            Stream.Read(value, 0, bytes);
+            return value;
+        }
+
+        public byte ReadByte()
+        {
+            return (byte)Stream.ReadByte();
+        }
+
+        public int ReadBits(int bits)
+        {
+            long pos = Stream.Position;
+
+            int shift = 24;
+            int data = 0;
+            for (int i = 0; i < 4; i++)
+            {
+                if (pos + i >= BufferLength) break;
+                data += (Stream.ReadByte() << shift);
+                shift -= 8;
+            }
+            var vector = new BitVector32(data);
+
+            int value = 0;
+            for (int i = SkipBits; i < SkipBits + bits; i++)
+            {
+                value <<= 1;
+                value += (vector[1 << (32 - i - 1)] ? 1 : 0);
+            }
+
+            SkipBits += bits;
+            Stream.Seek(pos + (SkipBits >> 3), SeekOrigin.Begin);
+            SkipBits = SkipBits % 8;
+
+            return value;
+        }
+    }
+}

BDInfo/TSStreamClip.cs

@@ -0,0 +1,107 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+using System;
+using System.Collections.Generic;
+
+namespace BDInfo
+{
+    public class TSStreamClip
+    {
+        public int AngleIndex = 0;
+        public string Name;
+        public double TimeIn;
+        public double TimeOut;
+        public double RelativeTimeIn;
+        public double RelativeTimeOut;
+        public double Length;
+
+        public ulong FileSize = 0;
+        public ulong InterleavedFileSize = 0;
+        public ulong PayloadBytes = 0;
+        public ulong PacketCount = 0;
+        public double PacketSeconds = 0;
+
+        public List<double> Chapters = new List<double>();
+
+        public TSStreamFile StreamFile = null;
+        public TSStreamClipFile StreamClipFile = null;
+
+        public TSStreamClip(
+            TSStreamFile streamFile,
+            TSStreamClipFile streamClipFile)
+        {
+            if (streamFile != null)
+            {
+                Name = streamFile.Name;
+                StreamFile = streamFile;
+                FileSize = (ulong)StreamFile.FileInfo.Length;
+                if (StreamFile.InterleavedFile != null)
+                {
+                    InterleavedFileSize = (ulong)StreamFile.InterleavedFile.FileInfo.Length;
+                }
+            }
+            StreamClipFile = streamClipFile;
+        }
+
+        public string DisplayName
+        {
+            get
+            {
+                if (StreamFile != null &&
+                    StreamFile.InterleavedFile != null &&
+                    BDInfoSettings.EnableSSIF)
+                {
+                    return StreamFile.InterleavedFile.Name;
+                }
+                return Name;
+            }
+        }
+
+        public ulong PacketSize => PacketCount * 192;
+
+        public ulong PacketBitRate
+        {
+            get
+            {
+                if (PacketSeconds > 0)
+                {
+                    return (ulong)Math.Round(((PacketSize * 8.0) / PacketSeconds));
+                }
+                return 0;
+            }
+        }
+
+        public bool IsCompatible(TSStreamClip clip)
+        {
+            foreach (var stream1 in StreamFile.Streams.Values)
+            {
+                if (clip.StreamFile.Streams.ContainsKey(stream1.PID))
+                {
+                    var stream2 = clip.StreamFile.Streams[stream1.PID];
+                    if (stream1.StreamType != stream2.StreamType)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+    }
+}

BDInfo/TSStreamClipFile.cs

@@ -0,0 +1,244 @@
+//============================================================================
+// BDInfo - Blu-ray Video and Audio Analysis Tool
+// Copyright © 2010 Cinema Squid
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//=============================================================================
+
+#undef DEBUG
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using MediaBrowser.Model.IO;
+
+namespace BDInfo
+{
+    public class TSStreamClipFile
+    {
+        public FileSystemMetadata FileInfo = null;
+        public string FileType = null;
+        public bool IsValid = false;
+        public string Name = null;
+
+        public Dictionary<ushort, TSStream> Streams =
+            new Dictionary<ushort, TSStream>();
+
+        public TSStreamClipFile(FileSystemMetadata fileInfo)
+        {
+            FileInfo = fileInfo;
+            Name = fileInfo.Name.ToUpper();
+        }
+
+        public void Scan()
+        {
+            Stream fileStream = null;
+            BinaryReader fileReader = null;
+
+            try
+            {
+#if DEBUG
+                Debug.WriteLine(string.Format(
+                    "Scanning {0}...", Name));
+#endif
+                Streams.Clear();
+
+                fileStream = File.OpenRead(FileInfo.FullName);
+                fileReader = new BinaryReader(fileStream);
+
+                byte[] data = new byte[fileStream.Length];
+                fileReader.Read(data, 0, data.Length);
+
+                byte[] fileType = new byte[8];
+                Array.Copy(data, 0, fileType, 0, fileType.Length);
+
+                FileType = Encoding.ASCII.GetString(fileType, 0, fileType.Length);
+                if (FileType != "HDMV0100" &&
+                    FileType != "HDMV0200")
+                {
+                    throw new Exception(string.Format(
+                        "Clip info file {0} has an unknown file type {1}.",
+                        FileInfo.Name, FileType));
+                }
+#if DEBUG
+                Debug.WriteLine(string.Format(
+                    "\tFileType: {0}", FileType));
+#endif
+                int clipIndex =
+                    ((int)data[12] << 24) +
+                    ((int)data[13] << 16) +
+                    ((int)data[14] << 8) +
+                    ((int)data[15]);
+
+                int clipLength =
+                    ((int)data[clipIndex] << 24) +
+                    ((int)data[clipIndex + 1] << 16) +
+                    ((int)data[clipIndex + 2] << 8) +
+                    ((int)data[clipIndex + 3]);
+
+                byte[] clipData = new byte[clipLength];
+                Array.Copy(data, clipIndex + 4, clipData, 0, clipData.Length);
+
+                int streamCount = clipData[8];
+#if DEBUG
+                Debug.WriteLine(string.Format(
+                    "\tStreamCount: {0}", streamCount));
+#endif
+                int streamOffset = 10;
+                for (int streamIndex = 0;
+                    streamIndex < streamCount;
+                    streamIndex++)
+                {
+                    TSStream stream = null;
+
+                    ushort PID = (ushort)
+                        ((clipData[streamOffset] << 8) +
+                          clipData[streamOffset + 1]);
+
+                    streamOffset += 2;
+
+                    var streamType = (TSStreamType)
+                        clipData[streamOffset + 1];
+                    switch (streamType)
+                    {
+                        case TSStreamType.MVC_VIDEO:
+                            // TODO
+                            break;
+
+                        case TSStreamType.AVC_VIDEO:
+                        case TSStreamType.MPEG1_VIDEO:
+                        case TSStreamType.MPEG2_VIDEO:
+                        case TSStreamType.VC1_VIDEO:
+                            {
+                                var videoFormat = (TSVideoFormat)
+                                    (clipData[streamOffset + 2] >> 4);
+                                var frameRate = (TSFrameRate)
+                                    (clipData[streamOffset + 2] & 0xF);
+                                var aspectRatio = (TSAspectRatio)
+                                    (clipData[streamOffset + 3] >> 4);
+
+                                stream = new TSVideoStream();
+                                ((TSVideoStream)stream).VideoFormat = videoFormat;
+                                ((TSVideoStream)stream).AspectRatio = aspectRatio;
+                                ((TSVideoStream)stream).FrameRate = frameRate;
+#if DEBUG
+                            Debug.WriteLine(string.Format(
+                                "\t{0} {1} {2} {3} {4}",
+                                PID,
+                                streamType,
+                                videoFormat,
+                                frameRate,
+                                aspectRatio));
+#endif
+                            }
+                            break;
+
+                        case TSStreamType.AC3_AUDIO:
+                        case TSStreamType.AC3_PLUS_AUDIO:
+                        case TSStreamType.AC3_PLUS_SECONDARY_AUDIO:
+                        case TSStreamType.AC3_TRUE_HD_AUDIO:
+                        case TSStreamType.DTS_AUDIO:
+                        case TSStreamType.DTS_HD_AUDIO:
+                        case TSStreamType.DTS_HD_MASTER_AUDIO:
+                        case TSStreamType.DTS_HD_SECONDARY_AUDIO:
+                        case TSStreamType.LPCM_AUDIO:
+                        case TSStreamType.MPEG1_AUDIO:
+                        case TSStreamType.MPEG2_AUDIO:
+                            {
+                                byte[] languageBytes = new byte[3];
+                                Array.Copy(clipData, streamOffset + 3,
+                                    languageBytes, 0, languageBytes.Length);
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
+
+                                var channelLayout = (TSChannelLayout)
+                                    (clipData[streamOffset + 2] >> 4);
+                                var sampleRate = (TSSampleRate)
+                                    (clipData[streamOffset + 2] & 0xF);
+
+                                stream = new TSAudioStream();
+                                ((TSAudioStream)stream).LanguageCode = languageCode;
+                                ((TSAudioStream)stream).ChannelLayout = channelLayout;
+                                ((TSAudioStream)stream).SampleRate = TSAudioStream.ConvertSampleRate(sampleRate);
+                                ((TSAudioStream)stream).LanguageCode = languageCode;
+#if DEBUG
+                            Debug.WriteLine(string.Format(
+                                "\t{0} {1} {2} {3} {4}",
+                                PID,
+                                streamType,
+                                languageCode,
+                                channelLayout,
+                                sampleRate));
+#endif
+                            }
+                            break;
+
+                        case TSStreamType.INTERACTIVE_GRAPHICS:
+                        case TSStreamType.PRESENTATION_GRAPHICS:
+                            {
+                                byte[] languageBytes = new byte[3];
+                                Array.Copy(clipData, streamOffset + 2,
+                                    languageBytes, 0, languageBytes.Length);
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
+
+                                stream = new TSGraphicsStream();
+                                stream.LanguageCode = languageCode;
+#if DEBUG
+                            Debug.WriteLine(string.Format(
+                                "\t{0} {1} {2}",
+                                PID,
+                                streamType,
+                                languageCode));
+#endif
+                            }
+                            break;
+
+                        case TSStreamType.SUBTITLE:
+                            {
+                                byte[] languageBytes = new byte[3];
+                                Array.Copy(clipData, streamOffset + 3,
+                                    languageBytes, 0, languageBytes.Length);
+                                string languageCode = Encoding.ASCII.GetString(languageBytes, 0, languageBytes.Length);
+#if DEBUG
+                            Debug.WriteLine(string.Format(
+                                "\t{0} {1} {2}",
+                                PID,
+                                streamType,
+                                languageCode));
+#endif
+                                stream = new TSTextStream();
+                                stream.LanguageCode = languageCode;
+                            }
+                            break;
+                    }
+
+                    if (stream != null)
+                    {
+                        stream.PID = PID;
+                        stream.StreamType = streamType;
+                        Streams.Add(PID, stream);
+                    }
+
+                    streamOffset += clipData[streamOffset] + 1;
+                }
+                IsValid = true;
+            }
+            finally
+            {
+                if (fileReader != null) fileReader.Dispose();
+                if (fileStream != null) fileStream.Dispose();
+            }
+        }
+    }
+}

CONTRIBUTORS.md

@@ -1,137 +1,35 @@
 # Jellyfin Contributors
 
- - [97carmine](https://github.com/97carmine)
- - [Abbe98](https://github.com/Abbe98)
- - [agrenott](https://github.com/agrenott)
- - [AndreCarvalho](https://github.com/AndreCarvalho)
- - [anthonylavado](https://github.com/anthonylavado)
- - [Artiume](https://github.com/Artiume)
- - [AThomsen](https://github.com/AThomsen)
- - [barronpm](https://github.com/barronpm)
- - [bilde2910](https://github.com/bilde2910)
- - [bfayers](https://github.com/bfayers)
- - [BnMcG](https://github.com/BnMcG)
- - [Bond-009](https://github.com/Bond-009)
- - [brianjmurrell](https://github.com/brianjmurrell)
- - [bugfixin](https://github.com/bugfixin)
- - [chaosinnovator](https://github.com/chaosinnovator)
- - [ckcr4lyf](https://github.com/ckcr4lyf)
- - [crankdoofus](https://github.com/crankdoofus)
- - [crobibero](https://github.com/crobibero)
- - [cromefire](https://github.com/cromefire)
- - [cryptobank](https://github.com/cryptobank)
- - [cvium](https://github.com/cvium)
- - [dannymichel](https://github.com/dannymichel)
- - [DaveChild](https://github.com/DaveChild)
- - [Delgan](https://github.com/Delgan)
- - [dcrdev](https://github.com/dcrdev)
- - [dhartung](https://github.com/dhartung)
- - [dinki](https://github.com/dinki)
- - [dkanada](https://github.com/dkanada)
- - [dlahoti](https://github.com/dlahoti)
- - [dmitrylyzo](https://github.com/dmitrylyzo)
- - [DMouse10462](https://github.com/DMouse10462)
- - [DrPandemic](https://github.com/DrPandemic)
- - [EraYaN](https://github.com/EraYaN)
- - [escabe](https://github.com/escabe)
- - [excelite](https://github.com/excelite)
- - [fasheng](https://github.com/fasheng)
- - [ferferga](https://github.com/ferferga)
- - [fhriley](https://github.com/fhriley)
- - [flemse](https://github.com/flemse)
- - [Froghut](https://github.com/Froghut)
- - [fruhnow](https://github.com/fruhnow)
- - [geilername](https://github.com/geilername)
- - [gnattu](https://github.com/gnattu)
- - [grafixeyehero](https://github.com/grafixeyehero)
- - [h1nk](https://github.com/h1nk)
- - [hawken93](https://github.com/hawken93)
- - [HelloWorld017](https://github.com/HelloWorld017)
- - [jftuga](https://github.com/jftuga)
- - [joern-h](https://github.com/joern-h)
- - [joshuaboniface](https://github.com/joshuaboniface)
- - [JustAMan](https://github.com/JustAMan)
- - [justinfenn](https://github.com/justinfenn)
- - [KerryRJ](https://github.com/KerryRJ)
- - [Larvitar](https://github.com/Larvitar)
- - [LeoVerto](https://github.com/LeoVerto)
- - [Liggy](https://github.com/Liggy)
- - [LogicalPhallacy](https://github.com/LogicalPhallacy)
- - [loli10K](https://github.com/loli10K)
- - [lostmypillow](https://github.com/lostmypillow)
- - [Lynxy](https://github.com/Lynxy)
- - [ManfredRichthofen](https://github.com/ManfredRichthofen)
- - [Marenz](https://github.com/Marenz)
- - [marius-luca-87](https://github.com/marius-luca-87)
- - [mark-monteiro](https://github.com/mark-monteiro)
- - [Matt07211](https://github.com/Matt07211)
- - [mcarlton00](https://github.com/mcarlton00)
- - [mitchfizz05](https://github.com/mitchfizz05)
- - [MrTimscampi](https://github.com/MrTimscampi)
- - [n8225](https://github.com/n8225)
- - [Narfinger](https://github.com/Narfinger)
- - [NathanPickard](https://github.com/NathanPickard)
- - [neilsb](https://github.com/neilsb)
- - [nevado](https://github.com/nevado)
- - [Nickbert7](https://github.com/Nickbert7)
+ - [JoshuaBoniface](https://github.com/joshuaboniface)
  - [nvllsvm](https://github.com/nvllsvm)
- - [nyanmisaka](https://github.com/nyanmisaka)
- - [oddstr13](https://github.com/oddstr13)
- - [petermcneil](https://github.com/petermcneil)
- - [Phlogi](https://github.com/Phlogi)
- - [pjeanjean](https://github.com/pjeanjean)
- - [ploughpuff](https://github.com/ploughpuff)
- - [pR0Ps](https://github.com/pR0Ps)
- - [PrplHaz4](https://github.com/PrplHaz4)
- - [RazeLighter777](https://github.com/RazeLighter777)
- - [redSpoutnik](https://github.com/redSpoutnik)
- - [ringmatter](https://github.com/ringmatter)
- - [ryan-hartzell](https://github.com/ryan-hartzell)
- - [s0urcelab](https://github.com/s0urcelab)
- - [sachk](https://github.com/sachk)
- - [sammyrc34](https://github.com/sammyrc34)
- - [samuel9554](https://github.com/samuel9554)
- - [scheidleon](https://github.com/scheidleon)
- - [sebPomme](https://github.com/sebPomme)
- - [SegiH](https://github.com/SegiH)
- - [SenorSmartyPants](https://github.com/SenorSmartyPants)
- - [shemanaev](https://github.com/shemanaev)
- - [skaro13](https://github.com/skaro13)
- - [sl1288](https://github.com/sl1288)
- - [sorinyo2004](https://github.com/sorinyo2004)
+ - [JustAMan](https://github.com/JustAMan)
+ - [dcrdev](https://github.com/dcrdev)
+ - [EraYaN](https://github.com/EraYaN)
+ - [flemse](https://github.com/flemse)
+ - [bfayers](https://github.com/bfayers)
+ - [Bond_009](https://github.com/Bond-009)
+ - [AnthonyLavado](https://github.com/anthonylavado)
  - [sparky8251](https://github.com/sparky8251)
- - [stanionascu](https://github.com/stanionascu)
- - [stevehayles](https://github.com/stevehayles)
- - [SuperSandro2000](https://github.com/SuperSandro2000)
- - [tbraeutigam](https://github.com/tbraeutigam)
- - [teacupx](https://github.com/teacupx)
- - [Terror-Gene](https://github.com/Terror-Gene)
- - [ThatNerdyPikachu](https://github.com/ThatNerdyPikachu)
- - [ThibaultNocchi](https://github.com/ThibaultNocchi)
- - [thornbill](https://github.com/thornbill)
- - [ThreeFive-O](https://github.com/ThreeFive-O)
- - [TrisMcC](https://github.com/TrisMcC)
- - [trumblejoe](https://github.com/trumblejoe)
- - [TtheCreator](https://github.com/TtheCreator)
- - [twinkybot](https://github.com/twinkybot)
- - [Ullmie02](https://github.com/Ullmie02)
- - [Unhelpful](https://github.com/Unhelpful)
- - [viaregio](https://github.com/viaregio)
- - [vitorsemeano](https://github.com/vitorsemeano)
- - [voodoos](https://github.com/voodoos)
- - [whooo](https://github.com/whooo)
- - [WiiPlayer2](https://github.com/WiiPlayer2)
- - [WillWill56](https://github.com/WillWill56)
+ - [LeoVerto](https://github.com/LeoVerto)
+ - [grafixeyehero](https://github.com/grafixeyehero)
+ - [cvium](https://github.com/cvium)
  - [wtayl0r](https://github.com/wtayl0r)
- - [Wuerfelbecher](https://github.com/Wuerfelbecher)
- - [Wunax](https://github.com/Wunax)
- - [WWWesten](https://github.com/WWWesten)
- - [WX9yMOXWId](https://github.com/WX9yMOXWId)
- - [xosdy](https://github.com/xosdy)
- - [XVicarious](https://github.com/XVicarious)
- - [YouKnowBlom](https://github.com/YouKnowBlom)
- - [KristupasSavickas](https://github.com/KristupasSavickas)
- - [Pusta](https://github.com/pusta)
+ - [TtheCreator](https://github.com/Tthecreator)
+ - [dkanada](https://github.com/dkanada)
+ - [LogicalPhallacy](https://github.com/LogicalPhallacy/)
+ - [RazeLighter777](https://github.com/RazeLighter777)
+ - [WillWill56](https://github.com/WillWill56)
+ - [Liggy](https://github.com/Liggy)
+ - [fruhnow](https://github.com/fruhnow)
+ - [Lynxy](https://github.com/Lynxy)
+ - [fasheng](https://github.com/fasheng)
+ - [ploughpuff](https://github.com/ploughpuff)
+ - [pjeanjean](https://github.com/pjeanjean)
+ - [DrPandemic](https://github.com/drpandemic)
+ - [joern-h](https://github.com/joern-h)
+ - [Khinenw](https://github.com/HelloWorld017)
+ - [fhriley](https://github.com/fhriley)
+ - [nevado](https://github.com/nevado)
 
 # Emby Contributors
 

Dockerfile

@@ -1,60 +1,42 @@
-ARG DOTNET_VERSION=3.1
+ARG DOTNET_VERSION=2.2
+ARG FFMPEG_VERSION=latest
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=master
-RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python \
+ARG JELLYFIN_WEB_VERSION=v10.4.1
+RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
  && yarn install \
+ && yarn build \
  && mv dist /dist
 
-FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION}-buster as builder
+FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder
 WORKDIR /repo
 COPY . .
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
-# because of changes in docker and systemd we need to not build in parallel at the moment
-# see https://success.docker.com/article/how-to-reserve-resource-temporarily-unavailable-errors-due-to-tasksmax-setting
-RUN dotnet publish Jellyfin.Server --disable-parallel --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none"
+RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-x64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none"
 
-FROM debian:buster-slim
-
-# https://askubuntu.com/questions/972516/debian-frontend-environment-variable
-ARG DEBIAN_FRONTEND="noninteractive"
-# http://stackoverflow.com/questions/48162574/ddg#49462622
-ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
-# https://github.com/NVIDIA/nvidia-docker/wiki/Installation-(Native-GPU-Support)
-ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
+FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg
 
+FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION}
+COPY --from=ffmpeg / /
 COPY --from=builder /jellyfin /jellyfin
 COPY --from=web-builder /dist /jellyfin/jellyfin-web
 # Install dependencies:
-#   mesa-va-drivers: needed for AMD VAAPI
+#   libfontconfig1: needed for Skia
+#   mesa-va-drivers: needed for VAAPI
 RUN apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg wget apt-transport-https \
- && wget -O - https://repo.jellyfin.org/jellyfin_team.gpg.key | apt-key add - \
- && echo "deb [arch=$( dpkg --print-architecture )] https://repo.jellyfin.org/$( awk -F'=' '/^ID=/{ print $NF }' /etc/os-release ) $( awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release ) main" | tee /etc/apt/sources.list.d/jellyfin.list \
- && apt-get update \
  && apt-get install --no-install-recommends --no-install-suggests -y \
-   mesa-va-drivers \
-   jellyfin-ffmpeg \
-   openssl \
-   locales \
- && apt-get remove gnupg wget apt-transport-https -y \
- && apt-get clean autoclean -y \
- && apt-get autoremove -y \
+   libfontconfig1 mesa-va-drivers \
+ && apt-get clean autoclean \
+ && apt-get autoremove \
  && rm -rf /var/lib/apt/lists/* \
  && mkdir -p /cache /config /media \
- && chmod 777 /cache /config /media \
- && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
-
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
+ && chmod 777 /cache /config /media
 
 EXPOSE 8096
 VOLUME /cache /config /media
-ENTRYPOINT ["./jellyfin/jellyfin", \
-    "--datadir", "/config", \
-    "--cachedir", "/cache", \
-    "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"]
+ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
+    --datadir /config \
+    --cachedir /cache \
+    --ffmpeg /usr/local/bin/ffmpeg

Dockerfile.arm

@@ -1,16 +1,15 @@
-# DESIGNED FOR BUILDING ON AMD64 ONLY
-#####################################
 # Requires binfm_misc registration
 # https://github.com/multiarch/qemu-user-static#binfmt_misc-register
-ARG DOTNET_VERSION=3.1
+ARG DOTNET_VERSION=3.0
 
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=master
-RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python \
+ARG JELLYFIN_WEB_VERSION=v10.4.1
+RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
  && yarn install \
+ && yarn build \
  && mv dist /dist
 
 
@@ -18,6 +17,8 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder
 WORKDIR /repo
 COPY . .
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+# TODO Remove or update the sed line when we update dotnet version.
+RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
 # Discard objs - may cause failures if exists
 RUN find . -type d -name obj | xargs -r rm -r
 # Build
@@ -25,53 +26,19 @@ RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin"
 
 
 FROM multiarch/qemu-user-static:x86_64-arm as qemu
-FROM arm32v7/debian:buster-slim
-
-# https://askubuntu.com/questions/972516/debian-frontend-environment-variable
-ARG DEBIAN_FRONTEND="noninteractive"
-# http://stackoverflow.com/questions/48162574/ddg#49462622
-ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
-# https://github.com/NVIDIA/nvidia-docker/wiki/Installation-(Native-GPU-Support)
-ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
-
+FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION}-stretch-slim-arm32v7
 COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin
 RUN apt-get update \
- && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates gnupg curl && \
- curl -ks https://repo.jellyfin.org/debian/jellyfin_team.gpg.key | apt-key add - && \
- curl -ks https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
- echo 'deb [arch=armhf] https://repo.jellyfin.org/debian buster main' > /etc/apt/sources.list.d/jellyfin.list && \
- echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
- apt-get update && \
- apt-get install --no-install-recommends --no-install-suggests -y \
- jellyfin-ffmpeg \
- libssl-dev \
- libfontconfig1 \
- libfreetype6 \
- libomxil-bellagio0 \
- libomxil-bellagio-bin \
- libraspberrypi0 \
- vainfo \
- libva2 \
- locales \
- && apt-get remove curl gnupg -y \
- && apt-get clean autoclean -y \
- && apt-get autoremove -y \
+ && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \
  && rm -rf /var/lib/apt/lists/* \
  && mkdir -p /cache /config /media \
- && chmod 777 /cache /config /media \
- && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
-
+ && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 COPY --from=web-builder /dist /jellyfin/jellyfin-web
 
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-
 EXPOSE 8096
 VOLUME /cache /config /media
-ENTRYPOINT ["./jellyfin/jellyfin", \
-    "--datadir", "/config", \
-    "--cachedir", "/cache", \
-    "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"]
+ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
+    --datadir /config \
+    --cachedir /cache \
+    --ffmpeg /usr/bin/ffmpeg

Dockerfile.arm64

@@ -1,16 +1,15 @@
-# DESIGNED FOR BUILDING ON AMD64 ONLY
-#####################################
 # Requires binfm_misc registration
 # https://github.com/multiarch/qemu-user-static#binfmt_misc-register
-ARG DOTNET_VERSION=3.1
+ARG DOTNET_VERSION=3.0
 
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=master
-RUN apk add curl git zlib zlib-dev autoconf g++ make libpng-dev gifsicle alpine-sdk automake libtool make gcc musl-dev nasm python \
+ARG JELLYFIN_WEB_VERSION=v10.4.1
+RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
  && yarn install \
+ && yarn build \
  && mv dist /dist
 
 
@@ -18,49 +17,28 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder
 WORKDIR /repo
 COPY . .
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
+# TODO Remove or update the sed line when we update dotnet version.
+RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
 # Discard objs - may cause failures if exists
 RUN find . -type d -name obj | xargs -r rm -r
 # Build
 RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin" --self-contained --runtime linux-arm64 "-p:GenerateDocumentationFile=false;DebugSymbols=false;DebugType=none"
 
+
 FROM multiarch/qemu-user-static:x86_64-aarch64 as qemu
-FROM arm64v8/debian:buster-slim
-
-# https://askubuntu.com/questions/972516/debian-frontend-environment-variable
-ARG DEBIAN_FRONTEND="noninteractive"
-# http://stackoverflow.com/questions/48162574/ddg#49462622
-ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
-# https://github.com/NVIDIA/nvidia-docker/wiki/Installation-(Native-GPU-Support)
-ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
-
+FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION}-stretch-slim-arm64v8
 COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin
-RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
- ffmpeg \
- libssl-dev \
- ca-certificates \
- libfontconfig1 \
- libfreetype6 \
- libomxil-bellagio0 \
- libomxil-bellagio-bin \
- locales \
- && apt-get clean autoclean -y \
- && apt-get autoremove -y \
+RUN apt-get update \
+ && apt-get install --no-install-recommends --no-install-suggests -y ffmpeg \
  && rm -rf /var/lib/apt/lists/* \
  && mkdir -p /cache /config /media \
- && chmod 777 /cache /config /media \
- && sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen
-
+ && chmod 777 /cache /config /media
 COPY --from=builder /jellyfin /jellyfin
 COPY --from=web-builder /dist /jellyfin/jellyfin-web
 
-ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
-ENV LC_ALL en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-
 EXPOSE 8096
 VOLUME /cache /config /media
-ENTRYPOINT ["./jellyfin/jellyfin", \
-    "--datadir", "/config", \
-    "--cachedir", "/cache", \
-    "--ffmpeg", "/usr/bin/ffmpeg"]
+ENTRYPOINT dotnet /jellyfin/jellyfin.dll \
+    --datadir /config \
+    --cachedir /cache \
+    --ffmpeg /usr/bin/ffmpeg

DvdLib/BigEndianBinaryReader.cs

@@ -1,6 +1,4 @@
-#pragma warning disable CS1591
-
-using System.Buffers.Binary;
+using System;
 using System.IO;
 
 namespace DvdLib
@@ -14,12 +12,19 @@ namespace DvdLib
 
         public override ushort ReadUInt16()
         {
-            return BinaryPrimitives.ReadUInt16BigEndian(base.ReadBytes(2));
+            return BitConverter.ToUInt16(ReadAndReverseBytes(2), 0);
         }
 
         public override uint ReadUInt32()
         {
-            return BinaryPrimitives.ReadUInt32BigEndian(base.ReadBytes(4));
+            return BitConverter.ToUInt32(ReadAndReverseBytes(4), 0);
+        }
+
+        private byte[] ReadAndReverseBytes(int count)
+        {
+            byte[] val = base.ReadBytes(count);
+            Array.Reverse(val, 0, count);
+            return val;
         }
     }
 }

DvdLib/DvdLib.csproj

@@ -1,19 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
-  <PropertyGroup>
-    <ProjectGuid>{713F42B5-878E-499D-A878-E4C652B1D5E8}</ProjectGuid>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
+  </ItemGroup>
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
 </Project>

DvdLib/Ifo/Cell.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.IO;
 
 namespace DvdLib.Ifo
@@ -7,7 +5,6 @@ namespace DvdLib.Ifo
     public class Cell
     {
         public CellPlaybackInfo PlaybackInfo { get; private set; }
-
         public CellPositionInfo PositionInfo { get; private set; }
 
         internal void ParsePlayback(BinaryReader br)

DvdLib/Ifo/CellPlaybackInfo.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.IO;
 
 namespace DvdLib.Ifo

DvdLib/Ifo/CellPositionInfo.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.IO;
 
 namespace DvdLib.Ifo

DvdLib/Ifo/Chapter.cs

@@ -1,13 +1,9 @@
-#pragma warning disable CS1591
-
 namespace DvdLib.Ifo
 {
     public class Chapter
     {
         public ushort ProgramChainNumber { get; private set; }
-
         public ushort ProgramNumber { get; private set; }
-
         public uint ChapterNumber { get; private set; }
 
         public Chapter(ushort pgcNum, ushort programNum, uint chapterNum)

DvdLib/Ifo/Dvd.cs

@@ -1,9 +1,8 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using MediaBrowser.Model.IO;
 
 namespace DvdLib.Ifo
 {
@@ -14,10 +13,13 @@ namespace DvdLib.Ifo
 
         private ushort _titleCount;
         public readonly Dictionary<ushort, string> VTSPaths = new Dictionary<ushort, string>();
-        public Dvd(string path)
+        private readonly IFileSystem _fileSystem;
+
+        public Dvd(string path, IFileSystem fileSystem)
         {
+            _fileSystem = fileSystem;
             Titles = new List<Title>();
-            var allFiles = new DirectoryInfo(path).GetFiles(path, SearchOption.AllDirectories);
+            var allFiles = _fileSystem.GetFiles(path, true).ToList();
 
             var vmgPath = allFiles.FirstOrDefault(i => string.Equals(i.Name, "VIDEO_TS.IFO", StringComparison.OrdinalIgnoreCase)) ??
                 allFiles.FirstOrDefault(i => string.Equals(i.Name, "VIDEO_TS.BUP", StringComparison.OrdinalIgnoreCase));
@@ -31,7 +33,7 @@ namespace DvdLib.Ifo
                         continue;
                     }
 
-                    var nums = ifo.Name.Split(new[] { '_' }, StringSplitOptions.RemoveEmptyEntries);
+                    var nums = ifo.Name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries);
                     if (nums.Length >= 2 && ushort.TryParse(nums[1], out var ifoNumber))
                     {
                         ReadVTS(ifoNumber, ifo.FullName);
@@ -40,7 +42,7 @@ namespace DvdLib.Ifo
             }
             else
             {
-                using (var vmgFs = new FileStream(vmgPath.FullName, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using (var vmgFs = _fileSystem.GetFileStream(vmgPath.FullName, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
                 {
                     using (var vmgRead = new BigEndianBinaryReader(vmgFs))
                     {
@@ -74,7 +76,7 @@ namespace DvdLib.Ifo
             }
         }
 
-        private void ReadVTS(ushort vtsNum, IReadOnlyList<FileInfo> allFiles)
+        private void ReadVTS(ushort vtsNum, IEnumerable<FileSystemMetadata> allFiles)
         {
             var filename = string.Format("VTS_{0:00}_0.IFO", vtsNum);
 
@@ -93,7 +95,7 @@ namespace DvdLib.Ifo
         {
             VTSPaths[vtsNum] = vtsPath;
 
-            using (var vtsFs = new FileStream(vtsPath, FileMode.Open, FileAccess.Read, FileShare.Read))
+            using (var vtsFs = _fileSystem.GetFileStream(vtsPath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
             {
                 using (var vtsRead = new BigEndianBinaryReader(vtsFs))
                 {
@@ -117,19 +119,12 @@ namespace DvdLib.Ifo
                         uint chapNum = 1;
                         vtsFs.Seek(baseAddr + offsets[titleNum], SeekOrigin.Begin);
                         var t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum + 1));
-                        if (t == null)
-                        {
-                            continue;
-                        }
+                        if (t == null) continue;
 
                         do
                         {
                             t.Chapters.Add(new Chapter(vtsRead.ReadUInt16(), vtsRead.ReadUInt16(), chapNum));
-                            if (titleNum + 1 < numTitles && vtsFs.Position == (baseAddr + offsets[titleNum + 1]))
-                            {
-                                break;
-                            }
-
+                            if (titleNum + 1 < numTitles && vtsFs.Position == (baseAddr + offsets[titleNum + 1])) break;
                             chapNum++;
                         }
                         while (vtsFs.Position < (baseAddr + endaddr));
@@ -154,10 +149,7 @@ namespace DvdLib.Ifo
                         uint vtsPgcOffset = vtsRead.ReadUInt32();
 
                         var t = Titles.FirstOrDefault(vtst => vtst.IsVTSTitle(vtsNum, titleNum));
-                        if (t != null)
-                        {
-                            t.AddPgc(vtsRead, startByte + vtsPgcOffset, entryPgc, pgcNum);
-                        }
+                        if (t != null) t.AddPgc(vtsRead, startByte + vtsPgcOffset, entryPgc, pgcNum);
                     }
                 }
             }

DvdLib/Ifo/DvdTime.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 
 namespace DvdLib.Ifo
@@ -15,14 +13,8 @@ namespace DvdLib.Ifo
             Second = GetBCDValue(data[2]);
             Frames = GetBCDValue((byte)(data[3] & 0x3F));
 
-            if ((data[3] & 0x80) != 0)
-            {
-                FrameRate = 30;
-            }
-            else if ((data[3] & 0x40) != 0)
-            {
-                FrameRate = 25;
-            }
+            if ((data[3] & 0x80) != 0) FrameRate = 30;
+            else if ((data[3] & 0x40) != 0) FrameRate = 25;
         }
 
         private static byte GetBCDValue(byte data)

DvdLib/Ifo/Program.cs

@@ -1,12 +1,10 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 
 namespace DvdLib.Ifo
 {
     public class Program
     {
-        public IReadOnlyList<Cell> Cells { get; }
+        public readonly List<Cell> Cells;
 
         public Program(List<Cell> cells)
         {

DvdLib/Ifo/ProgramChain.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -22,9 +20,7 @@ namespace DvdLib.Ifo
         public readonly List<Cell> Cells;
 
         public DvdTime PlaybackTime { get; private set; }
-
         public UserOperation ProhibitedUserOperations { get; private set; }
-
         public byte[] AudioStreamControl { get; private set; } // 8*2 entries
         public byte[] SubpictureStreamControl { get; private set; } // 32*4 entries
 
@@ -35,11 +31,9 @@ namespace DvdLib.Ifo
         private ushort _goupProgramNumber;
 
         public ProgramPlaybackMode PlaybackMode { get; private set; }
-
         public uint ProgramCount { get; private set; }
 
         public byte StillTime { get; private set; }
-
         public byte[] Palette { get; private set; } // 16*4 entries
 
         private ushort _commandTableOffset;
@@ -75,15 +69,8 @@ namespace DvdLib.Ifo
 
             StillTime = br.ReadByte();
             byte pbMode = br.ReadByte();
-            if (pbMode == 0)
-            {
-                PlaybackMode = ProgramPlaybackMode.Sequential;
-            }
-            else
-            {
-                PlaybackMode = ((pbMode & 0x80) == 0) ? ProgramPlaybackMode.Random : ProgramPlaybackMode.Shuffle;
-            }
-
+            if (pbMode == 0) PlaybackMode = ProgramPlaybackMode.Sequential;
+            else PlaybackMode = ((pbMode & 0x80) == 0) ? ProgramPlaybackMode.Random : ProgramPlaybackMode.Shuffle;
             ProgramCount = (uint)(pbMode & 0x7F);
 
             Palette = br.ReadBytes(64);

DvdLib/Ifo/Title.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using System.IO;
 
@@ -8,11 +6,8 @@ namespace DvdLib.Ifo
     public class Title
     {
         public uint TitleNumber { get; private set; }
-
         public uint AngleCount { get; private set; }
-
         public ushort ChapterCount { get; private set; }
-
         public byte VideoTitleSetNumber { get; private set; }
 
         private ushort _parentalManagementMask;
@@ -20,7 +15,6 @@ namespace DvdLib.Ifo
         private uint _vtsStartSector; // relative to start of entire disk
 
         public ProgramChain EntryProgramChain { get; private set; }
-
         public readonly List<ProgramChain> ProgramChains;
 
         public readonly List<Chapter> Chapters;
@@ -59,10 +53,7 @@ namespace DvdLib.Ifo
             var pgc = new ProgramChain(pgcNum);
             pgc.ParseHeader(br);
             ProgramChains.Add(pgc);
-            if (entryPgc)
-            {
-                EntryProgramChain = pgc;
-            }
+            if (entryPgc) EntryProgramChain = pgc;
 
             br.BaseStream.Seek(curPos, SeekOrigin.Begin);
         }

DvdLib/Ifo/UserOperation.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 
 namespace DvdLib.Ifo

Emby.Dlna/Api/DlnaServerService.cs

@@ -1,13 +1,11 @@
-#pragma warning disable CS1591
-
 using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Emby.Dlna.Main;
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Services;
@@ -110,13 +108,12 @@ namespace Emby.Dlna.Api
 
     public class DlnaServerService : IService, IRequiresRequest
     {
+        private readonly IDlnaManager _dlnaManager;
+
         private const string XMLContentType = "text/xml; charset=UTF-8";
 
-        private readonly IDlnaManager _dlnaManager;
-        private readonly IHttpResultFactory _resultFactory;
-        private readonly IServerConfigurationManager _configurationManager;
-
         public IRequest Request { get; set; }
+        private IHttpResultFactory _resultFactory;
 
         private IContentDirectory ContentDirectory => DlnaEntryPoint.Current.ContentDirectory;
 
@@ -124,14 +121,10 @@ namespace Emby.Dlna.Api
 
         private IMediaReceiverRegistrar MediaReceiverRegistrar => DlnaEntryPoint.Current.MediaReceiverRegistrar;
 
-        public DlnaServerService(
-            IDlnaManager dlnaManager,
-            IHttpResultFactory httpResultFactory,
-            IServerConfigurationManager configurationManager)
+        public DlnaServerService(IDlnaManager dlnaManager, IHttpResultFactory httpResultFactory)
         {
             _dlnaManager = dlnaManager;
             _resultFactory = httpResultFactory;
-            _configurationManager = configurationManager;
         }
 
         private string GetHeader(string name)
@@ -152,7 +145,6 @@ namespace Emby.Dlna.Api
             return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, XMLContentType, () => Task.FromResult<Stream>(new MemoryStream(bytes)));
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Get(GetContentDirectory request)
         {
             var xml = ContentDirectory.GetServiceXml();
@@ -160,7 +152,6 @@ namespace Emby.Dlna.Api
             return _resultFactory.GetResult(Request, xml, XMLContentType);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Get(GetMediaReceiverRegistrar request)
         {
             var xml = MediaReceiverRegistrar.GetServiceXml();
@@ -168,7 +159,6 @@ namespace Emby.Dlna.Api
             return _resultFactory.GetResult(Request, xml, XMLContentType);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Get(GetConnnectionManager request)
         {
             var xml = ConnectionManager.GetServiceXml();
@@ -176,32 +166,32 @@ namespace Emby.Dlna.Api
             return _resultFactory.GetResult(Request, xml, XMLContentType);
         }
 
-        public async Task<object> Post(ProcessMediaReceiverRegistrarControlRequest request)
+        public object Post(ProcessMediaReceiverRegistrarControlRequest request)
         {
-            var response = await PostAsync(request.RequestStream, MediaReceiverRegistrar).ConfigureAwait(false);
+            var response = PostAsync(request.RequestStream, MediaReceiverRegistrar);
 
             return _resultFactory.GetResult(Request, response.Xml, XMLContentType);
         }
 
-        public async Task<object> Post(ProcessContentDirectoryControlRequest request)
+        public object Post(ProcessContentDirectoryControlRequest request)
         {
-            var response = await PostAsync(request.RequestStream, ContentDirectory).ConfigureAwait(false);
+            var response = PostAsync(request.RequestStream, ContentDirectory);
 
             return _resultFactory.GetResult(Request, response.Xml, XMLContentType);
         }
 
-        public async Task<object> Post(ProcessConnectionManagerControlRequest request)
+        public object Post(ProcessConnectionManagerControlRequest request)
         {
-            var response = await PostAsync(request.RequestStream, ConnectionManager).ConfigureAwait(false);
+            var response = PostAsync(request.RequestStream, ConnectionManager);
 
             return _resultFactory.GetResult(Request, response.Xml, XMLContentType);
         }
 
-        private Task<ControlResponse> PostAsync(Stream requestStream, IUpnpService service)
+        private ControlResponse PostAsync(Stream requestStream, IUpnpService service)
         {
-            var id = GetPathValue(2).ToString();
+            var id = GetPathValue(2);
 
-            return service.ProcessControlRequestAsync(new ControlRequest
+            return service.ProcessControlRequest(new ControlRequest
             {
                 Headers = Request.Headers,
                 InputXml = requestStream,
@@ -210,99 +200,38 @@ namespace Emby.Dlna.Api
             });
         }
 
-        // Copied from MediaBrowser.Api/BaseApiService.cs
-        // TODO: Remove code duplication
-        /// <summary>
-        /// Gets the path segment at the specified index.
-        /// </summary>
-        /// <param name="index">The index of the path segment.</param>
-        /// <returns>The path segment at the specified index.</returns>
-        /// <exception cref="IndexOutOfRangeException" >Path doesn't contain enough segments.</exception>
-        /// <exception cref="InvalidDataException" >Path doesn't start with the base url.</exception>
-        protected internal ReadOnlySpan<char> GetPathValue(int index)
+        protected string GetPathValue(int index)
         {
-            static void ThrowIndexOutOfRangeException()
-                => throw new IndexOutOfRangeException("Path doesn't contain enough segments.");
+            var pathInfo = Parse(Request.PathInfo);
+            var first = pathInfo[0];
 
-            static void ThrowInvalidDataException()
-                => throw new InvalidDataException("Path doesn't start with the base url.");
-
-            ReadOnlySpan<char> path = Request.PathInfo;
-
-            // Remove the protocol part from the url
-            int pos = path.LastIndexOf("://");
-            if (pos != -1)
+            // backwards compatibility
+            // TODO: Work out what this is doing.
+            if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) ||
+                string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase))
             {
-                path = path.Slice(pos + 3);
+                index++;
             }
 
-            // Remove the query string
-            pos = path.LastIndexOf('?');
-            if (pos != -1)
+            return pathInfo[index];
+        }
+
+        private List<string> Parse(string pathUri)
+        {
+            var actionParts = pathUri.Split(new[] { "://" }, StringSplitOptions.None);
+
+            var pathInfo = actionParts[actionParts.Length - 1];
+
+            var optionsPos = pathInfo.LastIndexOf('?');
+            if (optionsPos != -1)
             {
-                path = path.Slice(0, pos);
+                pathInfo = pathInfo.Substring(0, optionsPos);
             }
 
-            // Remove the domain
-            pos = path.IndexOf('/');
-            if (pos != -1)
-            {
-                path = path.Slice(pos);
-            }
+            var args = pathInfo.Split('/');
 
-            // Remove base url
-            string baseUrl = _configurationManager.Configuration.BaseUrl;
-            int baseUrlLen = baseUrl.Length;
-            if (baseUrlLen != 0)
-            {
-                if (path.StartsWith(baseUrl, StringComparison.OrdinalIgnoreCase))
-                {
-                    path = path.Slice(baseUrlLen);
-                }
-                else
-                {
-                    // The path doesn't start with the base url,
-                    // how did we get here?
-                    ThrowInvalidDataException();
-                }
-            }
-
-            // Remove leading /
-            path = path.Slice(1);
-
-            // Backwards compatibility
-            const string Emby = "emby/";
-            if (path.StartsWith(Emby, StringComparison.OrdinalIgnoreCase))
-            {
-                path = path.Slice(Emby.Length);
-            }
-
-            const string MediaBrowser = "mediabrowser/";
-            if (path.StartsWith(MediaBrowser, StringComparison.OrdinalIgnoreCase))
-            {
-                path = path.Slice(MediaBrowser.Length);
-            }
-
-            // Skip segments until we are at the right index
-            for (int i = 0; i < index; i++)
-            {
-                pos = path.IndexOf('/');
-                if (pos == -1)
-                {
-                    ThrowIndexOutOfRangeException();
-                }
-
-                path = path.Slice(pos + 1);
-            }
-
-            // Remove the rest
-            pos = path.IndexOf('/');
-            if (pos != -1)
-            {
-                path = path.Slice(0, pos);
-            }
-
-            return path;
+            return args.Skip(1).ToList();
         }
 
         public object Get(GetIcon request)
@@ -317,37 +246,31 @@ namespace Emby.Dlna.Api
             return _resultFactory.GetStaticResult(Request, cacheKey, null, cacheLength, contentType, () => Task.FromResult(_dlnaManager.GetIcon(request.Filename).Stream));
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Subscribe(ProcessContentDirectoryEventRequest request)
         {
             return ProcessEventRequest(ContentDirectory);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Subscribe(ProcessConnectionManagerEventRequest request)
         {
             return ProcessEventRequest(ConnectionManager);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Subscribe(ProcessMediaReceiverRegistrarEventRequest request)
         {
             return ProcessEventRequest(MediaReceiverRegistrar);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Unsubscribe(ProcessContentDirectoryEventRequest request)
         {
             return ProcessEventRequest(ContentDirectory);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Unsubscribe(ProcessConnectionManagerEventRequest request)
         {
             return ProcessEventRequest(ConnectionManager);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Unsubscribe(ProcessMediaReceiverRegistrarEventRequest request)
         {
             return ProcessEventRequest(MediaReceiverRegistrar);

Emby.Dlna/Api/DlnaService.cs

@@ -1,6 +1,3 @@
-#pragma warning disable CS1591
-
-using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Net;
@@ -53,7 +50,6 @@ namespace Emby.Dlna.Api
             _dlnaManager = dlnaManager;
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Get(GetProfileInfos request)
         {
             return _dlnaManager.GetProfileInfos().ToArray();
@@ -64,7 +60,6 @@ namespace Emby.Dlna.Api
             return _dlnaManager.GetProfile(request.Id);
         }
 
-        [SuppressMessage("Microsoft.Performance", "CA1801:ReviewUnusedParameters", MessageId = "request", Justification = "Required for ServiceStack")]
         public object Get(GetDefaultProfile request)
         {
             return _dlnaManager.GetDefaultProfile();

Emby.Dlna/Common/Argument.cs

@@ -1,4 +1,3 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna.Common
 {

Emby.Dlna/Common/DeviceIcon.cs

@@ -1,6 +1,3 @@
-#pragma warning disable CS1591
-
-using System.Globalization;
 
 namespace Emby.Dlna.Common
 {
@@ -16,14 +13,9 @@ namespace Emby.Dlna.Common
 
         public string Depth { get; set; }
 
-        /// <inheritdoc />
         public override string ToString()
         {
-            return string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}x{1}",
-                Height,
-                Width);
+            return string.Format("{0}x{1}", Height, Width);
         }
     }
 }

Emby.Dlna/Common/DeviceService.cs

@@ -1,4 +1,3 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna.Common
 {
@@ -14,8 +13,9 @@ namespace Emby.Dlna.Common
 
         public string EventSubUrl { get; set; }
 
-        /// <inheritdoc />
         public override string ToString()
-            => ServiceId;
+        {
+            return string.Format("{0}", ServiceId);
+        }
     }
 }

Emby.Dlna/Common/ServiceAction.cs

@@ -1,24 +1,21 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 
 namespace Emby.Dlna.Common
 {
     public class ServiceAction
     {
-        public ServiceAction()
-        {
-            ArgumentList = new List<Argument>();
-        }
-
         public string Name { get; set; }
 
         public List<Argument> ArgumentList { get; set; }
 
-        /// <inheritdoc />
         public override string ToString()
         {
             return Name;
         }
+
+        public ServiceAction()
+        {
+            ArgumentList = new List<Argument>();
+        }
     }
 }

Emby.Dlna/Common/StateVariable.cs

@@ -1,16 +1,9 @@
-#pragma warning disable CS1591
-
 using System;
 
 namespace Emby.Dlna.Common
 {
     public class StateVariable
     {
-        public StateVariable()
-        {
-            AllowedValues = Array.Empty<string>();
-        }
-
         public string Name { get; set; }
 
         public string DataType { get; set; }
@@ -19,8 +12,14 @@ namespace Emby.Dlna.Common
 
         public string[] AllowedValues { get; set; }
 
-        /// <inheritdoc />
         public override string ToString()
-            => Name;
+        {
+            return Name;
+        }
+
+        public StateVariable()
+        {
+            AllowedValues = Array.Empty<string>();
+        }
     }
 }

Emby.Dlna/Configuration/DlnaOptions.cs

@@ -1,9 +1,17 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna.Configuration
 {
     public class DlnaOptions
     {
+        public bool EnablePlayTo { get; set; }
+        public bool EnableServer { get; set; }
+        public bool EnableDebugLog { get; set; }
+        public bool BlastAliveMessages { get; set; }
+        public bool SendOnlyMatchedHost { get; set; }
+        public int ClientDiscoveryIntervalSeconds { get; set; }
+        public int BlastAliveMessageIntervalSeconds { get; set; }
+        public string DefaultUserId { get; set; }
+
         public DlnaOptions()
         {
             EnablePlayTo = true;
@@ -13,21 +21,5 @@ namespace Emby.Dlna.Configuration
             ClientDiscoveryIntervalSeconds = 60;
             BlastAliveMessageIntervalSeconds = 1800;
         }
-
-        public bool EnablePlayTo { get; set; }
-
-        public bool EnableServer { get; set; }
-
-        public bool EnableDebugLog { get; set; }
-
-        public bool BlastAliveMessages { get; set; }
-
-        public bool SendOnlyMatchedHost { get; set; }
-
-        public int ClientDiscoveryIntervalSeconds { get; set; }
-
-        public int BlastAliveMessageIntervalSeconds { get; set; }
-
-        public string DefaultUserId { get; set; }
     }
 }

Emby.Dlna/ConfigurationExtension.cs

@@ -1,6 +1,3 @@
-#nullable enable
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Configuration;
 using MediaBrowser.Common.Configuration;

Emby.Dlna/ConnectionManager/ConnectionManager.cs

@@ -1,6 +1,3 @@
-#pragma warning disable CS1591
-
-using System.Threading.Tasks;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
@@ -15,11 +12,7 @@ namespace Emby.Dlna.ConnectionManager
         private readonly ILogger _logger;
         private readonly IServerConfigurationManager _config;
 
-        public ConnectionManager(
-            IDlnaManager dlna,
-            IServerConfigurationManager config,
-            ILogger<ConnectionManager> logger,
-            IHttpClient httpClient)
+        public ConnectionManager(IDlnaManager dlna, IServerConfigurationManager config, ILogger logger, IHttpClient httpClient)
             : base(logger, httpClient)
         {
             _dlna = dlna;
@@ -27,19 +20,17 @@ namespace Emby.Dlna.ConnectionManager
             _logger = logger;
         }
 
-        /// <inheritdoc />
         public string GetServiceXml()
         {
             return new ConnectionManagerXmlBuilder().GetXml();
         }
 
-        /// <inheritdoc />
-        public Task<ControlResponse> ProcessControlRequestAsync(ControlRequest request)
+        public ControlResponse ProcessControlRequest(ControlRequest request)
         {
             var profile = _dlna.GetProfile(request.Headers) ??
                          _dlna.GetDefaultProfile();
 
-            return new ControlHandler(_config, _logger, profile).ProcessControlRequestAsync(request);
+            return new ControlHandler(_config, _logger, profile).ProcessControlRequest(request);
         }
     }
 }

Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 using Emby.Dlna.Service;

Emby.Dlna/ConnectionManager/ControlHandler.cs

@@ -1,8 +1,5 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
-using System.Xml;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
@@ -15,28 +12,29 @@ namespace Emby.Dlna.ConnectionManager
     {
         private readonly DeviceProfile _profile;
 
-        public ControlHandler(IServerConfigurationManager config, ILogger logger, DeviceProfile profile)
-            : base(config, logger)
-        {
-            _profile = profile;
-        }
-
-        /// <inheritdoc />
-        protected override void WriteResult(string methodName, IDictionary<string, string> methodParams, XmlWriter xmlWriter)
+        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
         {
             if (string.Equals(methodName, "GetProtocolInfo", StringComparison.OrdinalIgnoreCase))
             {
-                HandleGetProtocolInfo(xmlWriter);
-                return;
+                return HandleGetProtocolInfo();
             }
 
             throw new ResourceNotFoundException("Unexpected control request name: " + methodName);
         }
 
-        private void HandleGetProtocolInfo(XmlWriter xmlWriter)
+        private IEnumerable<KeyValuePair<string, string>> HandleGetProtocolInfo()
         {
-            xmlWriter.WriteElementString("Source", _profile.ProtocolInfo);
-            xmlWriter.WriteElementString("Sink", string.Empty);
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "Source", _profile.ProtocolInfo },
+                { "Sink", "" }
+            };
+        }
+
+        public ControlHandler(IServerConfigurationManager config, ILogger logger, DeviceProfile profile)
+            : base(config, logger)
+        {
+            _profile = profile;
         }
     }
 }

Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 

Emby.Dlna/ContentDirectory/ContentDirectory.cs

@@ -1,15 +1,11 @@
-#pragma warning disable CS1591
-
 using System;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Emby.Dlna.Service;
-using Jellyfin.Data.Entities;
-using Jellyfin.Data.Enums;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.TV;
@@ -33,14 +29,13 @@ namespace Emby.Dlna.ContentDirectory
         private readonly IMediaEncoder _mediaEncoder;
         private readonly ITVSeriesManager _tvSeriesManager;
 
-        public ContentDirectory(
-            IDlnaManager dlna,
+        public ContentDirectory(IDlnaManager dlna,
             IUserDataManager userDataManager,
             IImageProcessor imageProcessor,
             ILibraryManager libraryManager,
             IServerConfigurationManager config,
             IUserManager userManager,
-            ILogger<ContentDirectory> logger,
+            ILogger logger,
             IHttpClient httpClient,
             ILocalizationManager localization,
             IMediaSourceManager mediaSourceManager,
@@ -72,14 +67,12 @@ namespace Emby.Dlna.ContentDirectory
             }
         }
 
-        /// <inheritdoc />
         public string GetServiceXml()
         {
             return new ContentDirectoryXmlBuilder().GetXml();
         }
 
-        /// <inheritdoc />
-        public Task<ControlResponse> ProcessControlRequestAsync(ControlRequest request)
+        public ControlResponse ProcessControlRequest(ControlRequest request)
         {
             var profile = _dlna.GetProfile(request.Headers) ??
                           _dlna.GetDefaultProfile();
@@ -104,14 +97,14 @@ namespace Emby.Dlna.ContentDirectory
                 _userViewManager,
                 _mediaEncoder,
                 _tvSeriesManager)
-                .ProcessControlRequestAsync(request);
+                .ProcessControlRequest(request);
         }
 
         private User GetUser(DeviceProfile profile)
         {
             if (!string.IsNullOrEmpty(profile.UserId))
             {
-                var user = _userManager.GetUserById(Guid.Parse(profile.UserId));
+                var user = _userManager.GetUserById(profile.UserId);
 
                 if (user != null)
                 {
@@ -123,7 +116,7 @@ namespace Emby.Dlna.ContentDirectory
 
             if (!string.IsNullOrEmpty(userId))
             {
-                var user = _userManager.GetUserById(Guid.Parse(userId));
+                var user = _userManager.GetUserById(userId);
 
                 if (user != null)
                 {
@@ -133,13 +126,18 @@ namespace Emby.Dlna.ContentDirectory
 
             foreach (var user in _userManager.Users)
             {
-                if (user.HasPermission(PermissionKind.IsAdministrator))
+                if (user.Policy.IsAdministrator)
                 {
                     return user;
                 }
             }
 
-            return _userManager.Users.FirstOrDefault();
+            foreach (var user in _userManager.Users)
+            {
+                return user;
+            }
+
+            return null;
         }
     }
 }

Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 using Emby.Dlna.Service;

Emby.Dlna/ContentDirectory/ControlHandler.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -10,7 +8,6 @@ using System.Threading;
 using System.Xml;
 using Emby.Dlna.Didl;
 using Emby.Dlna.Service;
-using Jellyfin.Data.Entities;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
@@ -18,6 +15,7 @@ using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
@@ -28,12 +26,6 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Querying;
 using Microsoft.Extensions.Logging;
-using Book = MediaBrowser.Controller.Entities.Book;
-using Episode = MediaBrowser.Controller.Entities.TV.Episode;
-using Genre = MediaBrowser.Controller.Entities.Genre;
-using Movie = MediaBrowser.Controller.Entities.Movies.Movie;
-using MusicAlbum = MediaBrowser.Controller.Entities.Audio.MusicAlbum;
-using Series = MediaBrowser.Controller.Entities.TV.Series;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -52,6 +44,7 @@ namespace Emby.Dlna.ContentDirectory
         private const string NS_UPNP = "urn:schemas-upnp-org:metadata-1-0/upnp/";
 
         private readonly int _systemUpdateId;
+        private readonly CultureInfo _usCulture = new CultureInfo("en-US");
 
         private readonly DidlBuilder _didlBuilder;
 
@@ -65,8 +58,7 @@ namespace Emby.Dlna.ContentDirectory
             string accessToken,
             IImageProcessor imageProcessor,
             IUserDataManager userDataManager,
-            User user,
-            int systemUpdateId,
+            User user, int systemUpdateId,
             IServerConfigurationManager config,
             ILocalizationManager localization,
             IMediaSourceManager mediaSourceManager,
@@ -84,143 +76,117 @@ namespace Emby.Dlna.ContentDirectory
             _profile = profile;
             _config = config;
 
-            _didlBuilder = new DidlBuilder(
-                profile,
-                user,
-                imageProcessor,
-                serverAddress,
-                accessToken,
-                userDataManager,
-                localization,
-                mediaSourceManager,
-                Logger,
-                mediaEncoder,
-                libraryManager);
+            _didlBuilder = new DidlBuilder(profile, user, imageProcessor, serverAddress, accessToken, userDataManager, localization, mediaSourceManager, _logger, mediaEncoder);
         }
 
-        /// <inheritdoc />
-        protected override void WriteResult(string methodName, IDictionary<string, string> methodParams, XmlWriter xmlWriter)
+        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
         {
-            const string DeviceId = "test";
+            var deviceId = "test";
+
+            var user = _user;
 
             if (string.Equals(methodName, "GetSearchCapabilities", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleGetSearchCapabilities(xmlWriter);
-                return;
-            }
+                return HandleGetSearchCapabilities();
 
             if (string.Equals(methodName, "GetSortCapabilities", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleGetSortCapabilities(xmlWriter);
-                return;
-            }
+                return HandleGetSortCapabilities();
 
             if (string.Equals(methodName, "GetSortExtensionCapabilities", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleGetSortExtensionCapabilities(xmlWriter);
-                return;
-            }
+                return HandleGetSortExtensionCapabilities();
 
             if (string.Equals(methodName, "GetSystemUpdateID", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleGetSystemUpdateID(xmlWriter);
-                return;
-            }
+                return HandleGetSystemUpdateID();
 
             if (string.Equals(methodName, "Browse", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleBrowse(xmlWriter, methodParams, DeviceId);
-                return;
-            }
+                return HandleBrowse(methodParams, user, deviceId);
 
             if (string.Equals(methodName, "X_GetFeatureList", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleXGetFeatureList(xmlWriter);
-                return;
-            }
+                return HandleXGetFeatureList();
 
             if (string.Equals(methodName, "GetFeatureList", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleGetFeatureList(xmlWriter);
-                return;
-            }
+                return HandleGetFeatureList();
 
             if (string.Equals(methodName, "X_SetBookmark", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleXSetBookmark(methodParams);
-                return;
-            }
+                return HandleXSetBookmark(methodParams, user);
 
             if (string.Equals(methodName, "Search", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleSearch(xmlWriter, methodParams, DeviceId);
-                return;
-            }
+                return HandleSearch(methodParams, user, deviceId);
 
             if (string.Equals(methodName, "X_BrowseByLetter", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleXBrowseByLetter(xmlWriter, methodParams, DeviceId);
-                return;
-            }
+                return HandleX_BrowseByLetter(methodParams, user, deviceId);
 
             throw new ResourceNotFoundException("Unexpected control request name: " + methodName);
         }
 
-        private void HandleXSetBookmark(IDictionary<string, string> sparams)
+        private IEnumerable<KeyValuePair<string, string>> HandleXSetBookmark(IDictionary<string, string> sparams, User user)
         {
             var id = sparams["ObjectID"];
 
-            var serverItem = GetItemFromObjectId(id);
+            var serverItem = GetItemFromObjectId(id, user);
 
             var item = serverItem.Item;
 
-            var newbookmark = int.Parse(sparams["PosSecond"], CultureInfo.InvariantCulture);
+            var newbookmark = int.Parse(sparams["PosSecond"], _usCulture);
 
-            var userdata = _userDataManager.GetUserData(_user, item);
+            var userdata = _userDataManager.GetUserData(user, item);
 
             userdata.PlaybackPositionTicks = TimeSpan.FromSeconds(newbookmark).Ticks;
 
-            _userDataManager.SaveUserData(_user, item, userdata, UserDataSaveReason.TogglePlayed,
+            _userDataManager.SaveUserData(user, item, userdata, UserDataSaveReason.TogglePlayed,
                 CancellationToken.None);
+
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
-        private void HandleGetSearchCapabilities(XmlWriter xmlWriter)
+        private IEnumerable<KeyValuePair<string, string>> HandleGetSearchCapabilities()
         {
-            xmlWriter.WriteElementString(
-                "SearchCaps",
-                "res@resolution,res@size,res@duration,dc:title,dc:creator,upnp:actor,upnp:artist,upnp:genre,upnp:album,dc:date,upnp:class,@id,@refID,@protocolInfo,upnp:author,dc:description,pv:avKeywords");
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "SearchCaps", "res@resolution,res@size,res@duration,dc:title,dc:creator,upnp:actor,upnp:artist,upnp:genre,upnp:album,dc:date,upnp:class,@id,@refID,@protocolInfo,upnp:author,dc:description,pv:avKeywords" }
+            };
         }
 
-        private void HandleGetSortCapabilities(XmlWriter xmlWriter)
+        private IEnumerable<KeyValuePair<string, string>> HandleGetSortCapabilities()
         {
-            xmlWriter.WriteElementString(
-                "SortCaps",
-                "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating");
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "SortCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" }
+            };
         }
 
-        private void HandleGetSortExtensionCapabilities(XmlWriter xmlWriter)
+        private IEnumerable<KeyValuePair<string, string>> HandleGetSortExtensionCapabilities()
         {
-            xmlWriter.WriteElementString(
-                "SortExtensionCaps",
-                "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating");
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "SortExtensionCaps", "res@duration,res@size,res@bitrate,dc:date,dc:title,dc:size,upnp:album,upnp:artist,upnp:albumArtist,upnp:episodeNumber,upnp:genre,upnp:originalTrackNumber,upnp:rating" }
+            };
         }
 
-        private void HandleGetSystemUpdateID(XmlWriter xmlWriter)
+        private IEnumerable<KeyValuePair<string, string>> HandleGetSystemUpdateID()
         {
-            xmlWriter.WriteElementString("Id", _systemUpdateId.ToString(CultureInfo.InvariantCulture));
+            var headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            headers.Add("Id", _systemUpdateId.ToString(_usCulture));
+            return headers;
         }
 
-        private void HandleGetFeatureList(XmlWriter xmlWriter)
+        private IEnumerable<KeyValuePair<string, string>> HandleGetFeatureList()
         {
-            xmlWriter.WriteElementString("FeatureList", WriteFeatureListXml());
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "FeatureList", GetFeatureListXml() }
+            };
         }
 
-        private void HandleXGetFeatureList(XmlWriter xmlWriter)
-            => HandleGetFeatureList(xmlWriter);
-
-        private string WriteFeatureListXml()
+        private IEnumerable<KeyValuePair<string, string>> HandleXGetFeatureList()
+        {
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "FeatureList", GetFeatureListXml() }
+            };
+        }
+
+        private string GetFeatureListXml()
         {
-            // TODO: clean this up
             var builder = new StringBuilder();
 
             builder.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
@@ -247,7 +213,7 @@ namespace Emby.Dlna.ContentDirectory
             return defaultValue;
         }
 
-        private void HandleBrowse(XmlWriter xmlWriter, IDictionary<string, string> sparams, string deviceId)
+        private IEnumerable<KeyValuePair<string, string>> HandleBrowse(IDictionary<string, string> sparams, User user, string deviceId)
         {
             var id = sparams["ObjectID"];
             var flag = sparams["BrowseFlag"];
@@ -271,95 +237,101 @@ namespace Emby.Dlna.ContentDirectory
                 start = startVal;
             }
 
+            var settings = new XmlWriterSettings
+            {
+                Encoding = Encoding.UTF8,
+                CloseOutput = false,
+                OmitXmlDeclaration = true,
+                ConformanceLevel = ConformanceLevel.Fragment
+            };
+
+            StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8);
+
             int totalCount;
 
-            using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
+            var dlnaOptions = _config.GetDlnaConfiguration();
+
+            using (var writer = XmlWriter.Create(builder, settings))
             {
-                var settings = new XmlWriterSettings()
+                //writer.WriteStartDocument();
+
+                writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
+
+                writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
+                writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
+                writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
+                //didl.SetAttribute("xmlns:sec", NS_SEC);
+
+                DidlBuilder.WriteXmlRootAttributes(_profile, writer);
+
+                var serverItem = GetItemFromObjectId(id, user);
+                var item = serverItem.Item;
+
+                if (string.Equals(flag, "BrowseMetadata"))
                 {
-                    Encoding = Encoding.UTF8,
-                    CloseOutput = false,
-                    OmitXmlDeclaration = true,
-                    ConformanceLevel = ConformanceLevel.Fragment
-                };
+                    totalCount = 1;
 
-                using (var writer = XmlWriter.Create(builder, settings))
-                {
-                    writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
-
-                    writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
-                    writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
-                    writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
-
-                    DidlBuilder.WriteXmlRootAttributes(_profile, writer);
-
-                    var serverItem = GetItemFromObjectId(id);
-                    var item = serverItem.Item;
-
-
-                    if (string.Equals(flag, "BrowseMetadata", StringComparison.Ordinal))
+                    if (item.IsDisplayedAsFolder || serverItem.StubType.HasValue)
                     {
-                        totalCount = 1;
+                        var childrenResult = GetUserItems(item, serverItem.StubType, user, sortCriteria, start, requestedCount);
 
-                        if (item.IsDisplayedAsFolder || serverItem.StubType.HasValue)
-                        {
-                            var childrenResult = GetUserItems(item, serverItem.StubType, _user, sortCriteria, start, requestedCount);
-
-                            _didlBuilder.WriteFolderElement(writer, item, serverItem.StubType, null, childrenResult.TotalRecordCount, filter, id);
-                        }
-                        else
-                        {
-                            var dlnaOptions = _config.GetDlnaConfiguration();
-                            _didlBuilder.WriteItemElement(writer, item, _user, null, null, deviceId, filter);
-                        }
-
-                        provided++;
+                        _didlBuilder.WriteFolderElement(writer, item, serverItem.StubType, null, childrenResult.TotalRecordCount, filter, id);
                     }
                     else
                     {
-                        var childrenResult = GetUserItems(item, serverItem.StubType, _user, sortCriteria, start, requestedCount);
-                        totalCount = childrenResult.TotalRecordCount;
-
-                        provided = childrenResult.Items.Count;
-
-                        var dlnaOptions = _config.GetDlnaConfiguration();
-                        foreach (var i in childrenResult.Items)
-                        {
-                            var childItem = i.Item;
-                            var displayStubType = i.StubType;
-
-                            if (childItem.IsDisplayedAsFolder || displayStubType.HasValue)
-                            {
-                                var childCount = GetUserItems(childItem, displayStubType, _user, sortCriteria, null, 0)
-                                    .TotalRecordCount;
-
-                                _didlBuilder.WriteFolderElement(writer, childItem, displayStubType, item, childCount, filter);
-                            }
-                            else
-                            {
-                                _didlBuilder.WriteItemElement(writer, childItem, _user, item, serverItem.StubType, deviceId, filter);
-                            }
-                        }
+                        _didlBuilder.WriteItemElement(dlnaOptions, writer, item, user, null, null, deviceId, filter);
                     }
 
-                    writer.WriteFullEndElement();
+                    provided++;
+                }
+                else
+                {
+                    var childrenResult = GetUserItems(item, serverItem.StubType, user, sortCriteria, start, requestedCount);
+                    totalCount = childrenResult.TotalRecordCount;
+
+                    provided = childrenResult.Items.Count;
+
+                    foreach (var i in childrenResult.Items)
+                    {
+                        var childItem = i.Item;
+                        var displayStubType = i.StubType;
+
+                        if (childItem.IsDisplayedAsFolder || displayStubType.HasValue)
+                        {
+                            var childCount = (GetUserItems(childItem, displayStubType, user, sortCriteria, null, 0))
+                                .TotalRecordCount;
+
+                            _didlBuilder.WriteFolderElement(writer, childItem, displayStubType, item, childCount, filter);
+                        }
+                        else
+                        {
+                            _didlBuilder.WriteItemElement(dlnaOptions, writer, childItem, user, item, serverItem.StubType, deviceId, filter);
+                        }
+                    }
                 }
 
-                xmlWriter.WriteElementString("Result", builder.ToString());
+                writer.WriteFullEndElement();
+                //writer.WriteEndDocument();
             }
 
-            xmlWriter.WriteElementString("NumberReturned", provided.ToString(CultureInfo.InvariantCulture));
-            xmlWriter.WriteElementString("TotalMatches", totalCount.ToString(CultureInfo.InvariantCulture));
-            xmlWriter.WriteElementString("UpdateID", _systemUpdateId.ToString(CultureInfo.InvariantCulture));
+            var resXML = builder.ToString();
+
+            return new[]
+                {
+                    new KeyValuePair<string,string>("Result", resXML),
+                    new KeyValuePair<string,string>("NumberReturned", provided.ToString(_usCulture)),
+                    new KeyValuePair<string,string>("TotalMatches", totalCount.ToString(_usCulture)),
+                    new KeyValuePair<string,string>("UpdateID", _systemUpdateId.ToString(_usCulture))
+                };
         }
 
-        private void HandleXBrowseByLetter(XmlWriter xmlWriter, IDictionary<string, string> sparams, string deviceId)
+        private IEnumerable<KeyValuePair<string, string>> HandleX_BrowseByLetter(IDictionary<string, string> sparams, User user, string deviceId)
         {
             // TODO: Implement this method
-            HandleSearch(xmlWriter, sparams, deviceId);
+            return HandleSearch(sparams, user, deviceId);
         }
 
-        private void HandleSearch(XmlWriter xmlWriter, IDictionary<string, string> sparams, string deviceId)
+        private IEnumerable<KeyValuePair<string, string>> HandleSearch(IDictionary<string, string> sparams, User user, string deviceId)
         {
             var searchCriteria = new SearchCriteria(GetValueOrDefault(sparams, "SearchCriteria", ""));
             var sortCriteria = new SortCriteria(GetValueOrDefault(sparams, "SortCriteria", ""));
@@ -382,96 +354,109 @@ namespace Emby.Dlna.ContentDirectory
                 start = startVal;
             }
 
-            QueryResult<BaseItem> childrenResult;
-
-            using (StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8))
+            var settings = new XmlWriterSettings
             {
-                var settings = new XmlWriterSettings()
+                Encoding = Encoding.UTF8,
+                CloseOutput = false,
+                OmitXmlDeclaration = true,
+                ConformanceLevel = ConformanceLevel.Fragment
+            };
+
+            StringWriter builder = new StringWriterWithEncoding(Encoding.UTF8);
+            int totalCount = 0;
+            int provided = 0;
+
+            using (var writer = XmlWriter.Create(builder, settings))
+            {
+                //writer.WriteStartDocument();
+
+                writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
+
+                writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
+                writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
+                writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
+                //didl.SetAttribute("xmlns:sec", NS_SEC);
+
+                DidlBuilder.WriteXmlRootAttributes(_profile, writer);
+
+                var serverItem = GetItemFromObjectId(sparams["ContainerID"], user);
+
+                var item = serverItem.Item;
+
+                var childrenResult = (GetChildrenSorted(item, user, searchCriteria, sortCriteria, start, requestedCount));
+
+                totalCount = childrenResult.TotalRecordCount;
+
+                provided = childrenResult.Items.Count;
+
+                var dlnaOptions = _config.GetDlnaConfiguration();
+
+                foreach (var i in childrenResult.Items)
                 {
-                    Encoding = Encoding.UTF8,
-                    CloseOutput = false,
-                    OmitXmlDeclaration = true,
-                    ConformanceLevel = ConformanceLevel.Fragment
-                };
-
-                using (var writer = XmlWriter.Create(builder, settings))
-                {
-                    writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
-
-                    writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
-                    writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
-                    writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
-
-                    DidlBuilder.WriteXmlRootAttributes(_profile, writer);
-
-                    var serverItem = GetItemFromObjectId(sparams["ContainerID"]);
-
-                    var item = serverItem.Item;
-
-                    childrenResult = GetChildrenSorted(item, _user, searchCriteria, sortCriteria, start, requestedCount);
-
-                    var dlnaOptions = _config.GetDlnaConfiguration();
-
-                    foreach (var i in childrenResult.Items)
+                    if (i.IsDisplayedAsFolder)
                     {
-                        if (i.IsDisplayedAsFolder)
-                        {
-                            var childCount = GetChildrenSorted(i, _user, searchCriteria, sortCriteria, null, 0)
-                                .TotalRecordCount;
+                        var childCount = (GetChildrenSorted(i, user, searchCriteria, sortCriteria, null, 0))
+                            .TotalRecordCount;
 
-                            _didlBuilder.WriteFolderElement(writer, i, null, item, childCount, filter);
-                        }
-                        else
-                        {
-                            _didlBuilder.WriteItemElement(writer, i, _user, item, serverItem.StubType, deviceId, filter);
-                        }
+                        _didlBuilder.WriteFolderElement(writer, i, null, item, childCount, filter);
+                    }
+                    else
+                    {
+                        _didlBuilder.WriteItemElement(dlnaOptions, writer, i, user, item, serverItem.StubType, deviceId, filter);
                     }
-
-                    writer.WriteFullEndElement();
                 }
 
-                xmlWriter.WriteElementString("Result", builder.ToString());
+                writer.WriteFullEndElement();
+                //writer.WriteEndDocument();
             }
 
-            xmlWriter.WriteElementString("NumberReturned", childrenResult.Items.Count.ToString(CultureInfo.InvariantCulture));
-            xmlWriter.WriteElementString("TotalMatches", childrenResult.TotalRecordCount.ToString(CultureInfo.InvariantCulture));
-            xmlWriter.WriteElementString("UpdateID", _systemUpdateId.ToString(CultureInfo.InvariantCulture));
+            var resXML = builder.ToString();
+
+            return new List<KeyValuePair<string, string>>
+                {
+                    new KeyValuePair<string,string>("Result", resXML),
+                    new KeyValuePair<string,string>("NumberReturned", provided.ToString(_usCulture)),
+                    new KeyValuePair<string,string>("TotalMatches", totalCount.ToString(_usCulture)),
+                    new KeyValuePair<string,string>("UpdateID", _systemUpdateId.ToString(_usCulture))
+                };
         }
 
         private QueryResult<BaseItem> GetChildrenSorted(BaseItem item, User user, SearchCriteria search, SortCriteria sort, int? startIndex, int? limit)
         {
             var folder = (Folder)item;
 
-            var sortOrders = folder.IsPreSorted
-                ? Array.Empty<(string, SortOrder)>()
-                : new[] { (ItemSortBy.SortName, sort.SortOrder) };
+            var sortOrders = new List<string>();
+            if (!folder.IsPreSorted)
+            {
+                sortOrders.Add(ItemSortBy.SortName);
+            }
 
-            string[] mediaTypes = Array.Empty<string>();
+            var mediaTypes = new List<string>();
             bool? isFolder = null;
 
             if (search.SearchType == SearchType.Audio)
             {
-                mediaTypes = new[] { MediaType.Audio };
+                mediaTypes.Add(MediaType.Audio);
                 isFolder = false;
             }
             else if (search.SearchType == SearchType.Video)
             {
-                mediaTypes = new[] { MediaType.Video };
+                mediaTypes.Add(MediaType.Video);
                 isFolder = false;
             }
             else if (search.SearchType == SearchType.Image)
             {
-                mediaTypes = new[] { MediaType.Photo };
+                mediaTypes.Add(MediaType.Photo);
                 isFolder = false;
             }
             else if (search.SearchType == SearchType.Playlist)
             {
-                // items = items.OfType<Playlist>();
+                //items = items.OfType<Playlist>();
                 isFolder = true;
             }
             else if (search.SearchType == SearchType.MusicAlbum)
             {
-                // items = items.OfType<MusicAlbum>();
+                //items = items.OfType<MusicAlbum>();
                 isFolder = true;
             }
 
@@ -479,13 +464,13 @@ namespace Emby.Dlna.ContentDirectory
             {
                 Limit = limit,
                 StartIndex = startIndex,
-                OrderBy = sortOrders,
+                OrderBy = sortOrders.Select(i => new ValueTuple<string, SortOrder>(i, sort.SortOrder)).ToArray(),
                 User = user,
                 Recursive = true,
                 IsMissing = false,
                 ExcludeItemTypes = new[] { typeof(Book).Name },
                 IsFolder = isFolder,
-                MediaTypes = mediaTypes,
+                MediaTypes = mediaTypes.ToArray(),
                 DtoOptions = GetDtoOptions()
             });
         }
@@ -529,11 +514,11 @@ namespace Emby.Dlna.ContentDirectory
                 }
                 else if (string.Equals(CollectionType.Folders, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetFolders(user, startIndex, limit);
+                    return GetFolders(item, user, stubType, sort, startIndex, limit);
                 }
                 else if (string.Equals(CollectionType.LiveTv, collectionFolder.CollectionType, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetLiveTvChannels(user, sort, startIndex, limit);
+                    return GetLiveTvChannels(item, user, stubType, sort, startIndex, limit);
                 }
             }
 
@@ -564,7 +549,7 @@ namespace Emby.Dlna.ContentDirectory
             return ToResult(queryResult);
         }
 
-        private QueryResult<ServerItem> GetLiveTvChannels(User user, SortCriteria sort, int? startIndex, int? limit)
+        private QueryResult<ServerItem> GetLiveTvChannels(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
         {
             var query = new InternalItemsQuery(user)
             {
@@ -596,7 +581,7 @@ namespace Emby.Dlna.ContentDirectory
 
             if (stubType.HasValue && stubType.Value == StubType.Playlists)
             {
-                return GetMusicPlaylists(user, query);
+                return GetMusicPlaylists(item, user, query);
             }
 
             if (stubType.HasValue && stubType.Value == StubType.Albums)
@@ -724,7 +709,7 @@ namespace Emby.Dlna.ContentDirectory
 
             if (stubType.HasValue && stubType.Value == StubType.Collections)
             {
-                return GetMovieCollections(user, query);
+                return GetMovieCollections(item, user, query);
             }
 
             if (stubType.HasValue && stubType.Value == StubType.Favorites)
@@ -737,42 +722,46 @@ namespace Emby.Dlna.ContentDirectory
                 return GetGenres(item, user, query);
             }
 
-            var array = new[]
+            var list = new List<ServerItem>();
+
+            list.Add(new ServerItem(item)
             {
-                new ServerItem(item)
-                {
-                    StubType = StubType.ContinueWatching
-                },
-                new ServerItem(item)
-                {
-                    StubType = StubType.Latest
-                },
-                new ServerItem(item)
-                {
-                    StubType = StubType.Movies
-                },
-                new ServerItem(item)
-                {
-                    StubType = StubType.Collections
-                },
-                new ServerItem(item)
-                {
-                    StubType = StubType.Favorites
-                },
-                new ServerItem(item)
-                {
-                    StubType = StubType.Genres
-                }
-            };
+                StubType = StubType.ContinueWatching
+            });
+
+            list.Add(new ServerItem(item)
+            {
+                StubType = StubType.Latest
+            });
+
+            list.Add(new ServerItem(item)
+            {
+                StubType = StubType.Movies
+            });
+
+            list.Add(new ServerItem(item)
+            {
+                StubType = StubType.Collections
+            });
+
+            list.Add(new ServerItem(item)
+            {
+                StubType = StubType.Favorites
+            });
+
+            list.Add(new ServerItem(item)
+            {
+                StubType = StubType.Genres
+            });
 
             return new QueryResult<ServerItem>
             {
-                Items = array,
-                TotalRecordCount = array.Length
+                Items = list,
+                TotalRecordCount = list.Count
             };
         }
 
-        private QueryResult<ServerItem> GetFolders(User user, int? startIndex, int? limit)
+        private QueryResult<ServerItem> GetFolders(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
         {
             var folders = _libraryManager.GetUserRootFolder().GetChildren(user, true)
                 .OrderBy(i => i.SortName)
@@ -782,11 +771,11 @@ namespace Emby.Dlna.ContentDirectory
                 })
                 .ToArray();
 
-            return ApplyPaging(new QueryResult<ServerItem>
+            return new QueryResult<ServerItem>
             {
                 Items = folders,
                 TotalRecordCount = folders.Length
-            }, startIndex, limit);
+            };
         }
 
         private QueryResult<ServerItem> GetTvFolders(BaseItem item, User user, StubType? stubType, SortCriteria sort, int? startIndex, int? limit)
@@ -805,7 +794,7 @@ namespace Emby.Dlna.ContentDirectory
 
             if (stubType.HasValue && stubType.Value == StubType.NextUp)
             {
-                return GetNextUp(item, query);
+                return GetNextUp(item, user, query);
             }
 
             if (stubType.HasValue && stubType.Value == StubType.Latest)
@@ -883,10 +872,10 @@ namespace Emby.Dlna.ContentDirectory
             query.Parent = parent;
             query.SetUser(user);
 
-            query.OrderBy = new[]
+            query.OrderBy = new ValueTuple<string, SortOrder>[]
             {
-                (ItemSortBy.DatePlayed, SortOrder.Descending),
-                (ItemSortBy.SortName, SortOrder.Ascending)
+                new ValueTuple<string, SortOrder> (ItemSortBy.DatePlayed, SortOrder.Descending),
+                new ValueTuple<string, SortOrder> (ItemSortBy.SortName, SortOrder.Ascending)
             };
 
             query.IsResumable = true;
@@ -923,10 +912,10 @@ namespace Emby.Dlna.ContentDirectory
             return ToResult(result);
         }
 
-        private QueryResult<ServerItem> GetMovieCollections(User user, InternalItemsQuery query)
+        private QueryResult<ServerItem> GetMovieCollections(BaseItem parent, User user, InternalItemsQuery query)
         {
             query.Recursive = true;
-            // query.Parent = parent;
+            //query.Parent = parent;
             query.SetUser(user);
 
             query.IncludeItemTypes = new[] { typeof(BoxSet).Name };
@@ -1118,10 +1107,10 @@ namespace Emby.Dlna.ContentDirectory
             return ToResult(result);
         }
 
-        private QueryResult<ServerItem> GetMusicPlaylists(User user, InternalItemsQuery query)
+        private QueryResult<ServerItem> GetMusicPlaylists(BaseItem parent, User user, InternalItemsQuery query)
         {
             query.Parent = null;
-            query.IncludeItemTypes = new[] { nameof(Playlist) };
+            query.IncludeItemTypes = new[] { typeof(Playlist).Name };
             query.SetUser(user);
             query.Recursive = true;
 
@@ -1132,29 +1121,31 @@ namespace Emby.Dlna.ContentDirectory
 
         private QueryResult<ServerItem> GetMusicLatest(BaseItem parent, User user, InternalItemsQuery query)
         {
-            query.OrderBy = Array.Empty<(string, SortOrder)>();
+            query.OrderBy = new ValueTuple<string, SortOrder>[] { };
 
             var items = _userViewManager.GetLatestItems(new LatestItemsQuery
             {
                 UserId = user.Id,
                 Limit = 50,
-                IncludeItemTypes = new[] { nameof(Audio) },
-                ParentId = parent?.Id ?? Guid.Empty,
+                IncludeItemTypes = new[] { typeof(Audio).Name },
+                ParentId = parent == null ? Guid.Empty : parent.Id,
                 GroupItems = true
+
             }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
 
             return ToResult(items);
         }
 
-        private QueryResult<ServerItem> GetNextUp(BaseItem parent, InternalItemsQuery query)
+        private QueryResult<ServerItem> GetNextUp(BaseItem parent, User user, InternalItemsQuery query)
         {
-            query.OrderBy = Array.Empty<(string, SortOrder)>();
+            query.OrderBy = new ValueTuple<string, SortOrder>[] { };
 
             var result = _tvSeriesManager.GetNextUp(new NextUpQuery
             {
                 Limit = query.Limit,
                 StartIndex = query.StartIndex,
                 UserId = query.User.Id
+
             }, new[] { parent }, query.DtoOptions);
 
             return ToResult(result);
@@ -1162,7 +1153,7 @@ namespace Emby.Dlna.ContentDirectory
 
         private QueryResult<ServerItem> GetTvLatest(BaseItem parent, User user, InternalItemsQuery query)
         {
-            query.OrderBy = Array.Empty<(string, SortOrder)>();
+            query.OrderBy = new ValueTuple<string, SortOrder>[] { };
 
             var items = _userViewManager.GetLatestItems(new LatestItemsQuery
             {
@@ -1171,6 +1162,7 @@ namespace Emby.Dlna.ContentDirectory
                 IncludeItemTypes = new[] { typeof(Episode).Name },
                 ParentId = parent == null ? Guid.Empty : parent.Id,
                 GroupItems = false
+
             }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
 
             return ToResult(items);
@@ -1178,16 +1170,16 @@ namespace Emby.Dlna.ContentDirectory
 
         private QueryResult<ServerItem> GetMovieLatest(BaseItem parent, User user, InternalItemsQuery query)
         {
-            query.OrderBy = Array.Empty<(string, SortOrder)>();
+            query.OrderBy = new ValueTuple<string, SortOrder>[] { };
 
-            var items = _userViewManager.GetLatestItems(
-                new LatestItemsQuery
+            var items = _userViewManager.GetLatestItems(new LatestItemsQuery
             {
                 UserId = user.Id,
                 Limit = 50,
-                IncludeItemTypes = new[] { nameof(Movie) },
-                ParentId = parent?.Id ?? Guid.Empty,
+                IncludeItemTypes = new[] { typeof(Movie).Name },
+                ParentId = parent == null ? Guid.Empty : parent.Id,
                 GroupItems = true
+
             }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
 
             return ToResult(items);
@@ -1220,11 +1212,7 @@ namespace Emby.Dlna.ContentDirectory
                 Recursive = true,
                 ParentId = parentId,
                 GenreIds = new[] { item.Id },
-                IncludeItemTypes = new[]
-                {
-                    nameof(Movie),
-                    nameof(Series)
-                },
+                IncludeItemTypes = new[] { typeof(Movie).Name, typeof(Series).Name },
                 Limit = limit,
                 StartIndex = startIndex,
                 DtoOptions = GetDtoOptions()
@@ -1286,14 +1274,13 @@ namespace Emby.Dlna.ContentDirectory
 
         private void SetSorting(InternalItemsQuery query, SortCriteria sort, bool isPreSorted)
         {
-            if (isPreSorted)
+            var sortOrders = new List<string>();
+            if (!isPreSorted)
             {
-                query.OrderBy = Array.Empty<(string, SortOrder)>();
-            }
-            else
-            {
-                query.OrderBy = new[] { (ItemSortBy.SortName, sort.SortOrder) };
+                sortOrders.Add(ItemSortBy.SortName);
             }
+
+            query.OrderBy = sortOrders.Select(i => new ValueTuple<string, SortOrder>(i, sort.SortOrder)).ToArray();
         }
 
         private QueryResult<ServerItem> ApplyPaging(QueryResult<ServerItem> result, int? startIndex, int? limit)
@@ -1303,24 +1290,24 @@ namespace Emby.Dlna.ContentDirectory
             return result;
         }
 
-        private ServerItem GetItemFromObjectId(string id)
+        private ServerItem GetItemFromObjectId(string id, User user)
         {
             return DidlBuilder.IsIdRoot(id)
 
                  ? new ServerItem(_libraryManager.GetUserRootFolder())
-                 : ParseItemId(id);
+                 : ParseItemId(id, user);
         }
 
-        private ServerItem ParseItemId(string id)
+        private ServerItem ParseItemId(string id, User user)
         {
             StubType? stubType = null;
 
             // After using PlayTo, MediaMonkey sends a request to the server trying to get item info
-            const string ParamsSrch = "Params=";
-            var paramsIndex = id.IndexOf(ParamsSrch, StringComparison.OrdinalIgnoreCase);
+            const string paramsSrch = "Params=";
+            var paramsIndex = id.IndexOf(paramsSrch, StringComparison.OrdinalIgnoreCase);
             if (paramsIndex != -1)
             {
-                id = id.Substring(paramsIndex + ParamsSrch.Length);
+                id = id.Substring(paramsIndex + paramsSrch.Length);
 
                 var parts = id.Split(';');
                 id = parts[23];
@@ -1348,7 +1335,7 @@ namespace Emby.Dlna.ContentDirectory
                 };
             }
 
-            Logger.LogError("Error parsing item Id: {id}. Returning user root folder.", id);
+            _logger.LogError("Error parsing item Id: {id}. Returning user root folder.", id);
 
             return new ServerItem(_libraryManager.GetUserRootFolder());
         }
@@ -1357,7 +1344,6 @@ namespace Emby.Dlna.ContentDirectory
     internal class ServerItem
     {
         public BaseItem Item { get; set; }
-
         public StubType? StubType { get; set; }
 
         public ServerItem(BaseItem item)

Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 

Emby.Dlna/ControlRequest.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.IO;
 using Microsoft.AspNetCore.Http;
 

Emby.Dlna/ControlResponse.cs

@@ -1,20 +1,18 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
     public class ControlResponse
     {
-        public ControlResponse()
-        {
-            Headers = new Dictionary<string, string>();
-        }
-
         public IDictionary<string, string> Headers { get; set; }
 
         public string Xml { get; set; }
 
         public bool IsSuccessful { get; set; }
+
+        public ControlResponse()
+        {
+            Headers = new Dictionary<string, string>();
+        }
     }
 }

Emby.Dlna/Didl/DidlBuilder.cs

@@ -1,34 +1,27 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
+using Emby.Dlna.Configuration;
 using Emby.Dlna.ContentDirectory;
-using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Net;
 using Microsoft.Extensions.Logging;
-using Episode = MediaBrowser.Controller.Entities.TV.Episode;
-using Genre = MediaBrowser.Controller.Entities.Genre;
-using Movie = MediaBrowser.Controller.Entities.Movies.Movie;
-using MusicAlbum = MediaBrowser.Controller.Entities.Audio.MusicAlbum;
-using Season = MediaBrowser.Controller.Entities.TV.Season;
-using Series = MediaBrowser.Controller.Entities.TV.Series;
-using XmlAttribute = MediaBrowser.Model.Dlna.XmlAttribute;
 
 namespace Emby.Dlna.Didl
 {
@@ -51,7 +44,6 @@ namespace Emby.Dlna.Didl
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly ILogger _logger;
         private readonly IMediaEncoder _mediaEncoder;
-        private readonly ILibraryManager _libraryManager;
 
         public DidlBuilder(
             DeviceProfile profile,
@@ -63,8 +55,7 @@ namespace Emby.Dlna.Didl
             ILocalizationManager localization,
             IMediaSourceManager mediaSourceManager,
             ILogger logger,
-            IMediaEncoder mediaEncoder,
-            ILibraryManager libraryManager)
+            IMediaEncoder mediaEncoder)
         {
             _profile = profile;
             _user = user;
@@ -76,7 +67,6 @@ namespace Emby.Dlna.Didl
             _mediaSourceManager = mediaSourceManager;
             _logger = logger;
             _mediaEncoder = mediaEncoder;
-            _libraryManager = libraryManager;
         }
 
         public static string NormalizeDlnaMediaUrl(string url)
@@ -84,7 +74,7 @@ namespace Emby.Dlna.Didl
             return url + "&dlnaheaders=true";
         }
 
-        public string GetItemDidl(BaseItem item, User user, BaseItem context, string deviceId, Filter filter, StreamInfo streamInfo)
+        public string GetItemDidl(DlnaOptions options, BaseItem item, User user, BaseItem context, string deviceId, Filter filter, StreamInfo streamInfo)
         {
             var settings = new XmlWriterSettings
             {
@@ -98,21 +88,21 @@ namespace Emby.Dlna.Didl
             {
                 using (var writer = XmlWriter.Create(builder, settings))
                 {
-                    // writer.WriteStartDocument();
+                    //writer.WriteStartDocument();
 
                     writer.WriteStartElement(string.Empty, "DIDL-Lite", NS_DIDL);
 
                     writer.WriteAttributeString("xmlns", "dc", null, NS_DC);
                     writer.WriteAttributeString("xmlns", "dlna", null, NS_DLNA);
                     writer.WriteAttributeString("xmlns", "upnp", null, NS_UPNP);
-                    // didl.SetAttribute("xmlns:sec", NS_SEC);
+                    //didl.SetAttribute("xmlns:sec", NS_SEC);
 
                     WriteXmlRootAttributes(_profile, writer);
 
-                    WriteItemElement(writer, item, user, context, null, deviceId, filter, streamInfo);
+                    WriteItemElement(options, writer, item, user, context, null, deviceId, filter, streamInfo);
 
                     writer.WriteFullEndElement();
-                    // writer.WriteEndDocument();
+                    //writer.WriteEndDocument();
                 }
 
                 return builder.ToString();
@@ -136,6 +126,7 @@ namespace Emby.Dlna.Didl
         }
 
         public void WriteItemElement(
+            DlnaOptions options,
             XmlWriter writer,
             BaseItem item,
             User user,
@@ -172,23 +163,25 @@ namespace Emby.Dlna.Didl
             // refID?
             // storeAttribute(itemNode, object, ClassProperties.REF_ID, false);
 
-            if (item is IHasMediaSources)
+            var hasMediaSources = item as IHasMediaSources;
+
+            if (hasMediaSources != null)
             {
                 if (string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase))
                 {
-                    AddAudioResource(writer, item, deviceId, filter, streamInfo);
+                    AddAudioResource(options, writer, item, deviceId, filter, streamInfo);
                 }
                 else if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
                 {
-                    AddVideoResource(writer, item, deviceId, filter, streamInfo);
+                    AddVideoResource(options, writer, item, deviceId, filter, streamInfo);
                 }
             }
 
-            AddCover(item, null, writer);
+            AddCover(item, context, null, writer);
             writer.WriteFullEndElement();
         }
 
-        private void AddVideoResource(XmlWriter writer, BaseItem video, string deviceId, Filter filter, StreamInfo streamInfo = null)
+        private void AddVideoResource(DlnaOptions options, XmlWriter writer, BaseItem video, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             if (streamInfo == null)
             {
@@ -232,7 +225,7 @@ namespace Emby.Dlna.Didl
 
             foreach (var contentFeature in contentFeatureList)
             {
-                AddVideoResource(writer, filter, contentFeature, streamInfo);
+                AddVideoResource(writer, video, deviceId, filter, contentFeature, streamInfo);
             }
 
             var subtitleProfiles = streamInfo.GetSubtitleProfiles(_mediaEncoder, false, _serverAddress, _accessToken);
@@ -289,10 +282,7 @@ namespace Emby.Dlna.Didl
             else
             {
                 writer.WriteStartElement(string.Empty, "res", NS_DIDL);
-                var protocolInfo = string.Format(
-                    CultureInfo.InvariantCulture,
-                    "http-get:*:text/{0}:*",
-                    info.Format.ToLowerInvariant());
+                var protocolInfo = string.Format("http-get:*:text/{0}:*", info.Format.ToLowerInvariant());
                 writer.WriteAttributeString("protocolInfo", protocolInfo);
 
                 writer.WriteString(info.Url);
@@ -302,7 +292,7 @@ namespace Emby.Dlna.Didl
             return true;
         }
 
-        private void AddVideoResource(XmlWriter writer, Filter filter, string contentFeatures, StreamInfo streamInfo)
+        private void AddVideoResource(XmlWriter writer, BaseItem video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
         {
             writer.WriteStartElement(string.Empty, "res", NS_DIDL);
 
@@ -344,13 +334,7 @@ namespace Emby.Dlna.Didl
             {
                 if (targetWidth.HasValue && targetHeight.HasValue)
                 {
-                    writer.WriteAttributeString(
-                        "resolution",
-                        string.Format(
-                            CultureInfo.InvariantCulture,
-                            "{0}x{1}",
-                            targetWidth.Value,
-                            targetHeight.Value));
+                    writer.WriteAttributeString("resolution", string.Format("{0}x{1}", targetWidth.Value, targetHeight.Value));
                 }
             }
 
@@ -384,19 +368,17 @@ namespace Emby.Dlna.Didl
                 streamInfo.TargetVideoCodecTag,
                 streamInfo.IsTargetAVC);
 
-            var filename = url.Substring(0, url.IndexOf('?', StringComparison.Ordinal));
+            var filename = url.Substring(0, url.IndexOf('?'));
 
             var mimeType = mediaProfile == null || string.IsNullOrEmpty(mediaProfile.MimeType)
                ? MimeTypes.GetMimeType(filename)
                : mediaProfile.MimeType;
 
-            writer.WriteAttributeString(
-                "protocolInfo",
-                string.Format(
-                    CultureInfo.InvariantCulture,
-                    "http-get:*:{0}:{1}",
-                    mimeType,
-                    contentFeatures));
+            writer.WriteAttributeString("protocolInfo", string.Format(
+                "http-get:*:{0}:{1}",
+                mimeType,
+                contentFeatures
+                ));
 
             writer.WriteString(url);
 
@@ -409,121 +391,54 @@ namespace Emby.Dlna.Didl
             {
                 switch (itemStubType.Value)
                 {
-                    case StubType.Latest: return _localization.GetLocalizedString("Latest");
-                    case StubType.Playlists: return _localization.GetLocalizedString("Playlists");
-                    case StubType.AlbumArtists: return _localization.GetLocalizedString("HeaderAlbumArtists");
-                    case StubType.Albums: return _localization.GetLocalizedString("Albums");
-                    case StubType.Artists: return _localization.GetLocalizedString("Artists");
-                    case StubType.Songs: return _localization.GetLocalizedString("Songs");
-                    case StubType.Genres: return _localization.GetLocalizedString("Genres");
-                    case StubType.FavoriteAlbums: return _localization.GetLocalizedString("HeaderFavoriteAlbums");
-                    case StubType.FavoriteArtists: return _localization.GetLocalizedString("HeaderFavoriteArtists");
-                    case StubType.FavoriteSongs: return _localization.GetLocalizedString("HeaderFavoriteSongs");
+                    case StubType.Latest:           return _localization.GetLocalizedString("Latest");
+                    case StubType.Playlists:        return _localization.GetLocalizedString("Playlists");
+                    case StubType.AlbumArtists:     return _localization.GetLocalizedString("HeaderAlbumArtists");
+                    case StubType.Albums:           return _localization.GetLocalizedString("Albums");
+                    case StubType.Artists:          return _localization.GetLocalizedString("Artists");
+                    case StubType.Songs:            return _localization.GetLocalizedString("Songs");
+                    case StubType.Genres:           return _localization.GetLocalizedString("Genres");
+                    case StubType.FavoriteAlbums:   return _localization.GetLocalizedString("HeaderFavoriteAlbums");
+                    case StubType.FavoriteArtists:  return _localization.GetLocalizedString("HeaderFavoriteArtists");
+                    case StubType.FavoriteSongs:    return _localization.GetLocalizedString("HeaderFavoriteSongs");
                     case StubType.ContinueWatching: return _localization.GetLocalizedString("HeaderContinueWatching");
-                    case StubType.Movies: return _localization.GetLocalizedString("Movies");
-                    case StubType.Collections: return _localization.GetLocalizedString("Collections");
-                    case StubType.Favorites: return _localization.GetLocalizedString("Favorites");
-                    case StubType.NextUp: return _localization.GetLocalizedString("HeaderNextUp");
-                    case StubType.FavoriteSeries: return _localization.GetLocalizedString("HeaderFavoriteShows");
+                    case StubType.Movies:           return _localization.GetLocalizedString("Movies");
+                    case StubType.Collections:      return _localization.GetLocalizedString("Collections");
+                    case StubType.Favorites:        return _localization.GetLocalizedString("Favorites");
+                    case StubType.NextUp:           return _localization.GetLocalizedString("HeaderNextUp");
+                    case StubType.FavoriteSeries:   return _localization.GetLocalizedString("HeaderFavoriteShows");
                     case StubType.FavoriteEpisodes: return _localization.GetLocalizedString("HeaderFavoriteEpisodes");
-                    case StubType.Series: return _localization.GetLocalizedString("Shows");
+                    case StubType.Series:           return _localization.GetLocalizedString("Shows");
+                    default: break;
                 }
             }
 
-            return item is Episode episode
-                ? GetEpisodeDisplayName(episode, context)
-                : item.Name;
-        }
-
-        /// <summary>
-        /// Gets episode display name appropriate for the given context.
-        /// </summary>
-        /// <remarks>
-        /// If context is a season, this will return a string containing just episode number and name.
-        /// Otherwise the result will include series nams and season number.
-        /// </remarks>
-        /// <param name="episode">The episode.</param>
-        /// <param name="context">Current context.</param>
-        /// <returns>Formatted name of the episode.</returns>
-        private string GetEpisodeDisplayName(Episode episode, BaseItem context)
-        {
-            string[] components;
-
-            if (context is Season season)
+            if (item is Episode episode && context is Season season)
             {
                 // This is a special embedded within a season
-                if (episode.ParentIndexNumber.HasValue && episode.ParentIndexNumber.Value == 0
+                if (item.ParentIndexNumber.HasValue && item.ParentIndexNumber.Value == 0
                     && season.IndexNumber.HasValue && season.IndexNumber.Value != 0)
                 {
-                    return string.Format(
-                        CultureInfo.InvariantCulture,
-                        _localization.GetLocalizedString("ValueSpecialEpisodeName"),
-                        episode.Name);
+                    return string.Format(_localization.GetLocalizedString("ValueSpecialEpisodeName"), item.Name);
                 }
 
-                // inside a season use simple format (ex. '12 - Episode Name')
-                var epNumberName = GetEpisodeIndexFullName(episode);
-                components = new[] { epNumberName, episode.Name };
-            }
-            else
-            {
-                // outside a season include series and season details (ex. 'TV Show - S05E11 - Episode Name')
-                var epNumberName = GetEpisodeNumberDisplayName(episode);
-                components = new[] { episode.SeriesName, epNumberName, episode.Name };
-            }
-
-            return string.Join(" - ", components.Where(NotNullOrWhiteSpace));
-        }
-
-        /// <summary>
-        /// Gets complete episode number.
-        /// </summary>
-        /// <param name="episode">The episode.</param>
-        /// <returns>For single episodes returns just the number. For double episodes - current and ending numbers.</returns>
-        private string GetEpisodeIndexFullName(Episode episode)
-        {
-            var name = string.Empty;
-            if (episode.IndexNumber.HasValue)
-            {
-                name += episode.IndexNumber.Value.ToString("00", CultureInfo.InvariantCulture);
-
-                if (episode.IndexNumberEnd.HasValue)
+                if (item.IndexNumber.HasValue)
                 {
-                    name += "-" + episode.IndexNumberEnd.Value.ToString("00", CultureInfo.InvariantCulture);
+                    var number = item.IndexNumber.Value.ToString("00", CultureInfo.InvariantCulture);
+
+                    if (episode.IndexNumberEnd.HasValue)
+                    {
+                        number += "-" + episode.IndexNumberEnd.Value.ToString("00", CultureInfo.InvariantCulture);
+                    }
+
+                    return number + " - " + item.Name;
                 }
             }
 
-            return name;
+            return item.Name;
         }
 
-        /// <summary>
-        /// Gets episode number formatted as 'S##E##'.
-        /// </summary>
-        /// <param name="episode">The episode.</param>
-        /// <returns>Formatted episode number.</returns>
-        private string GetEpisodeNumberDisplayName(Episode episode)
-        {
-            var name = string.Empty;
-            var seasonNumber = episode.Season?.IndexNumber;
-
-            if (seasonNumber.HasValue)
-            {
-                name = "S" + seasonNumber.Value.ToString("00", CultureInfo.InvariantCulture);
-            }
-
-            var indexName = GetEpisodeIndexFullName(episode);
-
-            if (!string.IsNullOrWhiteSpace(indexName))
-            {
-                name += "E" + indexName;
-            }
-
-            return name;
-        }
-
-        private bool NotNullOrWhiteSpace(string s) => !string.IsNullOrWhiteSpace(s);
-
-        private void AddAudioResource(XmlWriter writer, BaseItem audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
+        private void AddAudioResource(DlnaOptions options, XmlWriter writer, BaseItem audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             writer.WriteStartElement(string.Empty, "res", NS_DIDL);
 
@@ -589,7 +504,7 @@ namespace Emby.Dlna.Didl
                 targetSampleRate,
                 targetAudioBitDepth);
 
-            var filename = url.Substring(0, url.IndexOf('?', StringComparison.Ordinal));
+            var filename = url.Substring(0, url.IndexOf('?'));
 
             var mimeType = mediaProfile == null || string.IsNullOrEmpty(mediaProfile.MimeType)
                 ? MimeTypes.GetMimeType(filename)
@@ -605,13 +520,11 @@ namespace Emby.Dlna.Didl
                 streamInfo.RunTimeTicks ?? 0,
                 streamInfo.TranscodeSeekInfo);
 
-            writer.WriteAttributeString(
-                "protocolInfo",
-                string.Format(
-                    CultureInfo.InvariantCulture,
-                    "http-get:*:{0}:{1}",
-                    mimeType,
-                    contentFeatures));
+            writer.WriteAttributeString("protocolInfo", string.Format(
+                "http-get:*:{0}:{1}",
+                mimeType,
+                contentFeatures
+                ));
 
             writer.WriteString(url);
 
@@ -634,7 +547,7 @@ namespace Emby.Dlna.Didl
 
             var clientId = GetClientId(folder, stubType);
 
-            if (string.Equals(requestedId, "0", StringComparison.Ordinal))
+            if (string.Equals(requestedId, "0"))
             {
                 writer.WriteAttributeString("id", "0");
                 writer.WriteAttributeString("parentID", "-1");
@@ -663,7 +576,7 @@ namespace Emby.Dlna.Didl
 
             AddGeneralProperties(folder, stubType, context, writer, filter);
 
-            AddCover(folder, stubType, writer);
+            AddCover(folder, context, stubType, writer);
 
             writer.WriteFullEndElement();
         }
@@ -675,7 +588,7 @@ namespace Emby.Dlna.Didl
                 return;
             }
 
-            XmlAttribute secAttribute = null;
+            MediaBrowser.Model.Dlna.XmlAttribute secAttribute = null;
             foreach (var attribute in _profile.XmlRootAttributes)
             {
                 if (string.Equals(attribute.Name, "xmlns:sec", StringComparison.OrdinalIgnoreCase))
@@ -696,22 +609,19 @@ namespace Emby.Dlna.Didl
 
             if (playbackPositionTicks > 0)
             {
-                var elementValue = string.Format(
-                    CultureInfo.InvariantCulture,
-                    "BM={0}",
-                    Convert.ToInt32(TimeSpan.FromTicks(playbackPositionTicks).TotalSeconds));
+                var elementValue = string.Format("BM={0}", Convert.ToInt32(TimeSpan.FromTicks(playbackPositionTicks).TotalSeconds).ToString(_usCulture));
                 AddValue(writer, "sec", "dcmInfo", elementValue, secAttribute.Value);
             }
         }
 
         /// <summary>
-        /// Adds fields used by both items and folders.
+        /// Adds fields used by both items and folders
         /// </summary>
         private void AddCommonFields(BaseItem item, StubType? itemStubType, BaseItem context, XmlWriter writer, Filter filter)
         {
             // Don't filter on dc:title because not all devices will include it in the filter
             // MediaMonkey for example won't display content without a title
-            // if (filter.Contains("dc:title"))
+            //if (filter.Contains("dc:title"))
             {
                 AddValue(writer, "dc", "title", GetDisplayName(item, itemStubType, context), NS_DC);
             }
@@ -722,7 +632,7 @@ namespace Emby.Dlna.Didl
             {
                 if (item.PremiereDate.HasValue)
                 {
-                    AddValue(writer, "dc", "date", item.PremiereDate.Value.ToString("o", CultureInfo.InvariantCulture), NS_DC);
+                    AddValue(writer, "dc", "date", item.PremiereDate.Value.ToString("o"), NS_DC);
                 }
             }
 
@@ -750,7 +660,7 @@ namespace Emby.Dlna.Didl
                         AddValue(writer, "dc", "description", desc, NS_DC);
                     }
                 }
-                // if (filter.Contains("upnp:longDescription"))
+                //if (filter.Contains("upnp:longDescription"))
                 //{
                 //    if (!string.IsNullOrWhiteSpace(item.Overview))
                 //    {
@@ -765,7 +675,6 @@ namespace Emby.Dlna.Didl
                 {
                     AddValue(writer, "dc", "rating", item.OfficialRating, NS_DC);
                 }
-
                 if (filter.Contains("upnp:rating"))
                 {
                     AddValue(writer, "upnp", "rating", item.OfficialRating, NS_UPNP);
@@ -853,36 +762,37 @@ namespace Emby.Dlna.Didl
 
         private void AddPeople(BaseItem item, XmlWriter writer)
         {
-            if (!item.SupportsPeople)
-            {
-                return;
-            }
+            //var types = new[]
+            //{
+            //    PersonType.Director,
+            //    PersonType.Writer,
+            //    PersonType.Producer,
+            //    PersonType.Composer,
+            //    "Creator"
+            //};
 
-            var types = new[]
-            {
-                PersonType.Director,
-                PersonType.Writer,
-                PersonType.Producer,
-                PersonType.Composer,
-                "creator"
-            };
+            //var people = _libraryManager.GetPeople(item);
 
-            // Seeing some LG models locking up due content with large lists of people
-            // The actual issue might just be due to processing a more metadata than it can handle
-            var people = _libraryManager.GetPeople(
-                new InternalPeopleQuery
-                {
-                    ItemId = item.Id,
-                    Limit = 6
-                });
+            //var index = 0;
 
-            foreach (var actor in people)
-            {
-                var type = types.FirstOrDefault(i => string.Equals(i, actor.Type, StringComparison.OrdinalIgnoreCase) || string.Equals(i, actor.Role, StringComparison.OrdinalIgnoreCase))
-                    ?? PersonType.Actor;
+            //// Seeing some LG models locking up due content with large lists of people
+            //// The actual issue might just be due to processing a more metadata than it can handle
+            //var limit = 6;
 
-                AddValue(writer, "upnp", type.ToLowerInvariant(), actor.Name, NS_UPNP);
-            }
+            //foreach (var actor in people)
+            //{
+            //    var type = types.FirstOrDefault(i => string.Equals(i, actor.Type, StringComparison.OrdinalIgnoreCase) || string.Equals(i, actor.Role, StringComparison.OrdinalIgnoreCase))
+            //        ?? PersonType.Actor;
+
+            //    AddValue(writer, "upnp", type.ToLowerInvariant(), actor.Name, NS_UPNP);
+
+            //    index++;
+
+            //    if (index >= limit)
+            //    {
+            //        break;
+            //    }
+            //}
         }
 
         private void AddGeneralProperties(BaseItem item, StubType? itemStubType, BaseItem context, XmlWriter writer, Filter filter)
@@ -959,7 +869,7 @@ namespace Emby.Dlna.Didl
             }
         }
 
-        private void AddCover(BaseItem item, StubType? stubType, XmlWriter writer)
+        private void AddCover(BaseItem item, BaseItem context, StubType? stubType, XmlWriter writer)
         {
             ImageDownloadInfo imageInfo = GetImageInfo(item);
 
@@ -1001,10 +911,20 @@ namespace Emby.Dlna.Didl
             }
 
             AddImageResElement(item, writer, 160, 160, "jpg", "JPEG_TN");
+
         }
 
-        private void AddImageResElement(
-            BaseItem item,
+        private void AddEmbeddedImageAsCover(string name, XmlWriter writer)
+        {
+            writer.WriteStartElement("upnp", "albumArtURI", NS_UPNP);
+            writer.WriteAttributeString("dlna", "profileID", NS_DLNA, _profile.AlbumArtPn);
+            writer.WriteString(_serverAddress + "/Dlna/icons/people480.jpg");
+            writer.WriteFullEndElement();
+
+            writer.WriteElementString("upnp", "icon", NS_UPNP, _serverAddress + "/Dlna/icons/people48.jpg");
+        }
+
+        private void AddImageResElement(BaseItem item,
             XmlWriter writer,
             int maxWidth,
             int maxHeight,
@@ -1030,17 +950,13 @@ namespace Emby.Dlna.Didl
             var contentFeatures = new ContentFeatureBuilder(_profile)
                 .BuildImageHeader(format, width, height, imageInfo.IsDirectStream, org_Pn);
 
-            writer.WriteAttributeString(
-                "protocolInfo",
-                string.Format(
-                    CultureInfo.InvariantCulture,
-                    "http-get:*:{0}:{1}",
-                    MimeTypes.GetMimeType("file." + format),
-                    contentFeatures));
+            writer.WriteAttributeString("protocolInfo", string.Format(
+                "http-get:*:{0}:{1}",
+                MimeTypes.GetMimeType("file." + format),
+                contentFeatures
+                ));
 
-            writer.WriteAttributeString(
-                "resolution",
-                string.Format(CultureInfo.InvariantCulture, "{0}x{1}", width, height));
+            writer.WriteAttributeString("resolution", string.Format("{0}x{1}", width, height));
 
             writer.WriteString(albumartUrlInfo.Url);
 
@@ -1053,12 +969,10 @@ namespace Emby.Dlna.Didl
             {
                 return GetImageInfo(item, ImageType.Primary);
             }
-
             if (item.HasImage(ImageType.Thumb))
             {
                 return GetImageInfo(item, ImageType.Thumb);
             }
-
             if (item.HasImage(ImageType.Backdrop))
             {
                 if (item is Channel)
@@ -1067,58 +981,19 @@ namespace Emby.Dlna.Didl
                 }
             }
 
-            // For audio tracks without art use album art if available.
-            if (item is Audio audioItem)
-            {
-                var album = audioItem.AlbumEntity;
-                return album != null && album.HasImage(ImageType.Primary)
-                    ? GetImageInfo(album, ImageType.Primary)
-                    : null;
-            }
+            item = item.GetParents().FirstOrDefault(i => i.HasImage(ImageType.Primary));
 
-            // Don't look beyond album/playlist level. Metadata service may assign an image from a different album/show to the parent folder.
-            if (item is MusicAlbum || item is Playlist)
+            if (item != null)
             {
-                return null;
-            }
-
-            // For other item types check parents, but be aware that image retrieved from a parent may be not suitable for this media item.
-            var parentWithImage = GetFirstParentWithImageBelowUserRoot(item);
-            if (parentWithImage != null)
-            {
-                return GetImageInfo(parentWithImage, ImageType.Primary);
+                if (item.HasImage(ImageType.Primary))
+                {
+                    return GetImageInfo(item, ImageType.Primary);
+                }
             }
 
             return null;
         }
 
-        private BaseItem GetFirstParentWithImageBelowUserRoot(BaseItem item)
-        {
-            if (item == null)
-            {
-                return null;
-            }
-
-            if (item.HasImage(ImageType.Primary))
-            {
-                return item;
-            }
-
-            var parent = item.GetParent();
-            if (parent is UserRootFolder)
-            {
-                return null;
-            }
-
-            // terminate in case we went past user root folder (unlikely?)
-            if (parent is Folder folder && folder.IsRoot)
-            {
-                return null;
-            }
-
-            return GetFirstParentWithImageBelowUserRoot(parent);
-        }
-
         private ImageDownloadInfo GetImageInfo(BaseItem item, ImageType type)
         {
             var imageInfo = item.GetImageInfo(type, 0);
@@ -1138,24 +1013,25 @@ namespace Emby.Dlna.Didl
 
             if (width == 0 || height == 0)
             {
-                // _imageProcessor.GetImageSize(item, imageInfo);
+                //_imageProcessor.GetImageSize(item, imageInfo);
                 width = null;
                 height = null;
             }
+
             else if (width == -1 || height == -1)
             {
                 width = null;
                 height = null;
             }
 
-            // try
+            //try
             //{
             //    var size = _imageProcessor.GetImageSize(imageInfo);
 
             //    width = size.Width;
             //    height = size.Height;
             //}
-            // catch
+            //catch
             //{
 
             //}
@@ -1219,9 +1095,7 @@ namespace Emby.Dlna.Didl
 
         private ImageUrlInfo GetImageUrl(ImageDownloadInfo info, int maxWidth, int maxHeight, string format)
         {
-            var url = string.Format(
-                CultureInfo.InvariantCulture,
-                "{0}/Items/{1}/Images/{2}/0/{3}/{4}/{5}/{6}/0/0",
+            var url = string.Format("{0}/Items/{1}/Images/{2}/0/{3}/{4}/{5}/{6}/0/0",
                 _serverAddress,
                 info.ItemId.ToString("N", CultureInfo.InvariantCulture),
                 info.Type,

Emby.Dlna/Didl/Filter.cs

@@ -1,6 +1,5 @@
-#pragma warning disable CS1591
-
 using System;
+using MediaBrowser.Model.Extensions;
 
 namespace Emby.Dlna.Didl
 {
@@ -12,11 +11,12 @@ namespace Emby.Dlna.Didl
         public Filter()
             : this("*")
         {
+
         }
 
         public Filter(string filter)
         {
-            _all = string.Equals(filter, "*", StringComparison.OrdinalIgnoreCase);
+            _all = StringHelper.EqualsIgnoreCase(filter, "*");
 
             _fields = (filter ?? string.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
         }
@@ -25,7 +25,7 @@ namespace Emby.Dlna.Didl
         {
             // Don't bother with this. Some clients (media monkey) use the filter and then don't display very well when very little data comes back.
             return true;
-            // return _all || ListHelper.ContainsIgnoreCase(_fields, field);
+            //return _all || ListHelper.ContainsIgnoreCase(_fields, field);
         }
     }
 }

Emby.Dlna/Didl/StringWriterWithEncoding.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.IO;
 using System.Text;
@@ -53,6 +51,6 @@ namespace Emby.Dlna.Didl
             _encoding = encoding;
         }
 
-        public override Encoding Encoding => _encoding ?? base.Encoding;
+        public override Encoding Encoding => (null == _encoding) ? base.Encoding : _encoding;
     }
 }

Emby.Dlna/DlnaManager.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -31,7 +29,7 @@ namespace Emby.Dlna
         private readonly IApplicationPaths _appPaths;
         private readonly IXmlSerializer _xmlSerializer;
         private readonly IFileSystem _fileSystem;
-        private readonly ILogger<DlnaManager> _logger;
+        private readonly ILogger _logger;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IServerApplicationHost _appHost;
         private static readonly Assembly _assembly = typeof(DlnaManager).Assembly;
@@ -49,7 +47,7 @@ namespace Emby.Dlna
             _xmlSerializer = xmlSerializer;
             _fileSystem = fileSystem;
             _appPaths = appPaths;
-            _logger = loggerFactory.CreateLogger<DlnaManager>();
+            _logger = loggerFactory.CreateLogger("Dlna");
             _jsonSerializer = jsonSerializer;
             _appHost = appHost;
         }
@@ -88,6 +86,7 @@ namespace Emby.Dlna
                     .Select(i => i.Item2)
                     .ToList();
             }
+
         }
 
         public DeviceProfile GetDefaultProfile()
@@ -140,73 +139,55 @@ namespace Emby.Dlna
             if (!string.IsNullOrEmpty(profileInfo.DeviceDescription))
             {
                 if (deviceInfo.DeviceDescription == null || !IsRegexMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.FriendlyName))
             {
                 if (deviceInfo.FriendlyName == null || !IsRegexMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.Manufacturer))
             {
                 if (deviceInfo.Manufacturer == null || !IsRegexMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.ManufacturerUrl))
             {
                 if (deviceInfo.ManufacturerUrl == null || !IsRegexMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.ModelDescription))
             {
                 if (deviceInfo.ModelDescription == null || !IsRegexMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.ModelName))
             {
                 if (deviceInfo.ModelName == null || !IsRegexMatch(deviceInfo.ModelName, profileInfo.ModelName))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.ModelNumber))
             {
                 if (deviceInfo.ModelNumber == null || !IsRegexMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.ModelUrl))
             {
                 if (deviceInfo.ModelUrl == null || !IsRegexMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
-                {
                     return false;
-                }
             }
 
             if (!string.IsNullOrEmpty(profileInfo.SerialNumber))
             {
                 if (deviceInfo.SerialNumber == null || !IsRegexMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
-                {
                     return false;
-                }
             }
 
             return true;
@@ -268,7 +249,7 @@ namespace Emby.Dlna
                         return string.Equals(value, header.Value, StringComparison.OrdinalIgnoreCase);
                     case HeaderMatchType.Substring:
                         var isMatch = value.ToString().IndexOf(header.Value, StringComparison.OrdinalIgnoreCase) != -1;
-                        // _logger.LogDebug("IsMatch-Substring value: {0} testValue: {1} isMatch: {2}", value, header.Value, isMatch);
+                        //_logger.LogDebug("IsMatch-Substring value: {0} testValue: {1} isMatch: {2}", value, header.Value, isMatch);
                         return isMatch;
                     case HeaderMatchType.Regex:
                         return Regex.IsMatch(value, header.Value, RegexOptions.IgnoreCase);
@@ -404,7 +385,7 @@ namespace Emby.Dlna
                     {
                         Directory.CreateDirectory(systemProfilesPath);
 
-                        using (var fileStream = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.Read))
+                        using (var fileStream = _fileSystem.GetFileStream(path, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read))
                         {
                             await stream.CopyToAsync(fileStream);
                         }
@@ -456,7 +437,6 @@ namespace Emby.Dlna
             {
                 throw new ArgumentException("Profile is missing Id");
             }
-
             if (string.IsNullOrEmpty(profile.Name))
             {
                 throw new ArgumentException("Profile is missing Name");
@@ -482,7 +462,6 @@ namespace Emby.Dlna
             {
                 _profiles[path] = new Tuple<InternalProfileInfo, DeviceProfile>(GetInternalProfileInfo(_fileSystem.GetFileInfo(path), type), profile);
             }
-
             SerializeToXml(profile, path);
         }
 
@@ -493,7 +472,7 @@ namespace Emby.Dlna
 
         /// <summary>
         /// Recreates the object using serialization, to ensure it's not a subclass.
-        /// If it's a subclass it may not serlialize properly to xml (different root element tag name).
+        /// If it's a subclass it may not serlialize properly to xml (different root element tag name)
         /// </summary>
         /// <param name="profile"></param>
         /// <returns></returns>
@@ -512,7 +491,6 @@ namespace Emby.Dlna
         class InternalProfileInfo
         {
             internal DeviceProfileInfo Info { get; set; }
-
             internal string Path { get; set; }
         }
 
@@ -586,9 +564,9 @@ namespace Emby.Dlna
                 new Foobar2000Profile(),
                 new SharpSmartTvProfile(),
                 new MediaMonkeyProfile(),
-                // new Windows81Profile(),
-                // new WindowsMediaCenterProfile(),
-                // new WindowsPhoneProfile(),
+                //new Windows81Profile(),
+                //new WindowsMediaCenterProfile(),
+                //new WindowsPhoneProfile(),
                 new DirectTvProfile(),
                 new DishHopperJoeyProfile(),
                 new DefaultProfile(),

Emby.Dlna/Emby.Dlna.csproj

@@ -1,10 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
-  <PropertyGroup>
-    <ProjectGuid>{805844AB-E92F-45E6-9D99-4F6D48D129A5}</ProjectGuid>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs" />
   </ItemGroup>
@@ -17,22 +12,9 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TreatWarningsAsErrors Condition=" '$(Configuration)' == 'Release'" >true</TreatWarningsAsErrors>
-  </PropertyGroup>
-
-  <!-- Code Analyzers-->
-  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
-    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>

Emby.Dlna/EventSubscriptionResponse.cs

@@ -1,20 +1,17 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 
 namespace Emby.Dlna
 {
     public class EventSubscriptionResponse
     {
+        public string Content { get; set; }
+        public string ContentType { get; set; }
+
+        public Dictionary<string, string> Headers { get; set; }
+
         public EventSubscriptionResponse()
         {
             Headers = new Dictionary<string, string>();
         }
-
-        public string Content { get; set; }
-
-        public string ContentType { get; set; }
-
-        public Dictionary<string, string> Headers { get; set; }
     }
 }

Emby.Dlna/Eventing/EventManager.cs

@@ -1,11 +1,8 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
@@ -31,26 +28,28 @@ namespace Emby.Dlna.Eventing
         public EventSubscriptionResponse RenewEventSubscription(string subscriptionId, string notificationType, string requestedTimeoutString, string callbackUrl)
         {
             var subscription = GetSubscription(subscriptionId, false);
+
+            int timeoutSeconds;
+
+            // Remove logging for now because some devices are sending this very frequently
+            // TODO re-enable with dlna debug logging setting
+            //_logger.LogDebug("Renewing event subscription for {0} with timeout of {1} to {2}",
+            //    subscription.NotificationType,
+            //    timeout,
+            //    subscription.CallbackUrl);
+
             if (subscription != null)
             {
                 subscription.TimeoutSeconds = ParseTimeout(requestedTimeoutString) ?? 300;
-                int timeoutSeconds = subscription.TimeoutSeconds;
+                timeoutSeconds = subscription.TimeoutSeconds;
                 subscription.SubscriptionTime = DateTime.UtcNow;
-
-                _logger.LogDebug(
-                    "Renewing event subscription for {0} with timeout of {1} to {2}",
-                    subscription.NotificationType,
-                    timeoutSeconds,
-                    subscription.CallbackUrl);
-
-                return GetEventSubscriptionResponse(subscriptionId, requestedTimeoutString, timeoutSeconds);
+            }
+            else
+            {
+                timeoutSeconds = 300;
             }
 
-            return new EventSubscriptionResponse
-            {
-                Content = string.Empty,
-                ContentType = "text/plain"
-            };
+            return GetEventSubscriptionResponse(subscriptionId, requestedTimeoutString, timeoutSeconds);
         }
 
         public EventSubscriptionResponse CreateEventSubscription(string notificationType, string requestedTimeoutString, string callbackUrl)
@@ -58,10 +57,12 @@ namespace Emby.Dlna.Eventing
             var timeout = ParseTimeout(requestedTimeoutString) ?? 300;
             var id = "uuid:" + Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture);
 
-            _logger.LogDebug("Creating event subscription for {0} with timeout of {1} to {2}",
-                notificationType,
-                timeout,
-                callbackUrl);
+            // Remove logging for now because some devices are sending this very frequently
+            // TODO re-enable with dlna debug logging setting
+            //_logger.LogDebug("Creating event subscription for {0} with timeout of {1} to {2}",
+            //    notificationType,
+            //    timeout,
+            //    callbackUrl);
 
             _subscriptions.TryAdd(id, new EventSubscription
             {
@@ -158,7 +159,6 @@ namespace Emby.Dlna.Eventing
                 builder.Append("</" + key + ">");
                 builder.Append("</e:property>");
             }
-
             builder.Append("</e:propertyset>");
 
             var options = new HttpRequestOptions
@@ -176,8 +176,9 @@ namespace Emby.Dlna.Eventing
 
             try
             {
-                using (await _httpClient.SendAsync(options, new HttpMethod("NOTIFY")).ConfigureAwait(false))
+                using (await _httpClient.SendAsync(options, "NOTIFY").ConfigureAwait(false))
                 {
+
                 }
             }
             catch (OperationCanceledException)

Emby.Dlna/Eventing/EventSubscription.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 
 namespace Emby.Dlna.Eventing
@@ -7,19 +5,14 @@ namespace Emby.Dlna.Eventing
     public class EventSubscription
     {
         public string Id { get; set; }
-
         public string CallbackUrl { get; set; }
-
         public string NotificationType { get; set; }
 
         public DateTime SubscriptionTime { get; set; }
-
         public int TimeoutSeconds { get; set; }
 
         public long TriggerCount { get; set; }
 
-        public bool IsExpired => SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
-
         public void IncrementTriggerCount()
         {
             if (TriggerCount == long.MaxValue)
@@ -29,5 +22,7 @@ namespace Emby.Dlna.Eventing
 
             TriggerCount++;
         }
+
+        public bool IsExpired => SubscriptionTime.AddSeconds(TimeoutSeconds) >= DateTime.UtcNow;
     }
 }

Emby.Dlna/IConnectionManager.cs

@@ -1,4 +1,3 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna
 {

Emby.Dlna/IContentDirectory.cs

@@ -1,4 +1,3 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna
 {

Emby.Dlna/IEventManager.cs

@@ -1,4 +1,3 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna
 {

Emby.Dlna/IMediaReceiverRegistrar.cs

@@ -1,4 +1,3 @@
-#pragma warning disable CS1591
 
 namespace Emby.Dlna
 {

Emby.Dlna/IUpnpService.cs

@@ -1,7 +1,3 @@
-#pragma warning disable CS1591
-
-using System.Threading.Tasks;
-
 namespace Emby.Dlna
 {
     public interface IUpnpService
@@ -17,6 +13,6 @@ namespace Emby.Dlna
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns>ControlResponse.</returns>
-        Task<ControlResponse> ProcessControlRequestAsync(ControlRequest request);
+        ControlResponse ProcessControlRequest(ControlRequest request);
     }
 }

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -1,8 +1,6 @@
-#pragma warning disable CS1591
-
 using System;
-using System.Globalization;
 using System.Net.Sockets;
+using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Dlna.PlayTo;
@@ -26,15 +24,17 @@ using MediaBrowser.Model.System;
 using Microsoft.Extensions.Logging;
 using Rssdp;
 using Rssdp.Infrastructure;
-using OperatingSystem = MediaBrowser.Common.System.OperatingSystem;
+using OperatingSystem =  MediaBrowser.Common.System.OperatingSystem;
 
 namespace Emby.Dlna.Main
 {
     public class DlnaEntryPoint : IServerEntryPoint, IRunBeforeStartup
     {
         private readonly IServerConfigurationManager _config;
-        private readonly ILogger<DlnaEntryPoint> _logger;
+        private readonly ILogger _logger;
         private readonly IServerApplicationHost _appHost;
+
+        private PlayToManager _manager;
         private readonly ISessionManager _sessionManager;
         private readonly IHttpClient _httpClient;
         private readonly ILibraryManager _libraryManager;
@@ -45,25 +45,23 @@ namespace Emby.Dlna.Main
         private readonly ILocalizationManager _localization;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IMediaEncoder _mediaEncoder;
+
         private readonly IDeviceDiscovery _deviceDiscovery;
+
+        private SsdpDevicePublisher _Publisher;
+
         private readonly ISocketFactory _socketFactory;
         private readonly INetworkManager _networkManager;
-        private readonly object _syncLock = new object();
 
-        private PlayToManager _manager;
-        private SsdpDevicePublisher _publisher;
         private ISsdpCommunicationsServer _communicationsServer;
 
         internal IContentDirectory ContentDirectory { get; private set; }
-
         internal IConnectionManager ConnectionManager { get; private set; }
-
         internal IMediaReceiverRegistrar MediaReceiverRegistrar { get; private set; }
 
         public static DlnaEntryPoint Current;
 
-        public DlnaEntryPoint(
-            IServerConfigurationManager config,
+        public DlnaEntryPoint(IServerConfigurationManager config,
             ILoggerFactory loggerFactory,
             IServerApplicationHost appHost,
             ISessionManager sessionManager,
@@ -97,7 +95,7 @@ namespace Emby.Dlna.Main
             _mediaEncoder = mediaEncoder;
             _socketFactory = socketFactory;
             _networkManager = networkManager;
-            _logger = loggerFactory.CreateLogger<DlnaEntryPoint>();
+            _logger = loggerFactory.CreateLogger("Dlna");
 
             ContentDirectory = new ContentDirectory.ContentDirectory(
                 dlnaManager,
@@ -106,7 +104,7 @@ namespace Emby.Dlna.Main
                 libraryManager,
                 config,
                 userManager,
-                loggerFactory.CreateLogger<ContentDirectory.ContentDirectory>(),
+                _logger,
                 httpClient,
                 localizationManager,
                 mediaSourceManager,
@@ -114,16 +112,9 @@ namespace Emby.Dlna.Main
                 mediaEncoder,
                 tvSeriesManager);
 
-            ConnectionManager = new ConnectionManager.ConnectionManager(
-                dlnaManager,
-                config,
-                loggerFactory.CreateLogger<ConnectionManager.ConnectionManager>(),
-                httpClient);
+            ConnectionManager = new ConnectionManager.ConnectionManager(dlnaManager, config, _logger, httpClient);
 
-            MediaReceiverRegistrar = new MediaReceiverRegistrar.MediaReceiverRegistrar(
-                loggerFactory.CreateLogger<MediaReceiverRegistrar.MediaReceiverRegistrar>(),
-                httpClient,
-                config);
+            MediaReceiverRegistrar = new MediaReceiverRegistrar.MediaReceiverRegistrar(_logger, httpClient, config);
             Current = this;
         }
 
@@ -131,20 +122,20 @@ namespace Emby.Dlna.Main
         {
             await ((DlnaManager)_dlnaManager).InitProfilesAsync().ConfigureAwait(false);
 
-            await ReloadComponents().ConfigureAwait(false);
+            ReloadComponents();
 
-            _config.NamedConfigurationUpdated += OnNamedConfigurationUpdated;
+            _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
         }
 
-        private async void OnNamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
+        void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
         {
             if (string.Equals(e.Key, "dlna", StringComparison.OrdinalIgnoreCase))
             {
-                await ReloadComponents().ConfigureAwait(false);
+                ReloadComponents();
             }
         }
 
-        private async Task ReloadComponents()
+        private async void ReloadComponents()
         {
             var options = _config.GetDlnaConfiguration();
 
@@ -178,7 +169,7 @@ namespace Emby.Dlna.Main
                     var enableMultiSocketBinding = OperatingSystem.Id == OperatingSystemId.Windows ||
                                                    OperatingSystem.Id == OperatingSystemId.Linux;
 
-                    _communicationsServer = new SsdpCommunicationsServer(_socketFactory, _networkManager, _logger, enableMultiSocketBinding)
+                    _communicationsServer = new SsdpCommunicationsServer(_config, _socketFactory, _networkManager, _logger, enableMultiSocketBinding)
                     {
                         IsShared = true
                     };
@@ -229,22 +220,20 @@ namespace Emby.Dlna.Main
                 return;
             }
 
-            if (_publisher != null)
+            if (_Publisher != null)
             {
                 return;
             }
 
             try
             {
-                _publisher = new SsdpDevicePublisher(_communicationsServer, _networkManager, OperatingSystem.Name, Environment.OSVersion.VersionString, _config.GetDlnaConfiguration().SendOnlyMatchedHost)
-                {
-                    LogFunction = LogMessage,
-                    SupportPnpRootDevice = false
-                };
+                _Publisher = new SsdpDevicePublisher(_communicationsServer, _networkManager, OperatingSystem.Name, Environment.OSVersion.VersionString, _config.GetDlnaConfiguration().SendOnlyMatchedHost);
+                _Publisher.LogFunction = LogMessage;
+                _Publisher.SupportPnpRootDevice = false;
 
                 await RegisterServerEndpoints().ConfigureAwait(false);
 
-                _publisher.StartBroadcastingAliveMessages(TimeSpan.FromSeconds(options.BlastAliveMessageIntervalSeconds));
+                _Publisher.StartBroadcastingAliveMessages(TimeSpan.FromSeconds(options.BlastAliveMessageIntervalSeconds));
             }
             catch (Exception ex)
             {
@@ -262,14 +251,8 @@ namespace Emby.Dlna.Main
             {
                 if (address.AddressFamily == AddressFamily.InterNetworkV6)
                 {
-                    // Not supporting IPv6 right now
-                    continue;
-                }
-
-                // Limit to LAN addresses only
-                if (!_networkManager.IsAddressInSubnets(address, true, true))
-                {
-                    continue;
+                   // Not support IPv6 right now
+                   continue;
                 }
 
                 var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
@@ -281,7 +264,7 @@ namespace Emby.Dlna.Main
 
                 var device = new SsdpRootDevice
                 {
-                    CacheLifetime = TimeSpan.FromSeconds(1800), // How long SSDP clients can cache this info.
+                    CacheLifetime = TimeSpan.FromSeconds(1800), //How long SSDP clients can cache this info.
                     Location = uri, // Must point to the URL that serves your devices UPnP description document.
                     Address = address,
                     SubnetMask = _networkManager.GetLocalIpSubnetMask(address),
@@ -293,13 +276,13 @@ namespace Emby.Dlna.Main
                 };
 
                 SetProperies(device, fullService);
-                _publisher.AddDevice(device);
+                _Publisher.AddDevice(device);
 
                 var embeddedDevices = new[]
                 {
                     "urn:schemas-upnp-org:service:ContentDirectory:1",
                     "urn:schemas-upnp-org:service:ConnectionManager:1",
-                    // "urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1"
+                    //"urn:microsoft.com:service:X_MS_MediaReceiverRegistrar:1"
                 };
 
                 foreach (var subDevice in embeddedDevices)
@@ -325,13 +308,12 @@ namespace Emby.Dlna.Main
             {
                 guid = text.GetMD5();
             }
-
             return guid.ToString("N", CultureInfo.InvariantCulture);
         }
 
         private void SetProperies(SsdpDevice device, string fullDeviceType)
         {
-            var service = fullDeviceType.Replace("urn:", string.Empty, StringComparison.OrdinalIgnoreCase).Replace(":1", string.Empty, StringComparison.OrdinalIgnoreCase);
+            var service = fullDeviceType.Replace("urn:", string.Empty).Replace(":1", string.Empty);
 
             var serviceParts = service.Split(':');
 
@@ -342,6 +324,7 @@ namespace Emby.Dlna.Main
             device.DeviceType = serviceParts[2];
         }
 
+        private readonly object _syncLock = new object();
         private void StartPlayToManager()
         {
             lock (_syncLock)
@@ -353,8 +336,7 @@ namespace Emby.Dlna.Main
 
                 try
                 {
-                    _manager = new PlayToManager(
-                        _logger,
+                    _manager = new PlayToManager(_logger,
                         _sessionManager,
                         _libraryManager,
                         _userManager,
@@ -393,7 +375,6 @@ namespace Emby.Dlna.Main
                     {
                         _logger.LogError(ex, "Error disposing PlayTo manager");
                     }
-
                     _manager = null;
                 }
             }
@@ -420,11 +401,11 @@ namespace Emby.Dlna.Main
 
         public void DisposeDevicePublisher()
         {
-            if (_publisher != null)
+            if (_Publisher != null)
             {
                 _logger.LogInformation("Disposing SsdpDevicePublisher");
-                _publisher.Dispose();
-                _publisher = null;
+                _Publisher.Dispose();
+                _Publisher = null;
             }
         }
     }

Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs

@@ -1,8 +1,5 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
-using System.Xml;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
@@ -12,33 +9,35 @@ namespace Emby.Dlna.MediaReceiverRegistrar
 {
     public class ControlHandler : BaseControlHandler
     {
-        public ControlHandler(IServerConfigurationManager config, ILogger logger)
-            : base(config, logger)
-        {
-        }
-
-        /// <inheritdoc />
-        protected override void WriteResult(string methodName, IDictionary<string, string> methodParams, XmlWriter xmlWriter)
+        protected override IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams)
         {
             if (string.Equals(methodName, "IsAuthorized", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleIsAuthorized(xmlWriter);
-                return;
-            }
-
+                return HandleIsAuthorized();
             if (string.Equals(methodName, "IsValidated", StringComparison.OrdinalIgnoreCase))
-            {
-                HandleIsValidated(xmlWriter);
-                return;
-            }
+                return HandleIsValidated();
 
             throw new ResourceNotFoundException("Unexpected control request name: " + methodName);
         }
 
-        private static void HandleIsAuthorized(XmlWriter xmlWriter)
-            => xmlWriter.WriteElementString("Result", "1");
+        private static IEnumerable<KeyValuePair<string, string>> HandleIsAuthorized()
+        {
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "Result", "1" }
+            };
+        }
 
-        private static void HandleIsValidated(XmlWriter xmlWriter)
-            => xmlWriter.WriteElementString("Result", "1");
+        private static IEnumerable<KeyValuePair<string, string>> HandleIsValidated()
+        {
+            return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
+            {
+                { "Result", "1" }
+            };
+        }
+
+        public ControlHandler(IServerConfigurationManager config, ILogger logger)
+            : base(config, logger)
+        {
+        }
     }
 }

Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs

@@ -1,6 +1,3 @@
-#pragma warning disable CS1591
-
-using System.Threading.Tasks;
 using Emby.Dlna.Service;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
@@ -12,28 +9,23 @@ namespace Emby.Dlna.MediaReceiverRegistrar
     {
         private readonly IServerConfigurationManager _config;
 
-        public MediaReceiverRegistrar(
-            ILogger<MediaReceiverRegistrar> logger,
-            IHttpClient httpClient,
-            IServerConfigurationManager config)
+        public MediaReceiverRegistrar(ILogger logger, IHttpClient httpClient, IServerConfigurationManager config)
             : base(logger, httpClient)
         {
             _config = config;
         }
 
-        /// <inheritdoc />
         public string GetServiceXml()
         {
             return new MediaReceiverRegistrarXmlBuilder().GetXml();
         }
 
-        /// <inheritdoc />
-        public Task<ControlResponse> ProcessControlRequestAsync(ControlRequest request)
+        public ControlResponse ProcessControlRequest(ControlRequest request)
         {
             return new ControlHandler(
                 _config,
                 Logger)
-                .ProcessControlRequestAsync(request);
+                .ProcessControlRequest(request);
         }
     }
 }

Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 using Emby.Dlna.Service;

Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 

Emby.Dlna/PlayTo/Device.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -19,6 +17,8 @@ namespace Emby.Dlna.PlayTo
 {
     public class Device : IDisposable
     {
+        #region Fields & Properties
+
         private Timer _timer;
 
         public DeviceInfo Properties { get; set; }
@@ -32,10 +32,9 @@ namespace Emby.Dlna.PlayTo
         {
             get
             {
-                RefreshVolumeIfNeeded().GetAwaiter().GetResult();
+                RefreshVolumeIfNeeded();
                 return _volume;
             }
-
             set => _volume = value;
         }
 
@@ -51,10 +50,10 @@ namespace Emby.Dlna.PlayTo
 
         public bool IsStopped => TransportState == TRANSPORTSTATE.STOPPED;
 
+        #endregion
+
         private readonly IHttpClient _httpClient;
-
         private readonly ILogger _logger;
-
         private readonly IServerConfigurationManager _config;
 
         public Action OnDeviceUnavailable { get; set; }
@@ -75,25 +74,25 @@ namespace Emby.Dlna.PlayTo
 
         private DateTime _lastVolumeRefresh;
         private bool _volumeRefreshActive;
-        private Task RefreshVolumeIfNeeded()
+        private void RefreshVolumeIfNeeded()
         {
-            if (_volumeRefreshActive
-                && DateTime.UtcNow >= _lastVolumeRefresh.AddSeconds(5))
-            {
-                _lastVolumeRefresh = DateTime.UtcNow;
-                return RefreshVolume();
-            }
-
-            return Task.CompletedTask;
-        }
-
-        private async Task RefreshVolume(CancellationToken cancellationToken = default)
-        {
-            if (_disposed)
+            if (!_volumeRefreshActive)
             {
                 return;
             }
 
+            if (DateTime.UtcNow >= _lastVolumeRefresh.AddSeconds(5))
+            {
+                _lastVolumeRefresh = DateTime.UtcNow;
+                RefreshVolume(CancellationToken.None);
+            }
+        }
+
+        private async void RefreshVolume(CancellationToken cancellationToken)
+        {
+            if (_disposed)
+                return;
+
             try
             {
                 await GetVolume(cancellationToken).ConfigureAwait(false);
@@ -140,6 +139,8 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
+        #region Commanding
+
         public Task VolumeDown(CancellationToken cancellationToken)
         {
             var sendVolume = Math.Max(Volume - 5, 0);
@@ -208,9 +209,7 @@ namespace Emby.Dlna.PlayTo
 
             var command = rendererCommands.ServiceActions.FirstOrDefault(c => c.Name == "SetMute");
             if (command == null)
-            {
                 return false;
-            }
 
             var service = GetServiceRenderingControl();
 
@@ -222,7 +221,7 @@ namespace Emby.Dlna.PlayTo
             _logger.LogDebug("Setting mute");
             var value = mute ? 1 : 0;
 
-            await new SsdpHttpClient(_httpClient).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType, value))
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType, value))
                 .ConfigureAwait(false);
 
             IsMuted = mute;
@@ -231,7 +230,7 @@ namespace Emby.Dlna.PlayTo
         }
 
         /// <summary>
-        /// Sets volume on a scale of 0-100.
+        /// Sets volume on a scale of 0-100
         /// </summary>
         public async Task SetVolume(int value, CancellationToken cancellationToken)
         {
@@ -239,9 +238,7 @@ namespace Emby.Dlna.PlayTo
 
             var command = rendererCommands.ServiceActions.FirstOrDefault(c => c.Name == "SetVolume");
             if (command == null)
-            {
                 return;
-            }
 
             var service = GetServiceRenderingControl();
 
@@ -254,7 +251,7 @@ namespace Emby.Dlna.PlayTo
             // Remote control will perform better
             Volume = value;
 
-            await new SsdpHttpClient(_httpClient).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType, value))
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType, value))
                 .ConfigureAwait(false);
         }
 
@@ -264,9 +261,7 @@ namespace Emby.Dlna.PlayTo
 
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "Seek");
             if (command == null)
-            {
                 return;
-            }
 
             var service = GetAvTransportService();
 
@@ -275,7 +270,7 @@ namespace Emby.Dlna.PlayTo
                 throw new InvalidOperationException("Unable to find service");
             }
 
-            await new SsdpHttpClient(_httpClient).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, string.Format("{0:hh}:{0:mm}:{0:ss}", value), "REL_TIME"))
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, string.Format("{0:hh}:{0:mm}:{0:ss}", value), "REL_TIME"))
                 .ConfigureAwait(false);
 
             RestartTimer(true);
@@ -291,9 +286,7 @@ namespace Emby.Dlna.PlayTo
 
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "SetAVTransportURI");
             if (command == null)
-            {
                 return;
-            }
 
             var dictionary = new Dictionary<string, string>
             {
@@ -309,7 +302,7 @@ namespace Emby.Dlna.PlayTo
             }
 
             var post = avCommands.BuildPost(command, service.ServiceType, url, dictionary);
-            await new SsdpHttpClient(_httpClient).SendCommandAsync(Properties.BaseUrl, service, command.Name, post, header: header)
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, post, header: header)
                 .ConfigureAwait(false);
 
             await Task.Delay(50).ConfigureAwait(false);
@@ -351,12 +344,7 @@ namespace Emby.Dlna.PlayTo
                 throw new InvalidOperationException("Unable to find service");
             }
 
-            return new SsdpHttpClient(_httpClient).SendCommandAsync(
-                Properties.BaseUrl,
-                service,
-                command.Name,
-                avCommands.BuildPost(command, service.ServiceType, 1),
-                cancellationToken: cancellationToken);
+            return new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, 1));
         }
 
         public async Task SetPlay(CancellationToken cancellationToken)
@@ -380,7 +368,7 @@ namespace Emby.Dlna.PlayTo
 
             var service = GetAvTransportService();
 
-            await new SsdpHttpClient(_httpClient).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, 1))
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, 1))
                 .ConfigureAwait(false);
 
             RestartTimer(true);
@@ -398,7 +386,7 @@ namespace Emby.Dlna.PlayTo
 
             var service = GetAvTransportService();
 
-            await new SsdpHttpClient(_httpClient).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, 1))
+            await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType, 1))
                 .ConfigureAwait(false);
 
             TransportState = TRANSPORTSTATE.PAUSED;
@@ -406,8 +394,11 @@ namespace Emby.Dlna.PlayTo
             RestartTimer(true);
         }
 
-        private int _connectFailureCount;
+        #endregion
 
+        #region Get data
+
+        private int _connectFailureCount;
         private async void TimerCallback(object sender)
         {
             if (_disposed)
@@ -460,9 +451,7 @@ namespace Emby.Dlna.PlayTo
                     _connectFailureCount = 0;
 
                     if (_disposed)
-                    {
                         return;
-                    }
 
                     // If we're not playing anything make sure we don't get data more often than neccessry to keep the Session alive
                     if (transportState.Value == TRANSPORTSTATE.STOPPED)
@@ -482,9 +471,7 @@ namespace Emby.Dlna.PlayTo
             catch (Exception ex)
             {
                 if (_disposed)
-                {
                     return;
-                }
 
                 _logger.LogError(ex, "Error updating device info for {DeviceName}", Properties.Name);
 
@@ -500,7 +487,6 @@ namespace Emby.Dlna.PlayTo
                         return;
                     }
                 }
-
                 RestartTimerInactive();
             }
         }
@@ -527,12 +513,8 @@ namespace Emby.Dlna.PlayTo
                 return;
             }
 
-            var result = await new SsdpHttpClient(_httpClient).SendCommandAsync(
-                Properties.BaseUrl,
-                service,
-                command.Name,
-                rendererCommands.BuildPost(command, service.ServiceType),
-                cancellationToken: cancellationToken).ConfigureAwait(false);
+            var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType), true)
+                .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
             {
@@ -577,17 +559,11 @@ namespace Emby.Dlna.PlayTo
                 return;
             }
 
-            var result = await new SsdpHttpClient(_httpClient).SendCommandAsync(
-                Properties.BaseUrl,
-                service,
-                command.Name,
-                rendererCommands.BuildPost(command, service.ServiceType),
-                cancellationToken: cancellationToken).ConfigureAwait(false);
+            var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType), true)
+                .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
-            {
                 return;
-            }
 
             var valueNode = result.Document.Descendants(uPnpNamespaces.RenderingControl + "GetMuteResponse")
                                             .Select(i => i.Element("CurrentMute"))
@@ -610,12 +586,8 @@ namespace Emby.Dlna.PlayTo
                 return null;
             }
 
-            var result = await new SsdpHttpClient(_httpClient).SendCommandAsync(
-                Properties.BaseUrl,
-                service,
-                command.Name,
-                avCommands.BuildPost(command, service.ServiceType),
-                cancellationToken: cancellationToken).ConfigureAwait(false);
+            var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, avCommands.BuildPost(command, service.ServiceType), false)
+                .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
             {
@@ -625,7 +597,7 @@ namespace Emby.Dlna.PlayTo
             var transportState =
                 result.Document.Descendants(uPnpNamespaces.AvTransport + "GetTransportInfoResponse").Select(i => i.Element("CurrentTransportState")).FirstOrDefault(i => i != null);
 
-            var transportStateValue = transportState?.Value;
+            var transportStateValue = transportState == null ? null : transportState.Value;
 
             if (transportStateValue != null
                 && Enum.TryParse(transportStateValue, true, out TRANSPORTSTATE state))
@@ -652,12 +624,8 @@ namespace Emby.Dlna.PlayTo
 
             var rendererCommands = await GetRenderingProtocolAsync(cancellationToken).ConfigureAwait(false);
 
-            var result = await new SsdpHttpClient(_httpClient).SendCommandAsync(
-                Properties.BaseUrl,
-                service,
-                command.Name,
-                rendererCommands.BuildPost(command, service.ServiceType),
-                cancellationToken: cancellationToken).ConfigureAwait(false);
+            var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType), false)
+                .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
             {
@@ -719,12 +687,8 @@ namespace Emby.Dlna.PlayTo
 
             var rendererCommands = await GetRenderingProtocolAsync(cancellationToken).ConfigureAwait(false);
 
-            var result = await new SsdpHttpClient(_httpClient).SendCommandAsync(
-                Properties.BaseUrl,
-                service,
-                command.Name,
-                rendererCommands.BuildPost(command, service.ServiceType),
-                cancellationToken: cancellationToken).ConfigureAwait(false);
+            var result = await new SsdpHttpClient(_httpClient, _config).SendCommandAsync(Properties.BaseUrl, service, command.Name, rendererCommands.BuildPost(command, service.ServiceType), false)
+                .ConfigureAwait(false);
 
             if (result == null || result.Document == null)
             {
@@ -759,7 +723,7 @@ namespace Emby.Dlna.PlayTo
 
             if (track == null)
             {
-                // If track is null, some vendors do this, use GetMediaInfo instead
+                //If track is null, some vendors do this, use GetMediaInfo instead
                 return (true, null);
             }
 
@@ -803,6 +767,7 @@ namespace Emby.Dlna.PlayTo
             }
             catch (XmlException)
             {
+
             }
 
             // first try to add a root node with a dlna namesapce
@@ -814,6 +779,7 @@ namespace Emby.Dlna.PlayTo
             }
             catch (XmlException)
             {
+
             }
 
             // some devices send back invalid xml
@@ -823,6 +789,7 @@ namespace Emby.Dlna.PlayTo
             }
             catch (XmlException)
             {
+
             }
 
             return null;
@@ -877,6 +844,10 @@ namespace Emby.Dlna.PlayTo
             return new string[4];
         }
 
+        #endregion
+
+        #region From XML
+
         private async Task<TransportCommands> GetAVProtocolAsync(CancellationToken cancellationToken)
         {
             if (AvCommands != null)
@@ -897,7 +868,7 @@ namespace Emby.Dlna.PlayTo
 
             string url = NormalizeUrl(Properties.BaseUrl, avService.ScpdUrl);
 
-            var httpClient = new SsdpHttpClient(_httpClient);
+            var httpClient = new SsdpHttpClient(_httpClient, _config);
 
             var document = await httpClient.GetDataAsync(url, cancellationToken).ConfigureAwait(false);
 
@@ -925,7 +896,7 @@ namespace Emby.Dlna.PlayTo
 
             string url = NormalizeUrl(Properties.BaseUrl, avService.ScpdUrl);
 
-            var httpClient = new SsdpHttpClient(_httpClient);
+            var httpClient = new SsdpHttpClient(_httpClient, _config);
             _logger.LogDebug("Dlna Device.GetRenderingProtocolAsync");
             var document = await httpClient.GetDataAsync(url, cancellationToken).ConfigureAwait(false);
 
@@ -960,7 +931,7 @@ namespace Emby.Dlna.PlayTo
 
         public static async Task<Device> CreateuPnpDeviceAsync(Uri url, IHttpClient httpClient, IServerConfigurationManager config, ILogger logger, CancellationToken cancellationToken)
         {
-            var ssdpHttpClient = new SsdpHttpClient(httpClient);
+            var ssdpHttpClient = new SsdpHttpClient(httpClient, config);
 
             var document = await ssdpHttpClient.GetDataAsync(url.ToString(), cancellationToken).ConfigureAwait(false);
 
@@ -1071,6 +1042,8 @@ namespace Emby.Dlna.PlayTo
             return new Device(deviceProperties, httpClient, logger, config);
         }
 
+        #endregion
+
         private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
         private static DeviceIcon CreateIcon(XElement element)
         {
@@ -1194,6 +1167,8 @@ namespace Emby.Dlna.PlayTo
             });
         }
 
+        #region IDisposable
+
         bool _disposed;
 
         public void Dispose()
@@ -1220,6 +1195,8 @@ namespace Emby.Dlna.PlayTo
             _disposed = true;
         }
 
+        #endregion
+
         public override string ToString()
         {
             return string.Format("{0} - {1}", Properties.Name, Properties.BaseUrl);

Emby.Dlna/PlayTo/DeviceInfo.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System.Collections.Generic;
 using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;

Emby.Dlna/PlayTo/PlayToController.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -7,8 +5,8 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Dlna.Didl;
-using Jellyfin.Data.Entities;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
@@ -23,14 +21,11 @@ using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
-using Photo = MediaBrowser.Controller.Entities.Photo;
 
 namespace Emby.Dlna.PlayTo
 {
     public class PlayToController : ISessionController, IDisposable
     {
-        private static readonly CultureInfo _usCulture = CultureInfo.ReadOnly(new CultureInfo("en-US"));
-
         private Device _device;
         private readonly SessionInfo _session;
         private readonly ISessionManager _sessionManager;
@@ -49,10 +44,9 @@ namespace Emby.Dlna.PlayTo
         private readonly string _serverAddress;
         private readonly string _accessToken;
 
-        private readonly List<PlaylistItem> _playlist = new List<PlaylistItem>();
-        private int _currentPlaylistIndex;
+        public bool IsSessionActive => !_disposed && _device != null;
 
-        private bool _disposed;
+        public bool SupportsMediaControl => IsSessionActive;
 
         public PlayToController(
             SessionInfo session,
@@ -88,22 +82,18 @@ namespace Emby.Dlna.PlayTo
             _mediaEncoder = mediaEncoder;
         }
 
-        public bool IsSessionActive => !_disposed && _device != null;
-
-        public bool SupportsMediaControl => IsSessionActive;
-
         public void Init(Device device)
         {
             _device = device;
             _device.OnDeviceUnavailable = OnDeviceUnavailable;
-            _device.PlaybackStart += OnDevicePlaybackStart;
-            _device.PlaybackProgress += OnDevicePlaybackProgress;
-            _device.PlaybackStopped += OnDevicePlaybackStopped;
-            _device.MediaChanged += OnDeviceMediaChanged;
+            _device.PlaybackStart += _device_PlaybackStart;
+            _device.PlaybackProgress += _device_PlaybackProgress;
+            _device.PlaybackStopped += _device_PlaybackStopped;
+            _device.MediaChanged += _device_MediaChanged;
 
             _device.Start();
 
-            _deviceDiscovery.DeviceLeft += OnDeviceDiscoveryDeviceLeft;
+            _deviceDiscovery.DeviceLeft += _deviceDiscovery_DeviceLeft;
         }
 
         private void OnDeviceUnavailable()
@@ -119,7 +109,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private void OnDeviceDiscoveryDeviceLeft(object sender, GenericEventArgs<UpnpDeviceInfo> e)
+        void _deviceDiscovery_DeviceLeft(object sender, GenericEventArgs<UpnpDeviceInfo> e)
         {
             var info = e.Argument;
 
@@ -134,7 +124,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private async void OnDeviceMediaChanged(object sender, MediaChangedEventArgs e)
+        async void _device_MediaChanged(object sender, MediaChangedEventArgs e)
         {
             if (_disposed)
             {
@@ -146,18 +136,15 @@ namespace Emby.Dlna.PlayTo
                 var streamInfo = StreamParams.ParseFromUrl(e.OldMediaInfo.Url, _libraryManager, _mediaSourceManager);
                 if (streamInfo.Item != null)
                 {
-                    var positionTicks = GetProgressPositionTicks(streamInfo);
+                    var positionTicks = GetProgressPositionTicks(e.OldMediaInfo, streamInfo);
 
-                    await ReportPlaybackStopped(streamInfo, positionTicks).ConfigureAwait(false);
+                    ReportPlaybackStopped(e.OldMediaInfo, streamInfo, positionTicks);
                 }
 
                 streamInfo = StreamParams.ParseFromUrl(e.NewMediaInfo.Url, _libraryManager, _mediaSourceManager);
-                if (streamInfo.Item == null)
-                {
-                    return;
-                }
+                if (streamInfo.Item == null) return;
 
-                var newItemProgress = GetProgressInfo(streamInfo);
+                var newItemProgress = GetProgressInfo(e.NewMediaInfo, streamInfo);
 
                 await _sessionManager.OnPlaybackStart(newItemProgress).ConfigureAwait(false);
             }
@@ -167,7 +154,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private async void OnDevicePlaybackStopped(object sender, PlaybackStoppedEventArgs e)
+        async void _device_PlaybackStopped(object sender, PlaybackStoppedEventArgs e)
         {
             if (_disposed)
             {
@@ -178,14 +165,11 @@ namespace Emby.Dlna.PlayTo
             {
                 var streamInfo = StreamParams.ParseFromUrl(e.MediaInfo.Url, _libraryManager, _mediaSourceManager);
 
-                if (streamInfo.Item == null)
-                {
-                    return;
-                }
+                if (streamInfo.Item == null) return;
 
-                var positionTicks = GetProgressPositionTicks(streamInfo);
+                var positionTicks = GetProgressPositionTicks(e.MediaInfo, streamInfo);
 
-                await ReportPlaybackStopped(streamInfo, positionTicks).ConfigureAwait(false);
+                ReportPlaybackStopped(e.MediaInfo, streamInfo, positionTicks);
 
                 var mediaSource = await streamInfo.GetMediaSource(CancellationToken.None).ConfigureAwait(false);
 
@@ -193,7 +177,7 @@ namespace Emby.Dlna.PlayTo
                     (_device.Duration == null ? (long?)null : _device.Duration.Value.Ticks) :
                     mediaSource.RunTimeTicks;
 
-                var playedToCompletion = positionTicks.HasValue && positionTicks.Value == 0;
+                var playedToCompletion = (positionTicks.HasValue && positionTicks.Value == 0);
 
                 if (!playedToCompletion && duration.HasValue && positionTicks.HasValue)
                 {
@@ -209,7 +193,7 @@ namespace Emby.Dlna.PlayTo
                 }
                 else
                 {
-                    _playlist.Clear();
+                    Playlist.Clear();
                 }
             }
             catch (Exception ex)
@@ -218,7 +202,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private async Task ReportPlaybackStopped(StreamParams streamInfo, long? positionTicks)
+        private async void ReportPlaybackStopped(uBaseObject mediaInfo, StreamParams streamInfo, long? positionTicks)
         {
             try
             {
@@ -228,6 +212,7 @@ namespace Emby.Dlna.PlayTo
                     SessionId = _session.Id,
                     PositionTicks = positionTicks,
                     MediaSourceId = streamInfo.MediaSourceId
+
                 }).ConfigureAwait(false);
             }
             catch (Exception ex)
@@ -236,7 +221,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private async void OnDevicePlaybackStart(object sender, PlaybackStartEventArgs e)
+        async void _device_PlaybackStart(object sender, PlaybackStartEventArgs e)
         {
             if (_disposed)
             {
@@ -249,7 +234,7 @@ namespace Emby.Dlna.PlayTo
 
                 if (info.Item != null)
                 {
-                    var progress = GetProgressInfo(info);
+                    var progress = GetProgressInfo(e.MediaInfo, info);
 
                     await _sessionManager.OnPlaybackStart(progress).ConfigureAwait(false);
                 }
@@ -260,7 +245,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private async void OnDevicePlaybackProgress(object sender, PlaybackProgressEventArgs e)
+        async void _device_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
         {
             if (_disposed)
             {
@@ -280,7 +265,7 @@ namespace Emby.Dlna.PlayTo
 
                 if (info.Item != null)
                 {
-                    var progress = GetProgressInfo(info);
+                    var progress = GetProgressInfo(e.MediaInfo, info);
 
                     await _sessionManager.OnPlaybackProgress(progress).ConfigureAwait(false);
                 }
@@ -291,7 +276,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private long? GetProgressPositionTicks(StreamParams info)
+        private long? GetProgressPositionTicks(uBaseObject mediaInfo, StreamParams info)
         {
             var ticks = _device.Position.Ticks;
 
@@ -303,13 +288,13 @@ namespace Emby.Dlna.PlayTo
             return ticks;
         }
 
-        private PlaybackStartInfo GetProgressInfo(StreamParams info)
+        private PlaybackStartInfo GetProgressInfo(uBaseObject mediaInfo, StreamParams info)
         {
             return new PlaybackStartInfo
             {
                 ItemId = info.ItemId,
                 SessionId = _session.Id,
-                PositionTicks = GetProgressPositionTicks(info),
+                PositionTicks = GetProgressPositionTicks(mediaInfo, info),
                 IsMuted = _device.IsMuted,
                 IsPaused = _device.IsPaused,
                 MediaSourceId = info.MediaSourceId,
@@ -324,7 +309,9 @@ namespace Emby.Dlna.PlayTo
             };
         }
 
-        public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken)
+        #region SendCommands
+
+        public async Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken)
         {
             _logger.LogDebug("{0} - Received PlayRequest: {1}", this._session.DeviceName, command.PlayCommand);
 
@@ -362,12 +349,11 @@ namespace Emby.Dlna.PlayTo
 
             if (command.PlayCommand == PlayCommand.PlayLast)
             {
-                _playlist.AddRange(playlist);
+                Playlist.AddRange(playlist);
             }
-
             if (command.PlayCommand == PlayCommand.PlayNext)
             {
-                _playlist.AddRange(playlist);
+                Playlist.AddRange(playlist);
             }
 
             if (!command.ControllingUserId.Equals(Guid.Empty))
@@ -376,7 +362,7 @@ namespace Emby.Dlna.PlayTo
                        _session.DeviceName, _session.RemoteEndPoint, user);
             }
 
-            return PlayItems(playlist, cancellationToken);
+            await PlayItems(playlist).ConfigureAwait(false);
         }
 
         private Task SendPlaystateCommand(PlaystateRequest command, CancellationToken cancellationToken)
@@ -384,7 +370,7 @@ namespace Emby.Dlna.PlayTo
             switch (command.Command)
             {
                 case PlaystateCommand.Stop:
-                    _playlist.Clear();
+                    Playlist.Clear();
                     return _device.SetStop(CancellationToken.None);
 
                 case PlaystateCommand.Pause:
@@ -400,10 +386,10 @@ namespace Emby.Dlna.PlayTo
                     return Seek(command.SeekPositionTicks ?? 0);
 
                 case PlaystateCommand.NextTrack:
-                    return SetPlaylistIndex(_currentPlaylistIndex + 1, cancellationToken);
+                    return SetPlaylistIndex(_currentPlaylistIndex + 1);
 
                 case PlaystateCommand.PreviousTrack:
-                    return SetPlaylistIndex(_currentPlaylistIndex - 1, cancellationToken);
+                    return SetPlaylistIndex(_currentPlaylistIndex - 1);
             }
 
             return Task.CompletedTask;
@@ -425,7 +411,6 @@ namespace Emby.Dlna.PlayTo
                     await _device.SetAvTransport(newItem.StreamUrl, GetDlnaHeaders(newItem), newItem.Didl, CancellationToken.None).ConfigureAwait(false);
                     return;
                 }
-
                 await SeekAfterTransportChange(newPosition, CancellationToken.None).ConfigureAwait(false);
             }
         }
@@ -440,6 +425,14 @@ namespace Emby.Dlna.PlayTo
             return info.IsDirectStream;
         }
 
+        #endregion
+
+        #region Playlist
+
+        private int _currentPlaylistIndex;
+        private readonly List<PlaylistItem> _playlist = new List<PlaylistItem>();
+        private List<PlaylistItem> Playlist => _playlist;
+
         private void AddItemFromId(Guid id, List<BaseItem> list)
         {
             var item = _libraryManager.GetItemById(id);
@@ -449,13 +442,7 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        private PlaylistItem CreatePlaylistItem(
-            BaseItem item,
-            User user,
-            long startPostionTicks,
-            string mediaSourceId,
-            int? audioStreamIndex,
-            int? subtitleStreamIndex)
+        private PlaylistItem CreatePlaylistItem(BaseItem item, User user, long startPostionTicks, string mediaSourceId, int? audioStreamIndex, int? subtitleStreamIndex)
         {
             var deviceInfo = _device.Properties;
 
@@ -463,7 +450,7 @@ namespace Emby.Dlna.PlayTo
                 _dlnaManager.GetDefaultProfile();
 
             var mediaSources = item is IHasMediaSources
-                ? _mediaSourceManager.GetStaticMediaSources(item, true, user)
+                ? (_mediaSourceManager.GetStaticMediaSources(item, true, user))
                 : new List<MediaSourceInfo>();
 
             var playlistItem = GetPlaylistItem(item, mediaSources, profile, _session.DeviceId, mediaSourceId, audioStreamIndex, subtitleStreamIndex);
@@ -471,19 +458,8 @@ namespace Emby.Dlna.PlayTo
 
             playlistItem.StreamUrl = DidlBuilder.NormalizeDlnaMediaUrl(playlistItem.StreamInfo.ToUrl(_serverAddress, _accessToken));
 
-            var itemXml = new DidlBuilder(
-                profile,
-                user,
-                _imageProcessor,
-                _serverAddress,
-                _accessToken,
-                _userDataManager,
-                _localization,
-                _mediaSourceManager,
-                _logger,
-                _mediaEncoder,
-                _libraryManager)
-                .GetItemDidl(item, user, null, _session.DeviceId, new Filter(), playlistItem.StreamInfo);
+            var itemXml = new DidlBuilder(profile, user, _imageProcessor, _serverAddress, _accessToken, _userDataManager, _localization, _mediaSourceManager, _logger, _mediaEncoder)
+                .GetItemDidl(_config.GetDlnaConfiguration(), item, user, null, _session.DeviceId, new Filter(), playlistItem.StreamInfo);
 
             playlistItem.Didl = itemXml;
 
@@ -593,31 +569,30 @@ namespace Emby.Dlna.PlayTo
         /// Plays the items.
         /// </summary>
         /// <param name="items">The items.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns><c>true</c> on success.</returns>
-        private async Task<bool> PlayItems(IEnumerable<PlaylistItem> items, CancellationToken cancellationToken = default)
+        /// <returns></returns>
+        private async Task<bool> PlayItems(IEnumerable<PlaylistItem> items)
         {
-            _playlist.Clear();
-            _playlist.AddRange(items);
-            _logger.LogDebug("{0} - Playing {1} items", _session.DeviceName, _playlist.Count);
+            Playlist.Clear();
+            Playlist.AddRange(items);
+            _logger.LogDebug("{0} - Playing {1} items", _session.DeviceName, Playlist.Count);
 
-            await SetPlaylistIndex(0, cancellationToken).ConfigureAwait(false);
+            await SetPlaylistIndex(0).ConfigureAwait(false);
             return true;
         }
 
-        private async Task SetPlaylistIndex(int index, CancellationToken cancellationToken = default)
+        private async Task SetPlaylistIndex(int index)
         {
-            if (index < 0 || index >= _playlist.Count)
+            if (index < 0 || index >= Playlist.Count)
             {
-                _playlist.Clear();
-                await _device.SetStop(cancellationToken).ConfigureAwait(false);
+                Playlist.Clear();
+                await _device.SetStop(CancellationToken.None);
                 return;
             }
 
             _currentPlaylistIndex = index;
-            var currentitem = _playlist[index];
+            var currentitem = Playlist[index];
 
-            await _device.SetAvTransport(currentitem.StreamUrl, GetDlnaHeaders(currentitem), currentitem.Didl, cancellationToken).ConfigureAwait(false);
+            await _device.SetAvTransport(currentitem.StreamUrl, GetDlnaHeaders(currentitem), currentitem.Didl, CancellationToken.None);
 
             var streamInfo = currentitem.StreamInfo;
             if (streamInfo.StartPositionTicks > 0 && EnableClientSideSeek(streamInfo))
@@ -626,7 +601,10 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        /// <inheritdoc />
+        #endregion
+
+        private bool _disposed;
+
         public void Dispose()
         {
             Dispose(true);
@@ -645,17 +623,19 @@ namespace Emby.Dlna.PlayTo
                 _device.Dispose();
             }
 
-            _device.PlaybackStart -= OnDevicePlaybackStart;
-            _device.PlaybackProgress -= OnDevicePlaybackProgress;
-            _device.PlaybackStopped -= OnDevicePlaybackStopped;
-            _device.MediaChanged -= OnDeviceMediaChanged;
-            _deviceDiscovery.DeviceLeft -= OnDeviceDiscoveryDeviceLeft;
+            _device.PlaybackStart -= _device_PlaybackStart;
+            _device.PlaybackProgress -= _device_PlaybackProgress;
+            _device.PlaybackStopped -= _device_PlaybackStopped;
+            _device.MediaChanged -= _device_MediaChanged;
+            _deviceDiscovery.DeviceLeft -= _deviceDiscovery_DeviceLeft;
             _device.OnDeviceUnavailable = null;
             _device = null;
 
             _disposed = true;
         }
 
+        private static readonly CultureInfo _usCulture = CultureInfo.ReadOnly(new CultureInfo("en-US"));
+
         private Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken)
         {
             if (Enum.TryParse(command.Name, true, out GeneralCommandType commandType))
@@ -714,7 +694,6 @@ namespace Emby.Dlna.PlayTo
 
                             throw new ArgumentException("Volume argument cannot be null");
                         }
-
                     default:
                         return Task.CompletedTask;
                 }
@@ -733,7 +712,7 @@ namespace Emby.Dlna.PlayTo
 
                 if (info.Item != null)
                 {
-                    var newPosition = GetProgressPositionTicks(info) ?? 0;
+                    var newPosition = GetProgressPositionTicks(media, info) ?? 0;
 
                     var user = !_session.UserId.Equals(Guid.Empty) ? _userManager.GetUserById(_session.UserId) : null;
                     var newItem = CreatePlaylistItem(info.Item, user, newPosition, info.MediaSourceId, newIndex, info.SubtitleStreamIndex);
@@ -758,7 +737,7 @@ namespace Emby.Dlna.PlayTo
 
                 if (info.Item != null)
                 {
-                    var newPosition = GetProgressPositionTicks(info) ?? 0;
+                    var newPosition = GetProgressPositionTicks(media, info) ?? 0;
 
                     var user = !_session.UserId.Equals(Guid.Empty) ? _userManager.GetUserById(_session.UserId) : null;
                     var newItem = CreatePlaylistItem(info.Item, user, newPosition, info.MediaSourceId, info.AudioStreamIndex, newIndex);
@@ -800,15 +779,12 @@ namespace Emby.Dlna.PlayTo
             public int? SubtitleStreamIndex { get; set; }
 
             public string DeviceProfileId { get; set; }
-
             public string DeviceId { get; set; }
 
             public string MediaSourceId { get; set; }
-
             public string LiveStreamId { get; set; }
 
             public BaseItem Item { get; set; }
-
             private MediaSourceInfo MediaSource;
 
             private IMediaSourceManager _mediaSourceManager;
@@ -875,11 +851,8 @@ namespace Emby.Dlna.PlayTo
                     return request;
                 }
 
-                var index = url.IndexOf('?', StringComparison.Ordinal);
-                if (index == -1)
-                {
-                    return request;
-                }
+                var index = url.IndexOf('?');
+                if (index == -1) return request;
 
                 var query = url.Substring(index + 1);
                 Dictionary<string, string> values = QueryHelpers.ParseQuery(query).ToDictionary(kv => kv.Key, kv => kv.Value.ToString());
@@ -926,8 +899,7 @@ namespace Emby.Dlna.PlayTo
             return 0;
         }
 
-        /// <inheritdoc />
-        public Task SendMessage<T>(string name, Guid messageId, T data, CancellationToken cancellationToken)
+        public Task SendMessage<T>(string name, string messageId, T data, ISessionController[] allControllers, CancellationToken cancellationToken)
         {
             if (_disposed)
             {
@@ -943,12 +915,10 @@ namespace Emby.Dlna.PlayTo
             {
                 return SendPlayCommand(data as PlayRequest, cancellationToken);
             }
-
             if (string.Equals(name, "PlayState", StringComparison.OrdinalIgnoreCase))
             {
                 return SendPlaystateCommand(data as PlaystateRequest, cancellationToken);
             }
-
             if (string.Equals(name, "GeneralCommand", StringComparison.OrdinalIgnoreCase))
             {
                 return SendGeneralCommand(data as GeneralCommand, cancellationToken);

Emby.Dlna/PlayTo/PlayToManager.cs

@@ -1,5 +1,3 @@
-#pragma warning disable CS1591
-
 using System;
 using System.Globalization;
 using System.Linq;
@@ -23,7 +21,7 @@ using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.PlayTo
 {
-    public sealed class PlayToManager : IDisposable
+    class PlayToManager : IDisposable
     {
         private readonly ILogger _logger;
         private readonly ISessionManager _sessionManager;
@@ -66,10 +64,10 @@ namespace Emby.Dlna.PlayTo
 
         public void Start()
         {
-            _deviceDiscovery.DeviceDiscovered += OnDeviceDiscoveryDeviceDiscovered;
+            _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
         }
 
-        private async void OnDeviceDiscoveryDeviceDiscovered(object sender, GenericEventArgs<UpnpDeviceInfo> e)
+        async void _deviceDiscovery_DeviceDiscovered(object sender, GenericEventArgs<UpnpDeviceInfo> e)
         {
             if (_disposed)
             {
@@ -78,15 +76,9 @@ namespace Emby.Dlna.PlayTo
 
             var info = e.Argument;
 
-            if (!info.Headers.TryGetValue("USN", out string usn))
-            {
-                usn = string.Empty;
-            }
+            if (!info.Headers.TryGetValue("USN", out string usn)) usn = string.Empty;
 
-            if (!info.Headers.TryGetValue("NT", out string nt))
-            {
-                nt = string.Empty;
-            }
+            if (!info.Headers.TryGetValue("NT", out string nt)) nt = string.Empty;
 
             string location = info.Location.ToString();
 
@@ -94,7 +86,7 @@ namespace Emby.Dlna.PlayTo
             if (usn.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) == -1 &&
                      nt.IndexOf("MediaRenderer:", StringComparison.OrdinalIgnoreCase) == -1)
             {
-                // _logger.LogDebug("Upnp device {0} does not contain a MediaRenderer device (0).", location);
+                //_logger.LogDebug("Upnp device {0} does not contain a MediaRenderer device (0).", location);
                 return;
             }
 
@@ -118,6 +110,7 @@ namespace Emby.Dlna.PlayTo
             }
             catch (OperationCanceledException)
             {
+
             }
             catch (Exception ex)
             {
@@ -138,7 +131,6 @@ namespace Emby.Dlna.PlayTo
                 usn = usn.Substring(index);
                 found = true;
             }
-
             index = usn.IndexOf("::", StringComparison.OrdinalIgnoreCase);
             if (index != -1)
             {
@@ -168,7 +160,7 @@ namespace Emby.Dlna.PlayTo
                 uuid = location.GetMD5().ToString("N", CultureInfo.InvariantCulture);
             }
 
-            var sessionInfo = _sessionManager.LogSessionActivity("DLNA", _appHost.ApplicationVersionString, uuid, null, uri.OriginalString, null);
+            var sessionInfo = _sessionManager.LogSessionActivity("DLNA", _appHost.ApplicationVersion, uuid, null, uri.OriginalString, null);
 
             var controller = sessionInfo.SessionControllers.OfType<PlayToController>().FirstOrDefault();
 
@@ -190,8 +182,7 @@ namespace Emby.Dlna.PlayTo
                     serverAddress = _appHost.GetLocalApiUrl(info.LocalIpAddress);
                 }
 
-                controller = new PlayToController(
-                    sessionInfo,
+                controller = new PlayToController(sessionInfo,
                    _sessionManager,
                    _libraryManager,
                    _logger,
@@ -238,10 +229,9 @@ namespace Emby.Dlna.PlayTo
             }
         }
 
-        /// <inheritdoc />
         public void Dispose()
         {
-            _deviceDiscovery.DeviceDiscovered -= OnDeviceDiscoveryDeviceDiscovered;
+            _deviceDiscovery.DeviceDiscovered -= _deviceDiscovery_DeviceDiscovered;
 
             try
             {
@@ -249,10 +239,8 @@ namespace Emby.Dlna.PlayTo
             }
             catch
             {
-            }
 
-            _sessionLock.Dispose();
-            _disposeCancellationTokenSource.Dispose();
+            }
 
             _disposed = true;
         }