update changelog for release v0.4.1-alpha

vaapi improvements (#629 )
* fix interlaced video with vaapi * downgrade imagesharp to fix blurhash generation * fix ui crash loading collection editor
2022-02-10 20:49:26 -06:00 · 2022-02-10 20:19:59 -06:00 · 2022-02-10 15:39:45 -06:00 · 2022-02-10 08:37:25 -06:00 · 2022-02-09 11:08:49 -06:00 · 2022-02-09 10:10:12 -06:00
180 changed files with 15752 additions and 867 deletions
@@ -6,3 +6,21 @@ updates:
      interval: daily
    assignees:
      - jasongdove
+  - package-ecosystem: docker
+    directory: "/docker"
+    schedule:
+      interval: daily
+    assignees:
+      - jasongdove
+  - package-ecosystem: docker
+    directory: "/docker/nvidia"
+    schedule:
+      interval: daily
+    assignees:
+      - jasongdove
+  - package-ecosystem: docker
+    directory: "/docker/vaapi"
+    schedule:
+      interval: daily
+    assignees:
+      - jasongdove
@@ -0,0 +1,235 @@
+name: Build Artifacts
+on:
+  workflow_call:
+    inputs:
+      release_tag:
+        description: 'Release tag'
+        required: true
+        type: string
+      release_version:
+        description: 'Release version number (e.g. v0.3.7-alpha)'
+        required: true
+        type: string
+      info_version:
+        description: 'Informational version number (e.g. 0.3.7-alpha)'
+        required: true
+        type: string
+    secrets:
+      apple_developer_certificate_p12_base64:
+        required: true
+      apple_developer_certificate_password:
+        required: true
+      ac_username:
+        required: true
+      ac_password:
+        required: true
+      gh_token:
+        required: true
+jobs:
+  build_and_upload_mac:
+    name: Mac Build & Upload
+    runs-on: ${{ matrix.os }}
+    if: contains(github.event.head_commit.message, '[no build]') == false
+    strategy:
+      matrix:
+        include:
+          - os: macos-latest
+            kind: macOS
+            target: osx-x64
+          - os: macos-latest
+            kind: macOS
+            target: osx-arm64
+    steps:
+      - name: Get the sources
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          submodules: true
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
+      - name: Install dependencies
+        run: dotnet restore -r "${{ matrix.target}}"
+
+      - name: Import Code-Signing Certificates
+        uses: Apple-Actions/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.apple_developer_certificate_p12_base64 }}
+          p12-password: ${{ secrets.apple_developer_certificate_password }}
+
+      - name: Calculate Release Name
+        shell: bash
+        run: |
+          release_name="ErsatzTV-${{ inputs.release_version }}-${{ matrix.target }}"
+          echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV
+
+      - name: Build
+        shell: bash
+        run: dotnet publish ErsatzTV/ErsatzTV.csproj --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o publish -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
+
+      - name: Bundle
+        shell: bash
+        run: |
+          brew install coreutils
+          plutil -replace CFBundleShortVersionString -string "${{ inputs.info_version }}" ErsatzTV-macOS/ErsatzTV-macOS/Info.plist
+          plutil -replace CFBundleVersion -string "${{ inputs.info_version }}" ErsatzTV-macOS/ErsatzTV-macOS/Info.plist
+          scripts/macOS/bundle.sh
+
+      - name: Sign
+        shell: bash
+        run: scripts/macOS/sign.sh
+      
+      - name: Create DMG
+        shell: bash
+        run: |
+          brew install create-dmg
+          create-dmg \
+            --volname "ErsatzTV" \
+            --volicon "artwork/ErsatzTV.icns" \
+            --window-pos 200 120 \
+            --window-size 800 400 \
+            --icon-size 100 \
+            --icon "ErsatzTV.app" 200 190 \
+            --hide-extension "ErsatzTV.app" \
+            --app-drop-link 600 185 \
+            "ErsatzTV.dmg" \
+            "ErsatzTV.app/"
+
+      - name: Notarize
+        shell: bash
+        run: |
+          brew tap mitchellh/gon
+          brew install mitchellh/gon/gon
+          gon -log-level=debug -log-json ./gon.json
+        env:
+          AC_USERNAME: ${{ secrets.ac_username }}
+          AC_PASSWORD: ${{ secrets.ac_password }}
+
+      - name: Cleanup
+        shell: bash
+        run: |
+          mv ErsatzTV.dmg "${{ env.RELEASE_NAME }}.dmg"
+          rm -r publish
+          rm -r ErsatzTV.app
+
+      - name: Delete old release assets
+        uses: mknejp/delete-release-assets@v1
+        with:
+          token: ${{ secrets.gh_token }}
+          tag: ${{ inputs.release_tag }}
+          fail-if-no-assets: false
+          assets: |
+            *${{ matrix.target }}.dmg
+
+      - name: Publish
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          tag_name: ${{ inputs.release_tag }}
+          files: |
+            ${{ env.RELEASE_NAME }}.dmg
+        env:
+          GITHUB_TOKEN: ${{ secrets.gh_token }}
+  build_and_upload:
+    name: Build & Upload
+    runs-on: ${{ matrix.os }}
+    if: contains(github.event.head_commit.message, '[no build]') == false
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            kind: linux
+            target: linux-x64
+          - os: ubuntu-latest
+            kind: linux
+            target: linux-arm
+          - os: ubuntu-latest
+            kind: linux
+            target: linux-arm64
+          - os: windows-latest
+            kind: windows
+            target: win-x64
+    steps:
+      - name: Get the sources
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
+      - name: Install dependencies
+        run: dotnet restore -r "${{ matrix.target}}"
+
+      - uses: suisei-cn/actions-download-file@v1
+        if: ${{ matrix.kind }} == "windows"
+        id: downloadffmpeg
+        name: Download ffmpeg
+        with:
+          url: "https://github.com/GyanD/codexffmpeg/releases/download/5.0/ffmpeg-5.0-full_build.7z"
+          target: ffmpeg/
+
+      - name: Build
+        shell: bash
+        run: |
+          # Define some variables for things we need
+          release_name="ErsatzTV-${{ inputs.release_version }}-${{ matrix.target }}"
+          echo "RELEASE_NAME=${release_name}" >> $GITHUB_ENV
+
+          # Build everything
+          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
+
+          # Build Windows launcher
+          if [ "${{ matrix.kind }}" == "windows" ]; then
+            dotnet publish ErsatzTV-Windows/ErsatzTV-Windows.csproj --framework net6.0-windows --runtime "${{ matrix.target }}" -c Release -o "$release_name" -p:InformationalVersion="${{ inputs.release_version }}-${{ matrix.target }}" -p:EnableCompressionInSingleFile=true -p:DebugType=Embedded -p:PublishSingleFile=true --self-contained true
+          fi
+
+          # Download ffmpeg
+          if [ "${{ matrix.kind }}" == "windows" ]; then
+            7z e "ffmpeg/${{ steps.downloadffmpeg.outputs.filename }}" -o"$release_name" '*.exe' -r
+            rm -f "$release_name/ffplay.exe"
+          fi
+
+          # Pack files
+          if [ "${{ matrix.kind }}" == "windows" ]; then
+            7z a -tzip "${release_name}.zip" "./${release_name}/*"
+          else
+            tar czvf "${release_name}.tar.gz" "$release_name"
+          fi
+
+          # Delete output directory
+          rm -r "$release_name"
+        env:
+          AC_USERNAME: ${{ secrets.ac_username }}
+          AC_PASSWORD: ${{ secrets.ac_password }}
+
+      - name: Delete old release assets
+        uses: mknejp/delete-release-assets@v1
+        with:
+          token: ${{ secrets.gh_token }}
+          tag: ${{ inputs.release_tag }}
+          fail-if-no-assets: false
+          assets: |
+            *${{ matrix.target }}.zip
+            *${{ matrix.target }}.tar.gz
+      - name: Publish
+        uses: softprops/action-gh-release@v1
+        with:
+          prerelease: true
+          tag_name: ${{ inputs.release_tag }}
+          files: |
+            ${{ env.RELEASE_NAME }}.zip
+            ${{ env.RELEASE_NAME }}.tar.gz
+        env:
+          GITHUB_TOKEN: ${{ secrets.gh_token }}
@@ -1,49 +1,19 @@
 name: Build
 on:
  workflow_dispatch:
-  pull_request:
  push:
    branches:
      - main
 jobs:
-  build_and_test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ windows-latest, ubuntu-latest, macos-latest ]
+  calculate_version:
+    name: Calculate version information
+    runs-on: ubuntu-latest
    steps:
      - name: Get the sources
        uses: actions/checkout@v2
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-
-      - name: Clean
-        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
-
-      - name: Install dependencies
-        run: dotnet restore
-
-      - name: Build
-        run: dotnet build --configuration Release --no-restore
-
-      - name: Test
-        run: dotnet test --no-restore --verbosity normal
-  build_and_push:
-    name: Build & Publish to Docker Hub
-    needs: build_and_test
-    runs-on: ubuntu-latest
-    if: github.event_name == 'push' && !contains(github.event.head_commit.message, '[no docker]')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
        with:
          fetch-depth: 0
-
-      - name: Extract Git Tag
+      - name: Extract Docker Tag
        shell: bash
        run: |
          tag=$(git describe --tags --abbrev=0)
@@ -51,60 +21,38 @@ jobs:
          short=$(git rev-parse --short HEAD)
          final="${tag2/alpha/$short}"
          echo "GIT_TAG=${final}" >> $GITHUB_ENV
-
-      - name: Set up Docker Buildx Base
-        uses: docker/setup-buildx-action@v1
-        id: builder-base
-
-      - name: Set up Docker Buildx NVIDIA
-        uses: docker/setup-buildx-action@v1
-        id: builder-nvidia
-
-      - name: Set up Docker Buildx VAAPI
-        uses: docker/setup-buildx-action@v1
-        id: builder-vaapi
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and push base
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-base.outputs.name }}
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ env.GIT_TAG }}-docker
-          tags: |
-            jasongdove/ersatztv:develop
-            jasongdove/ersatztv:${{ github.sha }}
-
-      - name: Build and push nvidia
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-nvidia.outputs.name }}
-          context: .
-          file: ./docker/nvidia/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ env.GIT_TAG }}-docker-nvidia
-          tags: |
-            jasongdove/ersatztv:develop-nvidia
-            jasongdove/ersatztv:${{ github.sha }}-nvidia
-
-      - name: Build and push vaapi
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-vaapi.outputs.name }}
-          context: .
-          file: ./docker/vaapi/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ env.GIT_TAG }}-docker-vaapi
-          tags: |
-            jasongdove/ersatztv:develop-vaapi
-            jasongdove/ersatztv:${{ github.sha }}-vaapi
+      - name: Extract Artifacts Version
+        shell: bash
+        run: |
+          tag=$(git describe --tags --abbrev=0)
+          short=$(git rev-parse --short HEAD)
+          final="${tag/alpha/$short}"
+          echo "ARTIFACTS_VERSION=${final}" >> $GITHUB_ENV
+          echo "INFO_VERSION=${tag:1}" >> $GITHUB_ENV
+    outputs:
+      git_tag: ${{ env.GIT_TAG }}
+      artifacts_version: ${{ env.ARTIFACTS_VERSION }}
+      info_version: ${{ env.INFO_VERSION }}
+  build_and_upload:
+    uses: jasongdove/ersatztv/.github/workflows/artifacts.yml@main
+    needs: calculate_version
+    with:
+      release_tag: develop
+      release_version: ${{ needs.calculate_version.outputs.artifacts_version }}
+      info_version: ${{ needs.calculate_version.outputs.info_version }}
+    secrets:
+      apple_developer_certificate_p12_base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+      apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+      ac_username: ${{ secrets.AC_USERNAME }}
+      ac_password: ${{ secrets.AC_PASSWORD }}
+      gh_token: ${{ secrets.GITHUB_TOKEN }}
+  build_and_push:
+    uses: jasongdove/ersatztv/.github/workflows/docker.yml@main
+    needs: calculate_version
+    with:
+      base_version: develop
+      info_version: ${{ needs.calculate_version.outputs.git_tag }}
+      tag_version: ${{ github.sha }}
+    secrets:
+      docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
+      docker_hub_access_token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -0,0 +1,88 @@
+name: Build & Publish to Docker Hub
+on:
+  workflow_call:
+    inputs:
+      base_version:
+        description: 'Base version (latest or develop)'
+        required: true
+        type: string
+      info_version:
+        description: 'Informational version number (e.g. 0.3.7-alpha)'
+        required: true
+        type: string
+      tag_version:
+        description: 'Docker tag version (e.g. v0.3.7)'
+        required: true
+        type: string
+    secrets:
+      docker_hub_username:
+        required: true
+      docker_hub_access_token:
+        required: true
+jobs:
+  build_and_push:
+    name: Build & Publish
+    runs-on: ubuntu-latest
+    if: contains(github.event.head_commit.message, '[no build]') == false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx Base
+        uses: docker/setup-buildx-action@v1
+        id: builder-base
+
+      - name: Set up Docker Buildx NVIDIA
+        uses: docker/setup-buildx-action@v1
+        id: builder-nvidia
+
+      - name: Set up Docker Buildx VAAPI
+        uses: docker/setup-buildx-action@v1
+        id: builder-vaapi
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.docker_hub_username }}
+          password: ${{ secrets.docker_hub_access_token }}
+
+      - name: Build and push base
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-base.outputs.name }}
+          context: .
+          file: ./docker/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ inputs.info_version }}-docker
+          tags: |
+            jasongdove/ersatztv:${{ inputs.base_version }}
+            jasongdove/ersatztv:${{ inputs.tag_version }}
+
+      - name: Build and push nvidia
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-nvidia.outputs.name }}
+          context: .
+          file: ./docker/nvidia/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ inputs.info_version }}-docker-nvidia
+          tags: |
+            jasongdove/ersatztv:${{ inputs.base_version }}-nvidia
+            jasongdove/ersatztv:${{ inputs.tag_version }}-nvidia
+
+      - name: Build and push vaapi
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.builder-vaapi.outputs.name }}
+          context: .
+          file: ./docker/vaapi/Dockerfile
+          push: true
+          build-args: |
+            INFO_VERSION=${{ inputs.info_version }}-docker-vaapi
+          tags: |
+            jasongdove/ersatztv:${{ inputs.base_version }}-vaapi
+            jasongdove/ersatztv:${{ inputs.tag_version }}-vaapi
@@ -3,7 +3,6 @@ on:
  push:
    branches:
      - main
-
 jobs:
  build:
    name: Deploy docs
@@ -0,0 +1,30 @@
+name: Pull Request
+on:
+  pull_request:
+jobs:
+  build_and_test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ windows-latest, ubuntu-latest, macos-latest ]
+    steps:
+      - name: Get the sources
+        uses: actions/checkout@v2
+
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
+
+      - name: Clean
+        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+
+      - name: Test
+        run: dotnet test --no-restore --verbosity normal
@@ -1,142 +1,53 @@
-name: Publish
+name: Release
 on:
  release:
    types: [ published ]
 jobs:
-  release:
-    name: Release
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            kind: linux
-            target: linux-x64
-          - os: ubuntu-latest
-            kind: linux
-            target: linux-arm
-          - os: windows-latest
-            kind: windows
-            target: win-x64
-          - os: macos-latest
-            kind: macOS
-            target: osx-x64
-          - os: macos-latest
-            kind: macOS
-            target: osx-arm64
-    runs-on: ${{ matrix.os }}
+  calculate_version:
+    name: Calculate version information
+    runs-on: ubuntu-latest
    steps:
      - name: Get the sources
        uses: actions/checkout@v2
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-
-      - name: Clean
-        run: dotnet clean --configuration Release && dotnet nuget locals all --clear
-
-      - name: Install dependencies
-        run: dotnet restore
-
-      - name: Build
-        shell: bash
-        run: |
-          # Define some variables for things we need
-          tag=$(git describe --tags --abbrev=0)
-          release_name="ErsatzTV-$tag-${{ matrix.target }}"
-
-          # Build everything
-          dotnet publish ErsatzTV/ErsatzTV.csproj --framework net6.0 --runtime "${{ matrix.target }}" -c Release -o "$release_name" /property:InformationalVersion="${tag:1}-${{ matrix.target }}" /property:EnableCompressionInSingleFile=true /property:PublishSingleFile=true --self-contained true
-
-          # Pack files
-          if [ "${{ matrix.target }}" == "win-x64" ]; then
-            7z a -tzip "${release_name}.zip" "./${release_name}/*"
-          else
-            tar czvf "${release_name}.tar.gz" "$release_name"
-          fi
-
-          # Delete output directory
-          rm -r "$release_name"
-
-      - name: Publish
-        uses: softprops/action-gh-release@v1
-        with:
-          prerelease: true
-          files: |
-            ErsatzTV*.zip
-            ErsatzTV*.tar.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  build_and_push:
-    name: Build & Publish to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
        with:
          fetch-depth: 0
-
-      - name: Extract Git Tag
+      - name: Extract Docker Tag
        shell: bash
        run: |
          tag=$(git describe --tags --abbrev=0)
          echo "GIT_TAG=${tag:1}" >> $GITHUB_ENV
          echo "DOCKER_TAG=${tag/-alpha/}" >> $GITHUB_ENV
-
-      - name: Set up Docker Buildx Base
-        uses: docker/setup-buildx-action@v1
-        id: builder-base
-
-      - name: Set up Docker Buildx NVIDIA
-        uses: docker/setup-buildx-action@v1
-        id: builder-nvidia
-
-      - name: Set up Docker Buildx VAAPI
-        uses: docker/setup-buildx-action@v1
-        id: builder-vaapi
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and push base
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-base.outputs.name }}
-          context: .
-          file: ./docker/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ env.GIT_TAG }}-docker
-          tags: |
-            jasongdove/ersatztv:latest
-            jasongdove/ersatztv:${{ env.DOCKER_TAG }}
-
-      - name: Build and push nvidia
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-nvidia.outputs.name }}
-          context: .
-          file: ./docker/nvidia/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ env.GIT_TAG }}-docker-nvidia
-          tags: |
-            jasongdove/ersatztv:latest-nvidia
-            jasongdove/ersatztv:${{ env.DOCKER_TAG }}-nvidia
-
-      - name: Build and push vaapi
-        uses: docker/build-push-action@v2
-        with:
-          builder: ${{ steps.builder-vaapi.outputs.name }}
-          context: .
-          file: ./docker/vaapi/Dockerfile
-          push: true
-          build-args: |
-            INFO_VERSION=${{ env.GIT_TAG }}-docker-vaapi
-          tags: |
-            jasongdove/ersatztv:latest-vaapi
-            jasongdove/ersatztv:${{ env.DOCKER_TAG }}-vaapi
+      - name: Extract Artifacts Version
+        shell: bash
+        run: |
+          tag=$(git describe --tags --abbrev=0)
+          echo "ARTIFACTS_VERSION=${tag}" >> $GITHUB_ENV
+          echo "INFO_VERSION=${tag:1}" >> $GITHUB_ENV
+    outputs:
+      git_tag: ${{ env.GIT_TAG }}
+      docker_tag: ${{ env.DOCKER_TAG }}
+      artifacts_version: ${{ env.ARTIFACTS_VERSION }}
+      info_version: ${{ env.INFO_VERSION }}
+  build_and_upload:
+    uses: jasongdove/ersatztv/.github/workflows/artifacts.yml@main
+    needs: calculate_version
+    with:
+      release_tag: ${{ needs.calculate_version.outputs.artifacts_version }}
+      release_version: ${{ needs.calculate_version.outputs.artifacts_version }}
+      info_version: ${{ needs.calculate_version.outputs.info_version }}
+    secrets:
+      apple_developer_certificate_p12_base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+      apple_developer_certificate_password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+      ac_username: ${{ secrets.AC_USERNAME }}
+      ac_password: ${{ secrets.AC_PASSWORD }}
+      gh_token: ${{ secrets.GITHUB_TOKEN }}
+  build_and_push:
+    uses: jasongdove/ersatztv/.github/workflows/docker.yml@main
+    needs: calculate_version
+    with:
+      base_version: latest
+      info_version: ${{ needs.calculate_version.outputs.git_tag }}
+      tag_version: ${{ needs.calculate_version.outputs.docker_tag }}
+    secrets:
+      docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
+      docker_hub_access_token: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -0,0 +1,3 @@
+[submodule "ErsatzTV-macOS"]
+	path = ErsatzTV-macOS
+	url = git@github.com:jasongdove/ErsatzTV-macOS.git
@@ -5,6 +5,97 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ## [Unreleased]

+## [0.4.1-alpha] - 2022-02-10
+### Fixed
+- Normalize smart quotes in search queries as they are unsupported by the search library
+- Fix incorrect watermark time calculations caused by working ahead in `HLS Segmenter`
+- Fix ui crash adding empty path to local library
+- Fix ui crash loading collection editor
+- Properly flag items as `File Not Found` when local library path (folder) is missing from disk
+- Fix playback bug with unknown pixel format
+- Fix playback of interlaced mpeg2video on NVIDIA, VAAPI
+
+### Added
+- Include `Series` category tag for all episodes in XMLTV
+- Include movie, episode (show), music video (artist) genres as `category` tags in XMLTV
+- Add framerate normalization to `HLS Segmenter` and `MPEG-TS` streaming modes
+- Add `HLS Segmenter Initial Segment Count` setting to allow segmenter to work ahead before allowing client playback
+
+### Changed
+- Intermittent watermarks will now fade in and out
+- Show collection name in some playout build error messages
+- Use hardware-accelerated filter for watermarks on NVIDIA
+- Use hardware-accelerated deinterlace for some content on NVIDIA
+
+## [0.4.0-alpha] - 2022-01-29
+### Fixed
+- Fix m3u `mode` query param to properly override streaming mode for all channels
+  - `segmenter` for `HLS Segmenter`
+  - `hls-direct` for `HLS Direct`
+  - `ts` for `MPEG-TS`
+  - `ts-legacy` for `MPEG-TS (Legacy)`
+  - omitting the `mode` parameter returns each channel as configured
+- Link `File Not Found` health check to `Trash` page to allow deletion
+- Fix `HLS Segmenter` streaming mode with multiple ffmpeg-based clients
+  - Jellyfin (web) and TiviMate (Android) were specifically tested
+
+### Added
+- Hide console window on macOS and Windows; tray menu can be used to access UI, logs and to stop the app
+- Also write logs to text files in the `logs` config subfolder
+- Add `added_date` to search index
+    - This requires rebuilding the search index and search results may be empty or incomplete until the rebuild is complete
+- Add `added_inthelast`, `added_notinthelast` search field for relative added date queries
+    - Syntax is a number and a unit (days, weeks, months, years) like `1 week` or `2 years`
+
+## [0.3.8-alpha] - 2022-01-23
+### Fixed
+- Fix issue preventing some versions of ffmpeg (usually 4.4.x) from streaming MPEG-TS (Legacy) channels at all
+  - The issue appears to be caused by using a thread count other than `1`
+  - Thread count is now forced to `1` for all streaming modes other than HLS Segmenter
+- Fix bug with HLS Segmenter in cultures where `.` is a group/thousands separator
+- Fix search results page crashing with some media kinds
+- Always use MPEG-TS or MPEG-TS (Legacy) streaming mode with HDHR (Plex)
+  - Other configured modes will fall back to MPEG-TS when accessed by Plex
+
+### Changed
+- Upgrade ffmpeg from 4.4 to 5.0 in all docker images
+    - Upgrading from 4.4 to 5.0 is recommended for all installations
+
+## [0.3.7-alpha] - 2022-01-17
+### Fixed
+- Fix local folder scanners to properly detect removed/re-added folders with unchanged contents
+- Fix double-click startup on mac
+- Fix trakt list sync when show does not contain a year
+- Properly unlock libraries when a scan is unable to be performed because ffmpeg or ffprobe have not been found
+
+### Added
+- Add trash system for local libraries to maintain collection and schedule integrity through media share outages
+  - When items are missing from disk, they will be flagged and present in the `Media` > `Trash` page
+  - The trash page can be used to permanently remove missing items from the database
+  - When items reappear at the expected location on disk, they will be unflagged and removed from the trash
+- Add basic Mac hardware acceleration using VideoToolbox
+
+### Changed
+- Local libraries only: when items are missing from disk, they will be added to the trash and no longer removed from collections, etc.
+- Show song thumbnail in song list
+
+## [0.3.6-alpha] - 2022-01-10
+### Fixed
+- Properly index `minutes` field when adding new items during scan (vs when rebuilding index)
+- Fix some nvenc edge cases where only padding is needed for normalization
+- Properly overwrite environment variables for ffmpeg processes (`LIBVA_DRIVER_NAME`, `FFREPORT`)
+
+### Added
+- Add music video `artist` to search index
+  - This requires rebuilding the search index and search results may be empty or incomplete until the rebuild is complete
+
+### Changed
+- Remove `HLS Hybrid` streaming mode; all channels have been reconfigured to use the superior `HLS Segmenter` streaming mode
+- Update `MPEG-TS` streaming mode to internally use the HLS segmenter
+  - This improves compatibility with many clients and also improves performance at program boundaries
+- Renamed existing `MPEG-TS` mode as `MPEG-TS (Legacy)`
+  - This mode will be removed in a future release
+
 ## [0.3.5-alpha] - 2022-01-05
 ### Fixed
 - Fix bundled ffmpeg version in base docker image (NOT nvidia or vaapi) which prevented playback since v0.3.0-alpha
@@ -34,7 +125,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [0.3.2-alpha] - 2021-12-03
 ### Fixed
 - Fix artwork upload on Windows
- Fix unicode song metadata on Windows`
+- Fix unicode song metadata on Windows
 - Fix unicode console output on Windows
 - Fix TV Show NFO metadata processing when `year` is missing
 - Fix song detail outline to help legibility on white backgrounds
@@ -876,7 +967,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Initial release to facilitate testing outside of Docker.


-[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.5-alpha...HEAD
+[Unreleased]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.1-alpha...HEAD
+[0.4.1-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.4.0-alpha...v0.4.1-alpha
+[0.4.0-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.8-alpha...v0.4.0-alpha
+[0.3.8-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.7-alpha...v0.3.8-alpha
+[0.3.7-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.6-alpha...v0.3.7-alpha
+[0.3.6-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.5-alpha...v0.3.6-alpha
 [0.3.5-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.4-alpha...v0.3.5-alpha
 [0.3.4-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.3-alpha...v0.3.4-alpha
 [0.3.3-alpha]: https://github.com/jasongdove/ErsatzTV/compare/v0.3.2-alpha...v0.3.3-alpha
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>WinExe</OutputType>
+        <TargetFramework>net6.0-windows</TargetFramework>
+        <RootNamespace>ErsatzTV_Windows</RootNamespace>
+        <Nullable>enable</Nullable>
+        <UseWindowsForms>true</UseWindowsForms>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <ApplicationIcon>Ersatztv.ico</ApplicationIcon>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Content Include="Ersatztv.ico">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Asmichi.ChildProcess" Version="0.11.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\ErsatzTV.Core\ErsatzTV.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Compile Update="Program.cs">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Compile>
+    </ItemGroup>
+
+</Project>
@@ -0,0 +1,14 @@
+namespace ErsatzTV_Windows;
+
+public static class Program
+{
+    /// <summary>
+    ///  The main entry point for the application.
+    /// </summary>
+    [STAThread]
+    public static void Main()
+    {
+        ApplicationConfiguration.Initialize();
+        Application.Run(new TrayApplicationContext());
+    }
+}
@@ -0,0 +1,77 @@
+using ErsatzTV.Core;
+using System.Diagnostics;
+using Asmichi.ProcessManagement;
+using System.Reflection;
+
+namespace ErsatzTV_Windows;
+
+public class TrayApplicationContext : ApplicationContext
+{
+    private readonly NotifyIcon _trayIcon;
+    private readonly IChildProcess? _childProcess;
+
+    public TrayApplicationContext()
+    {
+        _trayIcon = new NotifyIcon
+        {
+            Icon = new Icon("./Ersatztv.ico"),
+            ContextMenuStrip = new ContextMenuStrip(),
+            Visible = true
+        };
+
+        AddMenuItem("Launch Web UI", LaunchWebUI);
+        AddMenuItem("Show Logs", ShowLogs);
+        _trayIcon.ContextMenuStrip.Items.Add(new ToolStripSeparator());
+        AddMenuItem("Exit", Exit);
+
+        string folder = AppContext.BaseDirectory;
+        string exe = Path.Combine(folder, "ErsatzTV.exe");
+
+        if (File.Exists(exe))
+        {
+            var si = new ChildProcessStartInfo(exe);
+            _childProcess = ChildProcess.Start(si);
+        }
+    }
+
+    private void AddMenuItem(string name, EventHandler action)
+    {
+        var item = new ToolStripMenuItem(name);
+        item.Click += action;
+        _trayIcon.ContextMenuStrip.Items.Add(item);
+    }
+
+    private void LaunchWebUI(object? sender, EventArgs e)
+    {
+        var process = new Process();
+        process.StartInfo.UseShellExecute = true;
+        process.StartInfo.FileName = "http://localhost:8409";
+        process.Start();
+    }
+
+    private void ShowLogs(object? sender, EventArgs e)
+    {
+        if (!Directory.Exists(FileSystemLayout.LogsFolder))
+        {
+            Directory.CreateDirectory(FileSystemLayout.LogsFolder);
+        }
+
+        var process = new Process();
+        process.StartInfo.UseShellExecute = true;
+        process.StartInfo.FileName = FileSystemLayout.LogsFolder;
+        process.Start();
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        _childProcess?.Dispose();
+        base.Dispose(disposing);
+    }
+
+    private void Exit(object? sender, EventArgs e)
+    {
+        // Hide tray icon, otherwise it will remain shown until user mouses over it
+        _trayIcon.Visible = false;
+        Application.Exit();
+    }
+}
@@ -0,0 +1,6 @@
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Channels.Queries;
+
+public record GetChannelFramerate(string ChannelNumber) : IRequest<Option<int>>;
@@ -0,0 +1,99 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Extensions;
+using ErsatzTV.Infrastructure.Data;
+using LanguageExt;
+using MediatR;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Application.Channels.Queries;
+
+public class GetChannelFramerateHandler : IRequestHandler<GetChannelFramerate, Option<int>>
+{
+    private readonly IDbContextFactory<TvContext> _dbContextFactory;
+    private readonly ILogger<GetChannelFramerateHandler> _logger;
+
+    public GetChannelFramerateHandler(
+        IDbContextFactory<TvContext> dbContextFactory,
+        ILogger<GetChannelFramerateHandler> logger)
+    {
+        _dbContextFactory = dbContextFactory;
+        _logger = logger;
+    }
+
+    public async Task<Option<int>> Handle(GetChannelFramerate request, CancellationToken cancellationToken)
+    {
+        // TODO: expand to check everything in collection rather than what's scheduled?
+        _logger.LogDebug("Checking frame rates for channel {ChannelNumber}", request.ChannelNumber);
+        
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
+
+        List<Playout> playouts = await dbContext.Playouts
+            .Include(p => p.Items)
+            .ThenInclude(pi => pi.MediaItem)
+            .ThenInclude(mi => (mi as Movie).MediaVersions)
+            .Include(p => p.Items)
+            .ThenInclude(pi => pi.MediaItem)
+            .ThenInclude(mi => (mi as Episode).MediaVersions)
+            .Include(p => p.Items)
+            .ThenInclude(pi => pi.MediaItem)
+            .ThenInclude(mi => (mi as Song).MediaVersions)
+            .Include(p => p.Items)
+            .ThenInclude(pi => pi.MediaItem)
+            .ThenInclude(mi => (mi as MusicVideo).MediaVersions)
+            .Include(p => p.Items)
+            .ThenInclude(pi => pi.MediaItem)
+            .ThenInclude(mi => (mi as OtherVideo).MediaVersions)
+            .Filter(p => p.Channel.Number == request.ChannelNumber)
+            .ToListAsync(cancellationToken);
+
+        var frameRates = playouts.Map(p => p.Items.Map(i => i.MediaItem.GetHeadVersion()))
+            .Flatten()
+            .Map(mv => mv.RFrameRate)
+            .ToList();
+
+
+        var distinct = frameRates.Distinct().ToList();
+        if (distinct.Count > 1)
+        {
+            // TODO: something more intelligent than minimum framerate?
+            int result = frameRates.Map(ParseFrameRate).Min();
+            _logger.LogInformation(
+                "Normalizing frame rate for channel {ChannelNumber} from {Distinct} to {FrameRate}",
+                request.ChannelNumber,
+                distinct,
+                result);
+            return result;
+        }
+
+        _logger.LogInformation(
+            "All content on channel {ChannelNumber} has the same frame rate of {FrameRate}; will not normalize",
+            request.ChannelNumber,
+            distinct[0]);
+        return None;
+    }
+
+    private int ParseFrameRate(string frameRate)
+    {
+        if (!int.TryParse(frameRate, out int fr))
+        {
+            string[] split = (frameRate ?? string.Empty).Split("/");
+            if (int.TryParse(split[0], out int left) && int.TryParse(split[1], out int right))
+            {
+                fr = (int)Math.Round(left / (double)right);
+            }
+            else
+            {
+                fr = 24;
+            }
+        }
+
+        return fr;
+    }
+}
@@ -36,10 +36,14 @@ namespace ErsatzTV.Application.Channels.Queries
                        channel.StreamingMode = StreamingMode.HttpLiveStreamingDirect;
                        result.Add(channel);
                        break;
-                    case "ts":
+                    case "ts-legacy":
                        channel.StreamingMode = StreamingMode.TransportStream;
                        result.Add(channel);
                        break;
+                    case "ts":
+                        channel.StreamingMode = StreamingMode.TransportStreamHybrid;
+                        result.Add(channel);
+                        break;
                    default:
                        result.Add(channel);
                        break;
@@ -3,11 +3,10 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <NoWarn>VSTHRD200</NoWarn>
-        <DebugType>embedded</DebugType>
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="MediatR" Version="9.0.0" />
+      <PackageReference Include="MediatR" Version="10.0.1" />
      <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64">
        <PrivateAssets>all</PrivateAssets>
@@ -24,5 +24,6 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
        bool NormalizeLoudness,
        int AudioChannels,
        int AudioSampleRate,
-        bool NormalizeAudio) : IRequest<Either<BaseError, CreateFFmpegProfileResult>>;
+        bool NormalizeAudio,
+        bool NormalizeFramerate) : IRequest<Either<BaseError, CreateFFmpegProfileResult>>;
 }
@@ -58,7 +58,8 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
                    NormalizeLoudness = request.NormalizeLoudness,
                    AudioChannels = request.AudioChannels,
                    AudioSampleRate = request.AudioSampleRate,
-                    NormalizeAudio = request.NormalizeAudio
+                    NormalizeAudio = request.NormalizeAudio,
+                    NormalizeFramerate = request.NormalizeFramerate
                });

        private static Validation<BaseError, string> ValidateName(CreateFFmpegProfile createFFmpegProfile) =>
@@ -25,5 +25,6 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
        bool NormalizeLoudness,
        int AudioChannels,
        int AudioSampleRate,
-        bool NormalizeAudio) : IRequest<Either<BaseError, UpdateFFmpegProfileResult>>;
+        bool NormalizeAudio,
+        bool NormalizeFramerate) : IRequest<Either<BaseError, UpdateFFmpegProfileResult>>;
 }
@@ -50,6 +50,7 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
            p.AudioChannels = update.AudioChannels;
            p.AudioSampleRate = update.AudioSampleRate;
            p.NormalizeAudio = update.Transcode && update.NormalizeAudio;
+            p.NormalizeFramerate = update.Transcode && update.NormalizeFramerate;
            await dbContext.SaveChangesAsync();
            return new UpdateFFmpegProfileResult(p.Id);
        }
@@ -119,6 +119,10 @@ namespace ErsatzTV.Application.FFmpegProfiles.Commands
                ConfigElementKey.FFmpegWorkAheadSegmenters,
                request.Settings.WorkAheadSegmenterLimit);

+            await _configElementRepository.Upsert(
+                ConfigElementKey.FFmpegInitialSegmentCount,
+                request.Settings.InitialSegmentCount);
+
            return Unit.Default;
        }
    }
@@ -23,5 +23,6 @@ namespace ErsatzTV.Application.FFmpegProfiles
        bool NormalizeLoudness,
        int AudioChannels,
        int AudioSampleRate,
-        bool NormalizeAudio);
+        bool NormalizeAudio,
+        bool NormalizeFramerate);
 }
@@ -11,5 +11,6 @@
        public int? GlobalFallbackFillerId { get; set; }
        public int HlsSegmenterIdleTimeout { get; set; }
        public int WorkAheadSegmenterLimit { get; set; }
+        public int InitialSegmentCount { get; set; }
    }
 }
@@ -25,7 +25,8 @@ namespace ErsatzTV.Application.FFmpegProfiles
                profile.NormalizeLoudness,
                profile.AudioChannels,
                profile.AudioSampleRate,
-                profile.NormalizeAudio);
+                profile.NormalizeAudio,
+                profile.NormalizeVideo && profile.NormalizeFramerate);

        private static ResolutionViewModel Project(Resolution resolution) =>
            new(resolution.Id, resolution.Name, resolution.Width, resolution.Height);
@@ -34,6 +34,8 @@ namespace ErsatzTV.Application.FFmpegProfiles.Queries
                await _configElementRepository.GetValue<int>(ConfigElementKey.FFmpegSegmenterTimeout);
            Option<int> workAheadSegmenterLimit =
                await _configElementRepository.GetValue<int>(ConfigElementKey.FFmpegWorkAheadSegmenters);
+            Option<int> initialSegmentCount =
+                await _configElementRepository.GetValue<int>(ConfigElementKey.FFmpegInitialSegmentCount);

            var result = new FFmpegSettingsViewModel
            {
@@ -44,6 +46,7 @@ namespace ErsatzTV.Application.FFmpegProfiles.Queries
                PreferredLanguageCode = await preferredLanguageCode.IfNoneAsync("eng"),
                HlsSegmenterIdleTimeout = await hlsSegmenterIdleTimeout.IfNoneAsync(60),
                WorkAheadSegmenterLimit = await workAheadSegmenterLimit.IfNoneAsync(1),
+                InitialSegmentCount = await initialSegmentCount.IfNoneAsync(1)
            };

            foreach (int watermarkId in watermark)
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;
+using Unit = LanguageExt.Unit;
+
+namespace ErsatzTV.Application.Maintenance.Commands;
+
+public record DeleteItemsFromDatabase(List<int> MediaItemIds) : IRequest<Either<BaseError, Unit>>;
@@ -0,0 +1,38 @@
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Core.Interfaces.Search;
+using LanguageExt;
+
+namespace ErsatzTV.Application.Maintenance.Commands
+{
+    public class
+        DeleteItemsFromDatabaseHandler : MediatR.IRequestHandler<DeleteItemsFromDatabase, Either<BaseError, Unit>>
+    {
+        private readonly IMediaItemRepository _mediaItemRepository;
+        private readonly ISearchIndex _searchIndex;
+
+        public DeleteItemsFromDatabaseHandler(
+            IMediaItemRepository mediaItemRepository,
+            ISearchIndex searchIndex)
+        {
+            _mediaItemRepository = mediaItemRepository;
+            _searchIndex = searchIndex;
+        }
+
+        public async Task<Either<BaseError, Unit>> Handle(
+            DeleteItemsFromDatabase request,
+            CancellationToken cancellationToken)
+        {
+            Either<BaseError, Unit> deleteResult = await _mediaItemRepository.DeleteItems(request.MediaItemIds);
+            if (deleteResult.IsRight)
+            {
+                await _searchIndex.RemoveItems(request.MediaItemIds);
+                _searchIndex.Commit();
+            }
+
+            return deleteResult;
+        }
+    }
+}
@@ -1,5 +1,7 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
-    public record ActorCardViewModel(int Id, string Name, string Role, string Thumb) :
-        MediaCardViewModel(Id, Name, Role, Name, Thumb);
+    public record ActorCardViewModel(int Id, string Name, string Role, string Thumb, MediaItemState State) :
+        MediaCardViewModel(Id, Name, Role, Name, Thumb, State);
 }
@@ -1,10 +1,19 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record ArtistCardViewModel
-        (int ArtistId, string Title, string Subtitle, string SortTitle, string Poster) : MediaCardViewModel(
-            ArtistId,
-            Title,
-            Subtitle,
-            SortTitle,
-            Poster);
+    (
+        int ArtistId,
+        string Title,
+        string Subtitle,
+        string SortTitle,
+        string Poster,
+        MediaItemState State) : MediaCardViewModel(
+        ArtistId,
+        Title,
+        Subtitle,
+        SortTitle,
+        Poster,
+        State);
 }
@@ -2,6 +2,7 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Jellyfin;
 using LanguageExt;
 using static LanguageExt.Prelude;
@@ -19,7 +20,8 @@ namespace ErsatzTV.Application.MediaCards
                showMetadata.Title,
                showMetadata.Year?.ToString(),
                showMetadata.SortTitle,
-                GetPoster(showMetadata, maybeJellyfin, maybeEmby));
+                GetPoster(showMetadata, maybeJellyfin, maybeEmby),
+                showMetadata.Show.State);
        
        internal static TelevisionSeasonCardViewModel ProjectToViewModel(
            Season season,
@@ -34,7 +36,8 @@ namespace ErsatzTV.Application.MediaCards
                GetSeasonName(season.SeasonNumber),
                season.SeasonMetadata.HeadOrNone().Map(sm => GetPoster(sm, maybeJellyfin, maybeEmby))
                    .IfNone(string.Empty),
-                season.SeasonNumber == 0 ? "S" : season.SeasonNumber.ToString());
+                season.SeasonNumber == 0 ? "S" : season.SeasonNumber.ToString(),
+                season.State);

        internal static TelevisionSeasonCardViewModel ProjectToViewModel(
            SeasonMetadata seasonMetadata,
@@ -53,7 +56,8 @@ namespace ErsatzTV.Application.MediaCards
                GetSeasonName(seasonMetadata.Season.SeasonNumber),
                $"{showTitle}_{seasonMetadata.Season.SeasonNumber:0000}",
                GetPoster(seasonMetadata, maybeJellyfin, maybeEmby),
-                seasonMetadata.Season.SeasonNumber == 0 ? "S" : seasonMetadata.Season.SeasonNumber.ToString());
+                seasonMetadata.Season.SeasonNumber == 0 ? "S" : seasonMetadata.Season.SeasonNumber.ToString(),
+                seasonMetadata.Season.State);
        }

        internal static TelevisionEpisodeCardViewModel ProjectToViewModel(
@@ -80,7 +84,9 @@ namespace ErsatzTV.Application.MediaCards
                    ? GetEpisodePoster(episodeMetadata, maybeJellyfin, maybeEmby)
                    : GetThumbnail(episodeMetadata, maybeJellyfin, maybeEmby),
                episodeMetadata.Directors.Map(d => d.Name).ToList(),
-                episodeMetadata.Writers.Map(w => w.Name).ToList());
+                episodeMetadata.Writers.Map(w => w.Name).ToList(),
+                episodeMetadata.Episode.State,
+                episodeMetadata.Episode.GetHeadVersion().MediaFiles.Head().Path);

        internal static MovieCardViewModel ProjectToViewModel(
            MovieMetadata movieMetadata,
@@ -91,7 +97,8 @@ namespace ErsatzTV.Application.MediaCards
                movieMetadata.Title,
                movieMetadata.Year?.ToString(),
                movieMetadata.SortTitle,
-                GetPoster(movieMetadata, maybeJellyfin, maybeEmby));
+                GetPoster(movieMetadata, maybeJellyfin, maybeEmby),
+                movieMetadata.Movie.State);

        internal static MusicVideoCardViewModel ProjectToViewModel(MusicVideoMetadata musicVideoMetadata) =>
            new(
@@ -101,14 +108,17 @@ namespace ErsatzTV.Application.MediaCards
                musicVideoMetadata.SortTitle,
                musicVideoMetadata.Plot,
                musicVideoMetadata.Album,
-                GetThumbnail(musicVideoMetadata, None, None));
+                GetThumbnail(musicVideoMetadata, None, None),
+                musicVideoMetadata.MusicVideo.State,
+                musicVideoMetadata.MusicVideo.GetHeadVersion().MediaFiles.Head().Path);

        internal static OtherVideoCardViewModel ProjectToViewModel(OtherVideoMetadata otherVideoMetadata) =>
            new(
                otherVideoMetadata.OtherVideoId,
                otherVideoMetadata.Title,
                otherVideoMetadata.OriginalTitle,
-                otherVideoMetadata.SortTitle);
+                otherVideoMetadata.SortTitle,
+                otherVideoMetadata.OtherVideo.State);

        internal static SongCardViewModel ProjectToViewModel(SongMetadata songMetadata)
        {
@@ -117,7 +127,9 @@ namespace ErsatzTV.Application.MediaCards
                songMetadata.SongId,
                songMetadata.Title,
                songMetadata.Artist + album,
-                songMetadata.SortTitle);
+                songMetadata.SortTitle,
+                GetThumbnail(songMetadata, None, None),
+                songMetadata.Song.State);
        }

        internal static ArtistCardViewModel ProjectToViewModel(ArtistMetadata artistMetadata) =>
@@ -126,7 +138,8 @@ namespace ErsatzTV.Application.MediaCards
                artistMetadata.Title,
                artistMetadata.Disambiguation,
                artistMetadata.SortTitle,
-                GetThumbnail(artistMetadata, None, None));
+                GetThumbnail(artistMetadata, None, None),
+                artistMetadata.Artist.State);

        internal static CollectionCardResultsViewModel
            ProjectToViewModel(
@@ -174,7 +187,7 @@ namespace ErsatzTV.Application.MediaCards
                    .SetQueryParam("maxHeight", 440);
            }

-            return new ActorCardViewModel(actor.Id, actor.Name, actor.Role, artwork);
+            return new ActorCardViewModel(actor.Id, actor.Name, actor.Role, artwork, MediaItemState.Normal);
        }

        private static int GetCustomIndex(Collection collection, int mediaItemId) =>
@@ -1,4 +1,12 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
-    public record MediaCardViewModel(int MediaItemId, string Title, string Subtitle, string SortTitle, string Poster);
+    public record MediaCardViewModel(
+        int MediaItemId,
+        string Title,
+        string Subtitle,
+        string SortTitle,
+        string Poster,
+        MediaItemState State);
 }
@@ -1,12 +1,21 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record MovieCardViewModel
-        (int MovieId, string Title, string Subtitle, string SortTitle, string Poster) : MediaCardViewModel(
-            MovieId,
-            Title,
-            Subtitle,
-            SortTitle,
-            Poster)
+    (
+        int MovieId,
+        string Title,
+        string Subtitle,
+        string SortTitle,
+        string Poster,
+        MediaItemState State) : MediaCardViewModel(
+        MovieId,
+        Title,
+        Subtitle,
+        SortTitle,
+        Poster,
+        State)
    {
        public int CustomIndex { get; set; }
    }
@@ -1,4 +1,6 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record MusicVideoCardViewModel
    (
@@ -8,12 +10,15 @@
        string SortTitle,
        string Plot,
        string Album,
-        string Poster) : MediaCardViewModel(
+        string Poster,
+        MediaItemState State,
+        string Path) : MediaCardViewModel(
        MusicVideoId,
        Title,
        Subtitle,
        SortTitle,
-        Poster)
+        Poster,
+        State)
    {
        public int CustomIndex { get; set; }
    }
@@ -1,16 +1,20 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record OtherVideoCardViewModel
    (
        int OtherVideoId,
        string Title,
        string Subtitle,
-        string SortTitle) : MediaCardViewModel(
+        string SortTitle,
+        MediaItemState State) : MediaCardViewModel(
        OtherVideoId,
        Title,
        Subtitle,
        SortTitle,
-        null)
+        null,
+        State)
    {
        public int CustomIndex { get; set; }
    }
@@ -47,6 +47,9 @@ namespace ErsatzTV.Application.MediaCards.Queries
                .ThenInclude(i => (i as Movie).MovieMetadata)
                .ThenInclude(mm => mm.Artwork)
                .Include(c => c.MediaItems)
+                .ThenInclude(i => (i as Movie).MediaVersions)
+                .ThenInclude(mv => mv.MediaFiles)
+                .Include(c => c.MediaItems)
                .ThenInclude(i => (i as Artist).ArtistMetadata)
                .ThenInclude(mvm => mvm.Artwork)
                .Include(c => c.MediaItems)
@@ -56,6 +59,9 @@ namespace ErsatzTV.Application.MediaCards.Queries
                .ThenInclude(i => (i as MusicVideo).Artist)
                .ThenInclude(a => a.ArtistMetadata)
                .Include(c => c.MediaItems)
+                .ThenInclude(i => (i as MusicVideo).MediaVersions)
+                .ThenInclude(mv => mv.MediaFiles)
+                .Include(c => c.MediaItems)
                .ThenInclude(i => (i as Show).ShowMetadata)
                .ThenInclude(sm => sm.Artwork)
                .Include(c => c.MediaItems)
@@ -81,11 +87,20 @@ namespace ErsatzTV.Application.MediaCards.Queries
                .ThenInclude(i => (i as Episode).Season)
                .ThenInclude(s => s.SeasonMetadata)
                .Include(c => c.MediaItems)
+                .ThenInclude(i => (i as Episode).MediaVersions)
+                .ThenInclude(mv => mv.MediaFiles)
+                .Include(c => c.MediaItems)
                .ThenInclude(i => (i as OtherVideo).OtherVideoMetadata)
                .ThenInclude(ovm => ovm.Artwork)
                .Include(c => c.MediaItems)
+                .ThenInclude(i => (i as OtherVideo).MediaVersions)
+                .ThenInclude(mv => mv.MediaFiles)
+                .Include(c => c.MediaItems)
                .ThenInclude(i => (i as Song).SongMetadata)
                .ThenInclude(ovm => ovm.Artwork)
+                .Include(c => c.MediaItems)
+                .ThenInclude(i => (i as Song).MediaVersions)
+                .ThenInclude(mv => mv.MediaFiles)
                .SelectOneAsync(c => c.Id, c => c.Id == request.Id)
                .Map(c => c.ToEither(BaseError.New("Unable to load collection")))
                .MapT(c => ProjectToViewModel(c, maybeJellyfin, maybeEmby));
@@ -1,16 +1,21 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record SongCardViewModel
    (
        int SongId,
        string Title,
        string Subtitle,
-        string SortTitle) : MediaCardViewModel(
+        string SortTitle,
+        string Poster,
+        MediaItemState State) : MediaCardViewModel(
        SongId,
        Title,
        Subtitle,
        SortTitle,
-        null)
+        Poster,
+        State)
    {
        public int CustomIndex { get; set; }
    }
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ErsatzTV.Core.Domain;

 namespace ErsatzTV.Application.MediaCards
 {
@@ -17,10 +18,13 @@ namespace ErsatzTV.Application.MediaCards
        string Plot,
        string Poster,
        List<string> Directors,
-        List<string> Writers) : MediaCardViewModel(
+        List<string> Writers,
+        MediaItemState State,
+        string Path) : MediaCardViewModel(
        EpisodeId,
        Title,
        $"Episode {Episode}",
        SortTitle,
-        Poster);
+        Poster,
+        State);
 }
@@ -1,4 +1,6 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record TelevisionSeasonCardViewModel
    (
@@ -9,10 +11,12 @@
        string Subtitle,
        string SortTitle,
        string Poster,
-        string Placeholder) : MediaCardViewModel(
+        string Placeholder,
+        MediaItemState State) : MediaCardViewModel(
        TelevisionSeasonId,
        Title,
        Subtitle,
        SortTitle,
-        Poster);
+        Poster,
+        State);
 }
@@ -1,10 +1,19 @@
-namespace ErsatzTV.Application.MediaCards
+using ErsatzTV.Core.Domain;
+
+namespace ErsatzTV.Application.MediaCards
 {
    public record TelevisionShowCardViewModel
-        (int TelevisionShowId, string Title, string Subtitle, string SortTitle, string Poster) : MediaCardViewModel(
-            TelevisionShowId,
-            Title,
-            Subtitle,
-            SortTitle,
-            Poster);
+    (
+        int TelevisionShowId,
+        string Title,
+        string Subtitle,
+        string SortTitle,
+        string Poster,
+        MediaItemState State) : MediaCardViewModel(
+        TelevisionShowId,
+        Title,
+        Subtitle,
+        SortTitle,
+        Poster,
+        State);
 }
@@ -7,7 +7,7 @@ namespace ErsatzTV.Application.MediaCollections
    internal static class Mapper
    {
        internal static MediaCollectionViewModel ProjectToViewModel(Collection collection) =>
-            new(collection.Id, collection.Name, collection.UseCustomPlaybackOrder);
+            new(collection.Id, collection.Name, collection.UseCustomPlaybackOrder, MediaItemState.Normal);

        internal static MultiCollectionViewModel ProjectToViewModel(MultiCollection multiCollection) =>
            new(
@@ -1,11 +1,17 @@
 using ErsatzTV.Application.MediaCards;
+using ErsatzTV.Core.Domain;

 namespace ErsatzTV.Application.MediaCollections
 {
-    public record MediaCollectionViewModel(int Id, string Name, bool UseCustomPlaybackOrder) : MediaCardViewModel(
+    public record MediaCollectionViewModel(
+        int Id,
+        string Name,
+        bool UseCustomPlaybackOrder,
+        MediaItemState State) : MediaCardViewModel(
        Id,
        Name,
        string.Empty,
        Name,
-        string.Empty);
+        string.Empty,
+        State);
 }
@@ -21,7 +21,7 @@ namespace ErsatzTV.Application.MediaCollections.Queries
            GetCollectionById request,
            CancellationToken cancellationToken)
        {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
            return await dbContext.Collections
                .SelectOneAsync(c => c.Id, c => c.Id == request.Id)
                .MapT(ProjectToViewModel);
@@ -160,15 +160,36 @@ namespace ErsatzTV.Application.MediaSources.Commands
            return Unit.Default;
        }

-        private async Task<Validation<BaseError, RequestParameters>> Validate(IScanLocalLibrary request) =>
-            (await LocalLibraryMustExist(request), await ValidateFFprobePath(), await ValidateFFmpegPath(), await ValidateLibraryRefreshInterval())
-            .Apply(
-                (library, ffprobePath, ffmpegPath, libraryRefreshInterval) => new RequestParameters(
-                    library,
-                    ffprobePath,
-                    ffmpegPath,
-                    request.ForceScan,
-                    libraryRefreshInterval));
+        private async Task<Validation<BaseError, RequestParameters>> Validate(IScanLocalLibrary request)
+        {
+            Validation<BaseError, LocalLibrary> libraryResult = await LocalLibraryMustExist(request);
+            Validation<BaseError, string> ffprobePathResult = await ValidateFFprobePath();
+            Validation<BaseError, string> ffmpegPathResult = await ValidateFFmpegPath();
+            Validation<BaseError, int> refreshIntervalResult = await ValidateLibraryRefreshInterval();
+
+            try
+            {
+                return (libraryResult, ffprobePathResult, ffmpegPathResult, refreshIntervalResult)
+                    .Apply(
+                        (library, ffprobePath, ffmpegPath, libraryRefreshInterval) => new RequestParameters(
+                            library,
+                            ffprobePath,
+                            ffmpegPath,
+                            request.ForceScan,
+                            libraryRefreshInterval));
+            }
+            finally
+            {
+                // ensure we unlock the library if any validation is unsuccessful
+                foreach (LocalLibrary library in libraryResult.SuccessToSeq())
+                {
+                    if (ffprobePathResult.IsFail || ffmpegPathResult.IsFail || refreshIntervalResult.IsFail)
+                    {
+                        _entityLocker.UnlockLibrary(library.Id);
+                    }
+                }
+            }
+        }

        private Task<Validation<BaseError, LocalLibrary>> LocalLibraryMustExist(
            IScanLocalLibrary request) =>
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Emby;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Jellyfin;
 using Flurl;
 using LanguageExt;
@@ -34,7 +35,9 @@ namespace ErsatzTV.Application.Movies
                    .Map(a => MediaCards.Mapper.ProjectToViewModel(a, maybeJellyfin, maybeEmby))
                    .ToList(),
                metadata.Directors.Map(d => d.Name).ToList(),
-                metadata.Writers.Map(w => w.Name).ToList())
+                metadata.Writers.Map(w => w.Name).ToList(),
+                movie.GetHeadVersion().MediaFiles.Head().Path,
+                movie.State)
            {
                Poster = Artwork(metadata, ArtworkKind.Poster, maybeJellyfin, maybeEmby),
                FanArt = Artwork(metadata, ArtworkKind.FanArt, maybeJellyfin, maybeEmby)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using ErsatzTV.Application.MediaCards;
+using ErsatzTV.Core.Domain;

 namespace ErsatzTV.Application.Movies
 {
@@ -15,7 +16,9 @@ namespace ErsatzTV.Application.Movies
        List<CultureInfo> Languages,
        List<ActorCardViewModel> Actors,
        List<string> Directors,
-        List<string> Writers)
+        List<string> Writers,
+        string Path,
+        MediaItemState MediaItemState)
    {
        public string Poster { get; set; }
        public string FanArt { get; set; }
@@ -33,7 +33,7 @@ namespace ErsatzTV.Application.Movies.Queries
            GetMovieById request,
            CancellationToken cancellationToken)
        {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
            
            Option<JellyfinMediaSource> maybeJellyfin = await _mediaSourceRepository.GetAllJellyfin()
                .Map(list => list.HeadOrNone());
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.FFmpeg;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Repositories;
@@ -50,7 +51,7 @@ namespace ErsatzTV.Application.Streaming.Commands
            TimeSpan idleTimeout = await _configElementRepository
                .GetValue<int>(ConfigElementKey.FFmpegSegmenterTimeout)
                .Map(maybeTimeout => maybeTimeout.Match(i => TimeSpan.FromSeconds(i), () => TimeSpan.FromMinutes(1)));
-            
+
            using IServiceScope scope = _serviceScopeFactory.CreateScope();
            HlsSessionWorker worker = scope.ServiceProvider.GetRequiredService<HlsSessionWorker>();
            _ffmpegSegmenterService.SessionWorkers.AddOrUpdate(request.ChannelNumber, _ => worker, (_, _) => worker);
@@ -68,12 +69,32 @@ namespace ErsatzTV.Application.Streaming.Commands
                request.ChannelNumber,
                "live.m3u8");

+            IConfigElementRepository repo = scope.ServiceProvider.GetRequiredService<IConfigElementRepository>();
+            int initialSegmentCount = await repo.GetValue<int>(ConfigElementKey.FFmpegInitialSegmentCount)
+                .Map(maybeCount => maybeCount.Match(identity, () => 1));
+
+            await WaitForPlaylistSegments(playlistFileName, initialSegmentCount, worker);
+
+            return Unit.Default;
+        }
+
+        private static async Task WaitForPlaylistSegments(string playlistFileName, int initialSegmentCount, IHlsSessionWorker worker)
+        {
            while (!File.Exists(playlistFileName))
            {
                await Task.Delay(TimeSpan.FromMilliseconds(100));
            }

-            return Unit.Default;
+            var segmentCount = 0;
+            while (segmentCount < initialSegmentCount)
+            {
+                await Task.Delay(TimeSpan.FromMilliseconds(200));
+                
+                DateTimeOffset now = DateTimeOffset.Now.AddSeconds(-30);
+                string[] input = await File.ReadAllLinesAsync(playlistFileName);
+                TrimPlaylistResult result = HlsPlaylistFilter.TrimPlaylist(worker.PlaylistStart, now, input);
+                segmentCount = result.SegmentCount;
+            }
        }

        private Task<Validation<BaseError, Unit>> Validate(StartFFmpegSession request) =>
@@ -1,9 +1,11 @@
 using System;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Timers;
+using ErsatzTV.Application.Channels.Queries;
 using ErsatzTV.Application.Streaming.Queries;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
@@ -29,6 +31,7 @@ namespace ErsatzTV.Application.Streaming
        private Timer _timer;
        private readonly object _sync = new();
        private DateTimeOffset _playlistStart;
+        private Option<int> _targetFramerate;

        public HlsSessionWorker(IServiceScopeFactory serviceScopeFactory, ILogger<HlsSessionWorker> logger)
        {
@@ -65,6 +68,13 @@ namespace ErsatzTV.Application.Streaming
                CancellationToken cancellationToken = cts.Token;

                _logger.LogInformation("Starting HLS session for channel {Channel}", channelNumber);
+                
+                using IServiceScope scope = _serviceScopeFactory.CreateScope();
+                IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();
+
+                _targetFramerate = await mediator.Send(
+                    new GetChannelFramerate(channelNumber),
+                    cancellationToken);

                Touch();
                _transcodedUntil = DateTimeOffset.Now;
@@ -132,12 +142,17 @@ namespace ErsatzTV.Application.Streaming
                using IServiceScope scope = _serviceScopeFactory.CreateScope();
                IMediator mediator = scope.ServiceProvider.GetRequiredService<IMediator>();

+                long ptsOffset = await GetPtsOffset(mediator, channelNumber, cancellationToken);
+                // _logger.LogInformation("PTS offset: {PtsOffset}", ptsOffset);
+
                var request = new GetPlayoutItemProcessByChannelNumber(
                    channelNumber,
                    "segmenter",
                    firstProcess ? DateTimeOffset.Now : _transcodedUntil.AddSeconds(1),
                    !firstProcess,
-                    realtime);
+                    realtime,
+                    ptsOffset,
+                    _targetFramerate);

                // _logger.LogInformation("Request {@Request}", request);

@@ -216,21 +231,58 @@ namespace ErsatzTV.Application.Streaming
                await File.WriteAllTextAsync(playlistFileName, trimResult.Playlist, cancellationToken);

                // delete old segments
-                foreach (string file in Directory.GetFiles(
-                    Path.Combine(FileSystemLayout.TranscodeFolder, channelNumber),
-                    "*.ts"))
+                var allSegments = Directory.GetFiles(
+                        Path.Combine(FileSystemLayout.TranscodeFolder, channelNumber),
+                        "live*.ts")
+                    .Map(
+                        file =>
+                        {
+                            string fileName = Path.GetFileName(file);
+                            var sequenceNumber = int.Parse(fileName.Replace("live", string.Empty).Split('.')[0]);
+                            return new Segment(file, sequenceNumber);
+                        })
+                    .ToList();
+
+                var toDelete = allSegments.Filter(s => s.SequenceNumber < trimResult.Sequence).ToList();
+                // if (toDelete.Count > 0)
+                // {
+                    // _logger.LogInformation(
+                    //     "Deleting HLS segments {Min} to {Max} (less than {StartSequence})",
+                    //     toDelete.Map(s => s.SequenceNumber).Min(),
+                    //     toDelete.Map(s => s.SequenceNumber).Max(),
+                    //     trimResult.Sequence);
+                // }
+                    
+                foreach (Segment segment in toDelete)
                {
-                    string fileName = Path.GetFileName(file);
-                    if (fileName.StartsWith("live") && int.Parse(fileName.Replace("live", string.Empty).Split('.')[0]) <
-                        trimResult.Sequence)
-                    {
-                        File.Delete(file);
-                    }
+                    File.Delete(segment.File);
                }

                _playlistStart = trimResult.PlaylistStart;
            }
        }
+        
+        private async Task<long> GetPtsOffset(IMediator mediator, string channelNumber, CancellationToken cancellationToken)
+        {
+            var directory = new DirectoryInfo(Path.Combine(FileSystemLayout.TranscodeFolder, channelNumber));
+            Option<FileInfo> lastSegment =
+                Optional(directory.GetFiles("*.ts").OrderByDescending(f => f.Name).FirstOrDefault());
+
+            long result = 0;
+            foreach (FileInfo segment in lastSegment)
+            {
+                Either<BaseError, PtsAndDuration> queryResult = await mediator.Send(
+                    new GetLastPtsDuration(segment.FullName),
+                    cancellationToken);
+
+                foreach (PtsAndDuration ptsAndDuration in queryResult.RightToSeq())
+                {
+                    result = ptsAndDuration.Pts + ptsAndDuration.Duration;
+                }
+            }
+
+            return result;
+        }

        private async Task<int> GetWorkAheadLimit()
        {
@@ -239,5 +291,7 @@ namespace ErsatzTV.Application.Streaming
            return await repo.GetValue<int>(ConfigElementKey.FFmpegWorkAheadSegmenters)
                .Map(maybeCount => maybeCount.Match(identity, () => 1));
        }
+
+        private record Segment(string File, int SequenceNumber);
    }
 }
@@ -0,0 +1,12 @@
+namespace ErsatzTV.Application.Streaming;
+
+public record PtsAndDuration(long Pts, long Duration)
+{
+    public static PtsAndDuration From(string ffprobeLine)
+    {
+        string[] split = ffprobeLine.Split("|");
+        var left = long.Parse(split[0]);
+        var right = long.Parse(split[1]);
+        return new PtsAndDuration(left, right);
+    }
+}
@@ -23,7 +23,7 @@ namespace ErsatzTV.Application.Streaming.Queries

        public async Task<Either<BaseError, PlayoutItemProcessModel>> Handle(T request, CancellationToken cancellationToken)
        {
-            await using TvContext dbContext = _dbContextFactory.CreateDbContext();
+            await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken);
            Validation<BaseError, Tuple<Channel, string>> validation = await Validate(dbContext, request);
            return await validation.Match(
                tuple => GetProcess(dbContext, request, tuple.Item1, tuple.Item2),
@@ -56,7 +56,8 @@ namespace ErsatzTV.Application.Streaming.Queries
                        {
                            "hls-direct" => StreamingMode.HttpLiveStreamingDirect,
                            "segmenter" => StreamingMode.HttpLiveStreamingSegmenter,
-                            "ts" => StreamingMode.TransportStream,
+                            "ts" => StreamingMode.TransportStreamHybrid,
+                            "ts-legacy" => StreamingMode.TransportStream,
                            _ => channel.StreamingMode
                        };

@@ -11,5 +11,6 @@ namespace ErsatzTV.Application.Streaming.Queries
        string Mode,
        DateTimeOffset Now,
        bool StartAtZero,
-        bool HlsRealtime) : IRequest<Either<BaseError, PlayoutItemProcessModel>>;
+        bool HlsRealtime,
+        long PtsOffset) : IRequest<Either<BaseError, PlayoutItemProcessModel>>;
 }
@@ -6,10 +6,11 @@ namespace ErsatzTV.Application.Streaming.Queries
    {
        public GetConcatProcessByChannelNumber(string scheme, string host, string channelNumber) : base(
            channelNumber,
-            "ts",
+            "ts-legacy",
            DateTimeOffset.Now,
            false,
-            true)
+            true,
+            0)
        {
            Scheme = scheme;
            Host = host;
@@ -0,0 +1,7 @@
+using ErsatzTV.Core;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Streaming.Queries;
+
+public record GetLastPtsDuration(string FileName) : IRequest<Either<BaseError, PtsAndDuration>>;
@@ -0,0 +1,87 @@
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.Repositories;
+using LanguageExt;
+using MediatR;
+
+namespace ErsatzTV.Application.Streaming.Queries;
+
+public class GetLastPtsDurationHandler : IRequestHandler<GetLastPtsDuration, Either<BaseError, PtsAndDuration>>
+{
+    private readonly IConfigElementRepository _configElementRepository;
+
+    public GetLastPtsDurationHandler(IConfigElementRepository configElementRepository)
+    {
+        _configElementRepository = configElementRepository;
+    }
+
+    public async Task<Either<BaseError, PtsAndDuration>> Handle(
+        GetLastPtsDuration request,
+        CancellationToken cancellationToken)
+    {
+        Validation<BaseError, RequestParameters> validation = await Validate(request);
+        return await validation.Match(
+            Handle,
+            error => Task.FromResult<Either<BaseError, PtsAndDuration>>(error.Join()));
+    }
+
+    private async Task<Validation<BaseError, RequestParameters>> Validate(GetLastPtsDuration request) =>
+        await ValidateFFprobePath()
+            .MapT(
+                ffprobePath => new RequestParameters(
+                    request.FileName,
+                    ffprobePath));
+
+    private async Task<Either<BaseError, PtsAndDuration>> Handle(RequestParameters parameters)
+    {
+        var startInfo = new ProcessStartInfo
+        {
+            FileName = parameters.FFprobePath,
+            RedirectStandardOutput = true,
+            RedirectStandardError = true,
+            UseShellExecute = false,
+            StandardOutputEncoding = Encoding.UTF8,
+            StandardErrorEncoding = Encoding.UTF8
+        };
+
+        startInfo.ArgumentList.Add("-v");
+        startInfo.ArgumentList.Add("0");
+        startInfo.ArgumentList.Add("-show_entries");
+        startInfo.ArgumentList.Add("packet=pts,duration");
+        startInfo.ArgumentList.Add("-of");
+        startInfo.ArgumentList.Add("compact=p=0:nk=1");
+        startInfo.ArgumentList.Add("-read_intervals");
+        startInfo.ArgumentList.Add("-999999");
+        startInfo.ArgumentList.Add(parameters.FileName);
+
+        var probe = new Process
+        {
+            StartInfo = startInfo
+        };
+
+        probe.Start();
+        return await probe.StandardOutput.ReadToEndAsync().MapAsync<string, Either<BaseError, PtsAndDuration>>(
+            async output =>
+            {
+                await probe.WaitForExitAsync();
+                return probe.ExitCode == 0
+                    ? PtsAndDuration.From(output.Split("\n").Filter(s => !string.IsNullOrWhiteSpace(s)).Last().Trim())
+                    : BaseError.New($"FFprobe at {parameters.FFprobePath} exited with code {probe.ExitCode}");
+            });
+    }
+
+    private Task<Validation<BaseError, string>> ValidateFFprobePath() =>
+        _configElementRepository.GetValue<string>(ConfigElementKey.FFprobePath)
+            .FilterT(File.Exists)
+            .Map(
+                ffprobePath =>
+                    ffprobePath.ToValidation<BaseError>("FFprobe path does not exist on the file system"));
+
+    private record RequestParameters(string FileName, string FFprobePath);
+}
@@ -1,21 +1,18 @@
 using System;
+using LanguageExt;

 namespace ErsatzTV.Application.Streaming.Queries
 {
-    public record GetPlayoutItemProcessByChannelNumber : FFmpegProcessRequest
-    {
-        public GetPlayoutItemProcessByChannelNumber(
-            string channelNumber,
-            string mode,
-            DateTimeOffset now,
-            bool startAtZero,
-            bool hlsRealtime) : base(
-            channelNumber,
-            mode,
-            now,
-            startAtZero,
-            hlsRealtime)
-        {
-        }
-    }
+    public record GetPlayoutItemProcessByChannelNumber(string ChannelNumber,
+        string Mode,
+        DateTimeOffset Now,
+        bool StartAtZero,
+        bool HlsRealtime,
+        long PtsOffset,
+        Option<int> TargetFramerate) : FFmpegProcessRequest(ChannelNumber,
+        Mode,
+        Now,
+        StartAtZero,
+        HlsRealtime,
+        PtsOffset);
 }
@@ -158,7 +158,9 @@ namespace ErsatzTV.Application.Streaming.Queries
                        request.HlsRealtime,
                        playoutItemWithPath.PlayoutItem.FillerKind,
                        playoutItemWithPath.PlayoutItem.InPoint,
-                        playoutItemWithPath.PlayoutItem.OutPoint);
+                        playoutItemWithPath.PlayoutItem.OutPoint,
+                        request.PtsOffset,
+                        request.TargetFramerate);

                    var result = new PlayoutItemProcessModel(process, playoutItemWithPath.PlayoutItem.FinishOffset);

@@ -193,7 +195,8 @@ namespace ErsatzTV.Application.Streaming.Queries
                                    channel,
                                    maybeDuration,
                                    "Channel is Offline",
-                                    request.HlsRealtime);
+                                    request.HlsRealtime,
+                                    request.PtsOffset);
                                
                                return new PlayoutItemProcessModel(errorProcess, finish);
                            }
@@ -212,7 +215,8 @@ namespace ErsatzTV.Application.Streaming.Queries
                                    channel,
                                    maybeDuration,
                                    error.Value,
-                                    request.HlsRealtime);
+                                    request.HlsRealtime,
+                                    request.PtsOffset);

                                return new PlayoutItemProcessModel(errorProcess, finish);
                            }
@@ -231,7 +235,8 @@ namespace ErsatzTV.Application.Streaming.Queries
                                    channel,
                                    maybeDuration,
                                    "Channel is Offline",
-                                    request.HlsRealtime);
+                                    request.HlsRealtime,
+                                    request.PtsOffset);

                                return new PlayoutItemProcessModel(errorProcess, finish);
                            }
@@ -0,0 +1,22 @@
+using System;
+
+namespace ErsatzTV.Application.Streaming.Queries
+{
+    public record GetWrappedProcessByChannelNumber : FFmpegProcessRequest
+    {
+        public GetWrappedProcessByChannelNumber(string scheme, string host, string channelNumber) : base(
+            channelNumber,
+            "ts",
+            DateTimeOffset.Now,
+            false,
+            true,
+            0)
+        {
+            Scheme = scheme;
+            Host = host;
+        }
+
+        public string Scheme { get; }
+        public string Host { get; }
+    }
+}
@@ -0,0 +1,46 @@
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using ErsatzTV.Core;
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Interfaces.FFmpeg;
+using ErsatzTV.Infrastructure.Data;
+using ErsatzTV.Infrastructure.Extensions;
+using LanguageExt;
+using Microsoft.EntityFrameworkCore;
+
+namespace ErsatzTV.Application.Streaming.Queries
+{
+    public class GetWrappedProcessByChannelNumberHandler : FFmpegProcessHandler<GetWrappedProcessByChannelNumber>
+    {
+        private readonly IFFmpegProcessService _ffmpegProcessService;
+
+        public GetWrappedProcessByChannelNumberHandler(
+            IDbContextFactory<TvContext> dbContextFactory,
+            IFFmpegProcessService ffmpegProcessService)
+            : base(dbContextFactory)
+        {
+            _ffmpegProcessService = ffmpegProcessService;
+        }
+
+        protected override async Task<Either<BaseError, PlayoutItemProcessModel>> GetProcess(
+            TvContext dbContext,
+            GetWrappedProcessByChannelNumber request,
+            Channel channel,
+            string ffmpegPath)
+        {
+            bool saveReports = await dbContext.ConfigElements
+                .GetValue<bool>(ConfigElementKey.FFmpegSaveReports)
+                .Map(result => result.IfNone(false));
+
+            Process process = _ffmpegProcessService.WrapSegmenter(
+                ffmpegPath,
+                saveReports,
+                channel,
+                request.Scheme,
+                request.Host);
+
+            return new PlayoutItemProcessModel(process, DateTimeOffset.MaxValue);
+        }
+    }
+}
@@ -6,7 +6,7 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="FluentAssertions" Version="6.3.0" />
+      <PackageReference Include="FluentAssertions" Version="6.4.0" />
      <PackageReference Include="LanguageExt.Core" Version="4.0.3" />
      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
@@ -16,7 +16,7 @@
      </PackageReference>
      <PackageReference Include="Moq" Version="4.16.1" />
      <PackageReference Include="NUnit" Version="3.13.2" />
-      <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
+      <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
      <PackageReference Include="Serilog" Version="2.10.0" />
      <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
      <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.FFmpeg;
 using FluentAssertions;
@@ -183,7 +184,7 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                ChannelWatermarkLocation.TopLeft,
                false,
                100,
-                "[0:0][1:v]overlay=x=134:y=54:enable='lt(mod(mod(time(0),60*60),10*60),15)'[v]",
+                "[1:v]format=yuva420p|yuva444p|yuva422p|rgba|abgr|bgra|gbrap|ya8,fade=in:st=300:d=1:alpha=1:enable='between(t,0,314)',fade=out:st=315:d=1:alpha=1:enable='between(t,301,899)',fade=in:st=900:d=1:alpha=1:enable='between(t,316,914)',fade=out:st=915:d=1:alpha=1:enable='between(t,901,1499)',fade=in:st=1500:d=1:alpha=1:enable='between(t,916,1514)',fade=out:st=1515:d=1:alpha=1:enable='between(t,1501,2099)',fade=in:st=2100:d=1:alpha=1:enable='between(t,1516,2114)',fade=out:st=2115:d=1:alpha=1:enable='between(t,2101,2699)',fade=in:st=2700:d=1:alpha=1:enable='between(t,2116,2714)',fade=out:st=2715:d=1:alpha=1:enable='between(t,2701,3300)'[wmp];[0:0][wmp]overlay=x=134:y=54,format=nv12[v]",
                "0:1",
                "[v]")]
            [TestCase(
@@ -257,23 +258,36 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                string expectedAudioLabel,
                string expectedVideoLabel)
            {
+                var watermark = new ChannelWatermark
+                {
+                    Mode = intermittent
+                        ? ChannelWatermarkMode.Intermittent
+                        : ChannelWatermarkMode.Permanent,
+                    DurationSeconds = intermittent ? 15 : 0,
+                    FrequencyMinutes = intermittent ? 10 : 0,
+                    Location = location,
+                    Size = scaled ? ChannelWatermarkSize.Scaled : ChannelWatermarkSize.ActualSize,
+                    WidthPercent = scaled ? 20 : 0,
+                    Opacity = opacity,
+                    HorizontalMarginPercent = 7,
+                    VerticalMarginPercent = 5
+                };
+
+                Option<List<FadePoint>> maybeFadePoints = watermark.Mode == ChannelWatermarkMode.Intermittent
+                    ? Some(
+                        WatermarkCalculator.CalculateFadePoints(
+                            new DateTimeOffset(2022, 01, 31, 12, 25, 0, TimeSpan.FromHours(-5)),
+                            TimeSpan.Zero,
+                            TimeSpan.FromMinutes(55),
+                            TimeSpan.Zero,
+                            watermark.FrequencyMinutes,
+                            watermark.DurationSeconds))
+                    : None;
+                
                FFmpegComplexFilterBuilder builder = new FFmpegComplexFilterBuilder()
                    .WithWatermark(
-                        Some(
-                            new ChannelWatermark
-                            {
-                                Mode = intermittent
-                                    ? ChannelWatermarkMode.Intermittent
-                                    : ChannelWatermarkMode.Permanent,
-                                DurationSeconds = intermittent ? 15 : 0,
-                                FrequencyMinutes = intermittent ? 10 : 0,
-                                Location = location,
-                                Size = scaled ? ChannelWatermarkSize.Scaled : ChannelWatermarkSize.ActualSize,
-                                WidthPercent = scaled ? 20 : 0,
-                                Opacity = opacity,
-                                HorizontalMarginPercent = 7,
-                                VerticalMarginPercent = 5
-                            }),
+                        Some(watermark),
+                        maybeFadePoints,
                        new Resolution { Width = 1920, Height = 1080 },
                        None)
                    .WithDeinterlace(deinterlace)
@@ -290,6 +304,213 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                        filter.VideoLabel.Should().Be(expectedVideoLabel);
                    });
            }
+            
+            [Test]
+            [TestCase(
+                false,
+                false,
+                false,
+                ChannelWatermarkLocation.BottomLeft,
+                false,
+                100,
+                "[0:0]scale_cuda=format=yuv420p[vt];[1:v]format=yuva420p,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=H-h-54[v]",
+                "0:1",
+                "[v]",
+                false)]
+            [TestCase(
+                false,
+                false,
+                false,
+                ChannelWatermarkLocation.BottomLeft,
+                false,
+                100,
+                "[0:0]scale_cuda=1920:1080,setsar=1,hwdownload,format=nv12,format=yuv420p,hwupload_cuda[vt];[1:v]format=yuva420p,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=H-h-54,hwupload[v]",
+                "0:1",
+                "[v]",
+                true)]
+            [TestCase(
+                false,
+                false,
+                true,
+                ChannelWatermarkLocation.TopLeft,
+                false,
+                100,
+                "[0:0]scale_cuda=format=yuv420p[vt];[1:v]format=yuva420p,fade=in:st=300:d=1:alpha=1:enable='between(t,0,314)',fade=out:st=315:d=1:alpha=1:enable='between(t,301,899)',fade=in:st=900:d=1:alpha=1:enable='between(t,316,914)',fade=out:st=915:d=1:alpha=1:enable='between(t,901,1499)',fade=in:st=1500:d=1:alpha=1:enable='between(t,916,1514)',fade=out:st=1515:d=1:alpha=1:enable='between(t,1501,2099)',fade=in:st=2100:d=1:alpha=1:enable='between(t,1516,2114)',fade=out:st=2115:d=1:alpha=1:enable='between(t,2101,2699)',fade=in:st=2700:d=1:alpha=1:enable='between(t,2116,2714)',fade=out:st=2715:d=1:alpha=1:enable='between(t,2701,3300)',hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54[v]",
+                "0:1",
+                "[v]",
+                false)]
+            [TestCase(
+                false,
+                false,
+                true,
+                ChannelWatermarkLocation.TopLeft,
+                false,
+                100,
+                "[0:0]scale_cuda=1920:1080,setsar=1,hwdownload,format=nv12,format=yuv420p,hwupload_cuda[vt];[1:v]format=yuva420p,fade=in:st=300:d=1:alpha=1:enable='between(t,0,314)',fade=out:st=315:d=1:alpha=1:enable='between(t,301,899)',fade=in:st=900:d=1:alpha=1:enable='between(t,316,914)',fade=out:st=915:d=1:alpha=1:enable='between(t,901,1499)',fade=in:st=1500:d=1:alpha=1:enable='between(t,916,1514)',fade=out:st=1515:d=1:alpha=1:enable='between(t,1501,2099)',fade=in:st=2100:d=1:alpha=1:enable='between(t,1516,2114)',fade=out:st=2115:d=1:alpha=1:enable='between(t,2101,2699)',fade=in:st=2700:d=1:alpha=1:enable='between(t,2116,2714)',fade=out:st=2715:d=1:alpha=1:enable='between(t,2701,3300)',hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54,hwupload[v]",
+                "0:1",
+                "[v]",
+                true)]
+            [TestCase(
+                false,
+                false,
+                false,
+                ChannelWatermarkLocation.TopLeft,
+                true,
+                100,
+                "[0:0]scale_cuda=format=yuv420p[vt];[1:v]format=yuva420p,scale=384:-1,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54[v]",
+                "0:1",
+                "[v]",
+                false)]
+            [TestCase(
+                false,
+                false,
+                false,
+                ChannelWatermarkLocation.TopLeft,
+                true,
+                100,
+                "[0:0]scale_cuda=1920:1080,setsar=1,hwdownload,format=nv12,format=yuv420p,hwupload_cuda[vt];[1:v]format=yuva420p,scale=384:-1,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54,hwupload[v]",
+                "0:1",
+                "[v]",
+                true)]
+            [TestCase(
+                false,
+                false,
+                false,
+                ChannelWatermarkLocation.TopLeft,
+                false,
+                90,
+                "[0:0]scale_cuda=format=yuv420p[vt];[1:v]format=yuva420p,colorchannelmixer=aa=0.90,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54[v]",
+                "0:1",
+                "[v]",
+                false)]
+            [TestCase(
+                false,
+                false,
+                false,
+                ChannelWatermarkLocation.TopLeft,
+                false,
+                90,
+                "[0:0]scale_cuda=1920:1080,setsar=1,hwdownload,format=nv12,format=yuv420p,hwupload_cuda[vt];[1:v]format=yuva420p,colorchannelmixer=aa=0.90,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54,hwupload[v]",
+                "0:1",
+                "[v]",
+                true)]            
+            // TODO: do we need these anymore? interlaced content that isn't handled by mpeg2_cuvid?
+            // [TestCase(
+            //     false,
+            //     true,
+            //     false,
+            //     ChannelWatermarkLocation.TopLeft,
+            //     false,
+            //     100,
+            //     "[0:0]yadif=1[vt];[vt][1:v]overlay=x=134:y=54[v]",
+            //     "0:1",
+            //     "[v]")]
+            // [TestCase(
+            //     false,
+            //     true,
+            //     false,
+            //     ChannelWatermarkLocation.TopLeft,
+            //     true,
+            //     100,
+            //     "[0:0]yadif=1[vt];[1:v]scale=384:-1[wmp];[vt][wmp]overlay=x=134:y=54[v]",
+            //     "0:1",
+            //     "[v]")]
+            // [TestCase(
+            //     true,
+            //     true,
+            //     false,
+            //     ChannelWatermarkLocation.TopLeft,
+            //     false,
+            //     100,
+            //     "[0:1]apad=whole_dur=3300000ms[a];[0:0]yadif=1[vt];[vt][1:v]overlay=x=134:y=54[v]",
+            //     "[a]",
+            //     "[v]")]
+            [TestCase(
+                true,
+                false,
+                false,
+                ChannelWatermarkLocation.TopLeft,
+                false,
+                100,
+                "[0:1]apad=whole_dur=3300000ms[a];[0:0]scale_cuda=format=yuv420p[vt];[1:v]format=yuva420p,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54[v]",
+                "[a]",
+                "[v]",
+                false)]
+            [TestCase(
+                true,
+                false,
+                false,
+                ChannelWatermarkLocation.TopLeft,
+                false,
+                100,
+                "[0:1]apad=whole_dur=3300000ms[a];[0:0]scale_cuda=1920:1080,setsar=1,hwdownload,format=nv12,format=yuv420p,hwupload_cuda[vt];[1:v]format=yuva420p,hwupload_cuda[wmp];[vt][wmp]overlay_cuda=x=134:y=54,hwupload[v]",
+                "[a]",
+                "[v]",
+                true)]
+            public void Should_Return_NVENC_Watermark(
+                bool alignAudio,
+                bool deinterlace,
+                bool intermittent,
+                ChannelWatermarkLocation location,
+                bool scaled,
+                int opacity,
+                string expectedVideoFilter,
+                string expectedAudioLabel,
+                string expectedVideoLabel,
+                bool scaledSource)
+            {
+                var watermark = new ChannelWatermark
+                {
+                    Mode = intermittent
+                        ? ChannelWatermarkMode.Intermittent
+                        : ChannelWatermarkMode.Permanent,
+                    DurationSeconds = intermittent ? 15 : 0,
+                    FrequencyMinutes = intermittent ? 10 : 0,
+                    Location = location,
+                    Size = scaled ? ChannelWatermarkSize.Scaled : ChannelWatermarkSize.ActualSize,
+                    WidthPercent = scaled ? 20 : 0,
+                    Opacity = opacity,
+                    HorizontalMarginPercent = 7,
+                    VerticalMarginPercent = 5
+                };
+
+                Option<List<FadePoint>> maybeFadePoints = watermark.Mode == ChannelWatermarkMode.Intermittent
+                    ? Some(
+                        WatermarkCalculator.CalculateFadePoints(
+                            new DateTimeOffset(2022, 01, 31, 12, 25, 0, TimeSpan.FromHours(-5)),
+                            TimeSpan.Zero,
+                            TimeSpan.FromMinutes(55),
+                            TimeSpan.Zero,
+                            watermark.FrequencyMinutes,
+                            watermark.DurationSeconds))
+                    : None;
+                
+                FFmpegComplexFilterBuilder builder = new FFmpegComplexFilterBuilder()
+                    .WithHardwareAcceleration(HardwareAccelerationKind.Nvenc)
+                    .WithWatermark(
+                        Some(watermark),
+                        maybeFadePoints,
+                        new Resolution { Width = 1920, Height = 1080 },
+                        None)
+                    .WithDeinterlace(deinterlace)
+                    .WithAlignedAudio(alignAudio ? Some(TimeSpan.FromMinutes(55)) : None);
+
+                if (scaledSource)
+                {
+                    builder = builder.WithScaling(new Resolution { Width = 1920, Height = 1080 });
+                }
+
+                Option<FFmpegComplexFilter> result = builder.Build(false, 0, 0, 0, 1, false);
+
+                result.IsSome.Should().BeTrue();
+                result.IfSome(
+                    filter =>
+                    {
+                        filter.ComplexFilter.Should().Be(expectedVideoFilter);
+                        filter.AudioLabel.Should().Be(expectedAudioLabel);
+                        filter.VideoLabel.Should().Be(expectedVideoLabel);
+                    });
+            }

            [Test]
            [TestCase(true, false, false, "[0:0]deinterlace_qsv[v]", "[v]")]
@@ -409,7 +630,8 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            {
                FFmpegComplexFilterBuilder builder = new FFmpegComplexFilterBuilder()
                    .WithHardwareAcceleration(HardwareAccelerationKind.Nvenc)
-                    .WithDeinterlace(deinterlace);
+                    .WithDeinterlace(deinterlace)
+                    .WithInputPixelFormat("h264");

                if (scale)
                {
@@ -4,6 +4,7 @@ using ErsatzTV.Core.FFmpeg;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using FluentAssertions;
 using NUnit.Framework;
+using static LanguageExt.Prelude;

 namespace ErsatzTV.Core.Tests.FFmpeg
 {
@@ -16,10 +17,33 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            private readonly FFmpegPlaybackSettingsCalculator _calculator;

            public CalculateSettings() => _calculator = new FFmpegPlaybackSettingsCalculator();
+            
+            [Test]
+            public void Should_Not_GenPts_ForHlsSegmenter()
+            {
+                FFmpegProfile ffmpegProfile = TestProfile();
+
+                FFmpegPlaybackSettings actual = _calculator.CalculateSettings(
+                    StreamingMode.HttpLiveStreamingSegmenter,
+                    ffmpegProfile,
+                    new MediaVersion(),
+                    new MediaStream(),
+                    new MediaStream(),
+                    DateTimeOffset.Now,
+                    DateTimeOffset.Now,
+                    TimeSpan.Zero,
+                    TimeSpan.Zero,
+                    false,
+                    None);
+
+                actual.FormatFlags.Should().NotContain("+genpts");
+            }

            [Test]
-            public void Should_UseSpecifiedThreadCount_ForTransportStream()
+            public void Should_Not_UseSpecifiedThreadCount_ForTransportStream()
            {
+                // MPEG-TS requires realtime output which is hardcoded to a single thread
+                
                FFmpegProfile ffmpegProfile = TestProfile() with { ThreadCount = 7 };

                FFmpegPlaybackSettings actual = _calculator.CalculateSettings(
@@ -31,18 +55,20 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

-                actual.ThreadCount.Should().Be(7);
+                actual.ThreadCount.Should().Be(1);
            }

            [Test]
-            public void Should_UseSpecifiedThreadCount_ForHttpLiveStreaming()
+            public void Should_UseSpecifiedThreadCount_ForHttpLiveStreamingSegmenter()
            {
                FFmpegProfile ffmpegProfile = TestProfile() with { ThreadCount = 7 };

                FFmpegPlaybackSettings actual = _calculator.CalculateSettings(
-                    StreamingMode.HttpLiveStreamingDirect,
+                    StreamingMode.HttpLiveStreamingSegmenter,
                    ffmpegProfile,
                    new MediaVersion(),
                    new MediaStream(),
@@ -50,7 +76,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ThreadCount.Should().Be(7);
            }
@@ -69,7 +97,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                string[] expected = { "+genpts", "+discardcorrupt", "+igndts" };
                actual.FormatFlags.Count.Should().Be(expected.Length);
@@ -90,7 +120,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                string[] expected = { "+genpts", "+discardcorrupt", "+igndts" };
                actual.FormatFlags.Count.Should().Be(expected.Length);
@@ -111,7 +143,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.RealtimeOutput.Should().BeTrue();
            }
@@ -130,7 +164,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.RealtimeOutput.Should().BeTrue();
            }
@@ -151,7 +187,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    now,
                    now.AddMinutes(5),
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.StreamSeek.IsSome.Should().BeTrue();
                actual.StreamSeek.IfNone(TimeSpan.Zero).Should().Be(TimeSpan.FromMinutes(5));
@@ -173,7 +211,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    now,
                    now.AddMinutes(5),
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.StreamSeek.IsSome.Should().BeTrue();
                actual.StreamSeek.IfNone(TimeSpan.Zero).Should().Be(TimeSpan.FromMinutes(5));
@@ -193,7 +233,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
            }
@@ -219,7 +261,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
            }
@@ -245,7 +289,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
            }
@@ -271,7 +317,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -299,7 +347,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeTrue();
@@ -326,7 +376,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                IDisplaySize scaledSize = actual.ScaledSize.IfNone(new MediaVersion { Width = 0, Height = 0 });
                scaledSize.Width.Should().Be(1280);
@@ -356,7 +408,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -384,7 +438,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -413,7 +469,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeTrue();
@@ -445,7 +503,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -477,7 +537,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -508,7 +570,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -540,7 +604,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -574,7 +640,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -606,7 +674,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeTrue();
@@ -637,7 +707,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -667,7 +739,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeTrue();
@@ -699,7 +773,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.ScaledSize.IsNone.Should().BeTrue();
                actual.PadToDesiredResolution.Should().BeFalse();
@@ -727,7 +803,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioCodec.Should().Be("aac");
            }
@@ -752,7 +830,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioCodec.Should().Be("copy");
            }
@@ -778,7 +858,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioCodec.Should().Be("aac");
            }
@@ -804,7 +886,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioCodec.Should().Be("copy");
            }
@@ -831,7 +915,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioBitrate.IfNone(0).Should().Be(2424);
            }
@@ -858,7 +944,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioBufferSize.IfNone(0).Should().Be(2424);
            }
@@ -885,7 +973,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioChannels.IfNone(0).Should().Be(6);
            }
@@ -912,7 +1002,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioSampleRate.IfNone(0).Should().Be(48);
            }
@@ -938,7 +1030,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioChannels.IfNone(0).Should().Be(6);
            }
@@ -964,7 +1058,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.AudioSampleRate.IfNone(0).Should().Be(48);
            }
@@ -991,7 +1087,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.FromMinutes(2));
+                    TimeSpan.FromMinutes(2),
+                    false,
+                    None);

                actual.AudioDuration.IfNone(TimeSpan.MinValue).Should().Be(TimeSpan.FromMinutes(2));
            }
@@ -1017,7 +1115,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.NormalizeLoudness.Should().BeTrue();
            }
@@ -1043,7 +1143,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.NormalizeLoudness.Should().BeFalse();
            }
@@ -1071,7 +1173,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                    DateTimeOffset.Now,
                    DateTimeOffset.Now,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    None);

                actual.HardwareAcceleration.Should().Be(HardwareAccelerationKind.Qsv);
            }
@@ -37,8 +37,26 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            Assert.Pass();
        }

+        public enum Padding
+        {
+            NoPadding,
+            WithPadding
+        }
+
        private class TestData
        {
+            public static Padding[] Paddings =
+            {
+                Padding.NoPadding,
+                Padding.WithPadding
+            };
+
+            public static VideoScanKind[] VideoScanKinds =
+            {
+                VideoScanKind.Progressive,
+                VideoScanKind.Interlaced
+            };
+            
            public static string[] InputCodecs =
            {
                "h264",
@@ -51,9 +69,9 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            {
                "yuv420p",
                "yuv420p10le",
-                "yuvj420p",
-                "yuv444p",
-                "yuv444p10le"
+                // "yuvj420p",
+                // "yuv444p",
+                // "yuv444p10le"
            };
            
            public static Resolution[] Resolutions =
@@ -94,6 +112,17 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            {
                HardwareAccelerationKind.Vaapi
            };
+
+            public static string[] VideoToolboxCodecs =
+            {
+                "h264_videotoolbox",
+                "hevc_videotoolbox"
+            };
+
+            public static HardwareAccelerationKind[] VideoToolboxAcceleration =
+            {
+                HardwareAccelerationKind.VideoToolbox
+            };
        }

        [Test, Combinatorial]
@@ -104,21 +133,32 @@ namespace ErsatzTV.Core.Tests.FFmpeg
            string inputPixelFormat,
            [ValueSource(typeof(TestData), nameof(TestData.Resolutions))]
            Resolution profileResolution,
+            [ValueSource(typeof(TestData), nameof(TestData.Paddings))]
+            Padding padding,
+            [ValueSource(typeof(TestData), nameof(TestData.VideoScanKinds))]
+            VideoScanKind videoScanKind,
            // [ValueSource(typeof(TestData), nameof(TestData.SoftwareCodecs))] string profileCodec,
            // [ValueSource(typeof(TestData), nameof(TestData.NoAcceleration))] HardwareAccelerationKind profileAcceleration)
            [ValueSource(typeof(TestData), nameof(TestData.NvidiaCodecs))] string profileCodec,
            [ValueSource(typeof(TestData), nameof(TestData.NvidiaAcceleration))] HardwareAccelerationKind profileAcceleration)
            // [ValueSource(typeof(TestData), nameof(TestData.VaapiCodecs))] string profileCodec,
            // [ValueSource(typeof(TestData), nameof(TestData.VaapiAcceleration))] HardwareAccelerationKind profileAcceleration)
+            // [ValueSource(typeof(TestData), nameof(TestData.VideoToolboxCodecs))] string profileCodec,
+            // [ValueSource(typeof(TestData), nameof(TestData.VideoToolboxAcceleration))] HardwareAccelerationKind profileAcceleration)
        {
            string name = GetStringSha256Hash(
-                $"{inputCodec}_{inputPixelFormat}_{profileResolution}_{profileCodec}_{profileAcceleration}");
+                $"{inputCodec}_{inputPixelFormat}_{videoScanKind}_{padding}_{profileResolution}_{profileCodec}_{profileAcceleration}");

            string file = Path.Combine(TestContext.CurrentContext.TestDirectory, $"{name}.mkv");
            if (!File.Exists(file))
            {
-                var args =
-                    $"-y -f lavfi -i anullsrc=channel_layout=stereo:sample_rate=44100 -f lavfi -i testsrc=duration=1:size=1920x1080:rate=30 -c:a aac -c:v {inputCodec} -shortest -pix_fmt {inputPixelFormat} -strict -2 {file}";
+                string resolution = padding == Padding.WithPadding ? "1920x1060" : "1920x1080";
+
+                string videoFilter = videoScanKind == VideoScanKind.Interlaced ? "-vf tinterlace=interleave_top,fieldorder=tff" : string.Empty;
+                string flags = videoScanKind == VideoScanKind.Interlaced ? "-flags +ildct+ilme" : string.Empty;
+                
+                string args =
+                    $"-y -f lavfi -i anoisesrc=color=brown -f lavfi -i testsrc=duration=1:size={resolution}:rate=30 {videoFilter} -c:a aac -c:v {inputCodec} -shortest -pix_fmt {inputPixelFormat} -strict -2 {flags} {file}";
                var p1 = new Process
                {
                    StartInfo = new ProcessStartInfo
@@ -146,8 +186,8 @@ namespace ErsatzTV.Core.Tests.FFmpeg

            var metadataRepository = new Mock<IMetadataRepository>();
            metadataRepository
-                .Setup(r => r.UpdateLocalStatistics(It.IsAny<int>(), It.IsAny<MediaVersion>(), It.IsAny<bool>()))
-                .Callback<int, MediaVersion, bool>((_, version, _) => v = version);
+                .Setup(r => r.UpdateLocalStatistics(It.IsAny<MediaItem>(), It.IsAny<MediaVersion>(), It.IsAny<bool>()))
+                .Callback<MediaItem, MediaVersion, bool>((_, version, _) => v = version);

            var localStatisticsProvider = new LocalStatisticsProvider(
                metadataRepository.Object,
@@ -197,9 +237,13 @@ namespace ErsatzTV.Core.Tests.FFmpeg
                false,
                FillerKind.None,
                TimeSpan.Zero,
-                TimeSpan.FromSeconds(5));
+                TimeSpan.FromSeconds(5),
+                0,
+                None);

            process.StartInfo.RedirectStandardError = true;
+            
+            // Console.WriteLine($"ffmpeg arguments {string.Join(" ", process.StartInfo.ArgumentList)}");

            process.Start().Should().BeTrue();

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using ErsatzTV.Core.FFmpeg;
+using FluentAssertions;
+using NUnit.Framework;
+using static LanguageExt.Prelude;
+
+namespace ErsatzTV.Core.Tests.FFmpeg;
+
+[TestFixture]
+public class WatermarkCalculatorTests
+{
+    [Test]
+    public void EntireVideoBetweenWatermarks_ShouldReturn_EmptyFadePointList()
+    {
+        List<FadePoint> actual = WatermarkCalculator.CalculateFadePoints(
+            new DateTimeOffset(2022, 01, 31, 13, 34, 00, TimeSpan.FromHours(-5)),
+            TimeSpan.Zero,
+            TimeSpan.FromMinutes(5),
+            None,
+            15,
+            10);
+
+        actual.Should().HaveCount(0);
+    }
+}
@@ -44,7 +44,7 @@ namespace ErsatzTV.Core.Tests.Fakes
                .IfNone(SystemTime.MinValueUtc);

        public bool IsLibraryPathAccessible(LibraryPath libraryPath) =>
-            _files.Any(f => f.Path.StartsWith(libraryPath.Path + Path.DirectorySeparatorChar));
+            _folders.Any(f => f.Path == libraryPath.Path);

        public IEnumerable<string> ListSubdirectories(string folder) =>
            _folders.Map(f => f.Path).Filter(f => f.StartsWith(folder) && Directory.GetParent(f)?.FullName == folder);
@@ -53,6 +53,7 @@ namespace ErsatzTV.Core.Tests.Fakes
            _files.Map(f => f.Path).Filter(f => Path.GetDirectoryName(f) == folder);

        public bool FileExists(string path) => _files.Any(f => f.Path == path);
+        public bool FolderExists(string folder) => false;

        public Task<byte[]> ReadAllBytes(string path) => TestBytes.AsTask();

@@ -37,5 +37,6 @@ namespace ErsatzTV.Core.Tests.Fakes
            throw new NotSupportedException();

        public Task<bool> IsCustomPlaybackOrder(int collectionId) => false.AsTask();
+        public Task<Option<string>> GetNameFromKey(CollectionKey emptyCollection) => Option<string>.None.AsTask();
    }
 }
@@ -6,7 +6,6 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
-using ErsatzTV.Core.FFmpeg;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -54,6 +53,10 @@ namespace ErsatzTV.Core.Tests.Metadata
                _movieRepository.Setup(x => x.FindMoviePaths(It.IsAny<LibraryPath>()))
                    .Returns(new List<string>().AsEnumerable().AsTask());

+                _mediaItemRepository = new Mock<IMediaItemRepository>();
+                _mediaItemRepository.Setup(x => x.FlagFileNotFound(It.IsAny<LibraryPath>(), It.IsAny<string>()))
+                    .Returns(new List<int>().AsTask());
+
                _localStatisticsProvider = new Mock<ILocalStatisticsProvider>();
                _localMetadataProvider = new Mock<ILocalMetadataProvider>();

@@ -73,28 +76,11 @@ namespace ErsatzTV.Core.Tests.Metadata
            }

            private Mock<IMovieRepository> _movieRepository;
+            private Mock<IMediaItemRepository> _mediaItemRepository;
            private Mock<ILocalStatisticsProvider> _localStatisticsProvider;
            private Mock<ILocalMetadataProvider> _localMetadataProvider;
            private Mock<IImageCache> _imageCache;

-            [Test]
-            public async Task Missing_Folder()
-            {
-                MovieFolderScanner service = GetService(
-                    new FakeFileEntry(Path.Combine(FakeRoot, Path.Combine("Movie (2020)", "Movie (2020).mkv")))
-                );
-                var libraryPath = new LibraryPath { Path = BadFakeRoot, LibraryFolders = new List<LibraryFolder>() };
-
-                Either<BaseError, Unit> result = await service.ScanFolder(
-                    libraryPath,
-                    FFprobePath,
-                    0,
-                    1);
-
-                result.IsLeft.Should().BeTrue();
-                result.IfLeft(error => error.Should().BeOfType<MediaSourceInaccessible>());
-            }
-
            [Test]
            public async Task NewMovie_Statistics_And_FallbackMetadata(
                [ValueSource(typeof(LocalFolderScanner), nameof(LocalFolderScanner.VideoFileExtensions))]
@@ -535,6 +521,9 @@ namespace ErsatzTV.Core.Tests.Metadata
            [Test]
            public async Task RenamedMovie_Should_Delete_Old_Movie()
            {
+                // TODO: handle this case more elegantly
+                // ideally, detect that the movie was renamed and still delete the old one (or update the path?)
+
                string movieFolder = Path.Combine(FakeRoot, "Movie (2020)");
                string oldMoviePath = Path.Combine(movieFolder, "Movie (2020).avi");

@@ -557,12 +546,14 @@ namespace ErsatzTV.Core.Tests.Metadata

                result.IsRight.Should().BeTrue();

-                _movieRepository.Verify(x => x.DeleteByPath(It.IsAny<LibraryPath>(), It.IsAny<string>()), Times.Once);
-                _movieRepository.Verify(x => x.DeleteByPath(libraryPath, oldMoviePath), Times.Once);
+                _mediaItemRepository.Verify(
+                    x => x.FlagFileNotFound(It.IsAny<LibraryPath>(), It.IsAny<string>()),
+                    Times.Once);
+                _mediaItemRepository.Verify(x => x.FlagFileNotFound(libraryPath, oldMoviePath), Times.Once);
            }

            [Test]
-            public async Task DeletedMovieAndFolder_Should_Delete_Old_Movie()
+            public async Task DeletedMovieAndFolder_Should_Flag_File_Not_Found()
            {
                string movieFolder = Path.Combine(FakeRoot, "Movie (2020)");
                string oldMoviePath = Path.Combine(movieFolder, "Movie (2020).avi");
@@ -570,10 +561,8 @@ namespace ErsatzTV.Core.Tests.Metadata
                _movieRepository.Setup(x => x.FindMoviePaths(It.IsAny<LibraryPath>()))
                    .Returns(new List<string> { oldMoviePath }.AsEnumerable().AsTask());

-                string moviePath = Path.Combine(movieFolder, "Movie (2020).mkv");
-
                MovieFolderScanner service = GetService(
-                    new FakeFileEntry(moviePath) { LastWriteTime = DateTime.Now }
+                    new FakeFolderEntry(FakeRoot)
                );
                var libraryPath = new LibraryPath
                    { Id = 1, Path = FakeRoot, LibraryFolders = new List<LibraryFolder>() };
@@ -586,11 +575,12 @@ namespace ErsatzTV.Core.Tests.Metadata

                result.IsRight.Should().BeTrue();

-                _movieRepository.Verify(x => x.DeleteByPath(It.IsAny<LibraryPath>(), It.IsAny<string>()), Times.Once);
-                _movieRepository.Verify(x => x.DeleteByPath(libraryPath, oldMoviePath), Times.Once);
+                _mediaItemRepository.Verify(
+                    x => x.FlagFileNotFound(It.IsAny<LibraryPath>(), It.IsAny<string>()),
+                    Times.Once);
+                _mediaItemRepository.Verify(x => x.FlagFileNotFound(libraryPath, oldMoviePath), Times.Once);
            }

-
            private MovieFolderScanner GetService(params FakeFileEntry[] files) =>
                new(
                    new FakeLocalFileSystem(new List<FakeFileEntry>(files)),
@@ -602,6 +592,25 @@ namespace ErsatzTV.Core.Tests.Metadata
                    new Mock<ISearchIndex>().Object,
                    new Mock<ISearchRepository>().Object,
                    new Mock<ILibraryRepository>().Object,
+                    _mediaItemRepository.Object,
+                    new Mock<IMediator>().Object,
+                    null,
+                    new Mock<ITempFilePool>().Object,
+                    new Mock<ILogger<MovieFolderScanner>>().Object
+                );
+            
+            private MovieFolderScanner GetService(params FakeFolderEntry[] folders) =>
+                new(
+                    new FakeLocalFileSystem(new List<FakeFileEntry>(), new List<FakeFolderEntry>(folders)),
+                    _movieRepository.Object,
+                    _localStatisticsProvider.Object,
+                    _localMetadataProvider.Object,
+                    new Mock<IMetadataRepository>().Object,
+                    _imageCache.Object,
+                    new Mock<ISearchIndex>().Object,
+                    new Mock<ISearchRepository>().Object,
+                    new Mock<ILibraryRepository>().Object,
+                    _mediaItemRepository.Object,
                    new Mock<IMediator>().Object,
                    null,
                    new Mock<ITempFilePool>().Object,
@@ -79,7 +79,7 @@ namespace ErsatzTV.Core.Tests.Scheduling
            playoutItems[2].FillerKind.Should().Be(FillerKind.None);
        }
        
-                [Test]
+        [Test]
        public void Should_Fill_Exactly_To_Next_Schedule_Item_Flood()
        {
            Collection collectionOne = TwoItemCollection(1, 2, TimeSpan.FromHours(1));
@@ -16,6 +16,7 @@
        public static ConfigElementKey FFmpegGlobalFallbackFillerId => new("ffmpeg.global_fallback_filler_id");
        public static ConfigElementKey FFmpegSegmenterTimeout => new("ffmpeg.segmenter.timeout_seconds");
        public static ConfigElementKey FFmpegWorkAheadSegmenters => new("ffmpeg.segmenter.work_ahead_limit");
+        public static ConfigElementKey FFmpegInitialSegmentCount => new("ffmpeg.segmenter.initial_segment_count");
        public static ConfigElementKey SearchIndexVersion => new("search_index.version");
        public static ConfigElementKey HDHRTunerCount => new("hdhr.tuner_count");
        public static ConfigElementKey ChannelsPageSize => new("pages.channels.page_size");
@@ -24,6 +24,7 @@ namespace ErsatzTV.Core.Domain
        public int AudioChannels { get; set; }
        public int AudioSampleRate { get; set; }
        public bool NormalizeAudio { get; set; }
+        public bool NormalizeFramerate { get; set; }

        public static FFmpegProfile New(string name, Resolution resolution) =>
            new()
@@ -5,6 +5,7 @@
        None = 0,
        Qsv = 1,
        Nvenc = 2,
-        Vaapi = 3
+        Vaapi = 3,
+        VideoToolbox = 4
    }
 }
@@ -1,14 +1,14 @@
 using System.Collections.Generic;

-namespace ErsatzTV.Core.Domain
+namespace ErsatzTV.Core.Domain;
+
+public class MediaItem
 {
-    public class MediaItem
-    {
-        public int Id { get; set; }
-        public int LibraryPathId { get; set; }
-        public LibraryPath LibraryPath { get; set; }
-        public List<Collection> Collections { get; set; }
-        public List<CollectionItem> CollectionItems { get; set; }
-        public List<TraktListItem> TraktListItems { get; set; }
-    }
-}
+    public int Id { get; set; }
+    public int LibraryPathId { get; set; }
+    public LibraryPath LibraryPath { get; set; }
+    public List<Collection> Collections { get; set; }
+    public List<CollectionItem> CollectionItems { get; set; }
+    public List<TraktListItem> TraktListItems { get; set; }
+    public MediaItemState State { get; set; }
+}
@@ -0,0 +1,7 @@
+namespace ErsatzTV.Core.Domain;
+
+public enum MediaItemState
+{
+    Normal = 0,
+    FileNotFound = 1
+}
@@ -4,7 +4,8 @@
    {
        TransportStream = 1,
        HttpLiveStreamingDirect = 2,
-        HttpLiveStreamingHybrid = 3,
-        HttpLiveStreamingSegmenter = 4
+//        HttpLiveStreamingHybrid = 3,
+        HttpLiveStreamingSegmenter = 4,
+        TransportStreamHybrid = 5
    }
 }
@@ -1,10 +0,0 @@
-namespace ErsatzTV.Core.Errors
-{
-    public class MediaSourceInaccessible : BaseError
-    {
-        public MediaSourceInaccessible()
-            : base("Media source is not accessible or missing")
-        {
-        }
-    }
-}
@@ -3,13 +3,12 @@
    <PropertyGroup>
        <TargetFramework>net6.0</TargetFramework>
        <NoWarn>VSTHRD200</NoWarn>
-        <DebugType>embedded</DebugType>
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Flurl" Version="3.0.2" />
+      <PackageReference Include="Flurl" Version="3.0.4" />
      <PackageReference Include="LanguageExt.Core" Version="4.0.3" />
-      <PackageReference Include="MediatR" Version="9.0.0" />
+      <PackageReference Include="MediatR" Version="10.0.1" />
      <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
      <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
      <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.0.64">
@@ -22,8 +22,10 @@ namespace ErsatzTV.Core.FFmpeg
        private IDisplaySize _resolution;
        private Option<IDisplaySize> _scaleToSize = None;
        private Option<ChannelWatermark> _watermark;
+        private Option<List<FadePoint>> _maybeFadePoints = None;
        private Option<int> _watermarkIndex;
        private string _pixelFormat;
+        private string _videoDecoder;
        private string _videoEncoder;
        private Option<string> _subtitle;
        private bool _boxBlur;
@@ -74,6 +76,12 @@ namespace ErsatzTV.Core.FFmpeg
            return this;
        }

+        public FFmpegComplexFilterBuilder WithDecoder(string decoder)
+        {
+            _videoDecoder = decoder;
+            return this;
+        }
+
        public FFmpegComplexFilterBuilder WithInputPixelFormat(Option<string> maybePixelFormat)
        {
            foreach (string pixelFormat in maybePixelFormat)
@@ -86,10 +94,12 @@ namespace ErsatzTV.Core.FFmpeg

        public FFmpegComplexFilterBuilder WithWatermark(
            Option<ChannelWatermark> watermark,
+            Option<List<FadePoint>> maybeFadePoints,
            IDisplaySize resolution,
            Option<int> watermarkIndex)
        {
            _watermark = watermark;
+            _maybeFadePoints = maybeFadePoints;
            _resolution = resolution;
            _watermarkIndex = watermarkIndex;
            return this;
@@ -133,23 +143,45 @@ namespace ErsatzTV.Core.FFmpeg

        public Option<FFmpegComplexFilter> Build(bool videoOnly, int videoInput, int videoStreamIndex, int audioInput, Option<int> audioStreamIndex, bool isSong)
        {
+            // since .Contains is used on pixel format, we need it to be not null
+            _pixelFormat ??= string.Empty;
+            
            var complexFilter = new StringBuilder();

-            var videoLabel = $"{videoInput}:{(isSong ? "v" : videoStreamIndex.ToString())}";
+            string videoLabel = $"{videoInput}:{(isSong ? "v" : videoStreamIndex.ToString())}";
            string audioLabel = audioStreamIndex.Match(index => $"{audioInput}:{index}", () => "0:a");

            HardwareAccelerationKind acceleration = _hardwareAccelerationKind.IfNone(HardwareAccelerationKind.None);
+
            bool isHardwareDecode = acceleration switch
            {
-                HardwareAccelerationKind.Vaapi => !isSong && _inputCodec != "mpeg4",
-                HardwareAccelerationKind.Nvenc => !isSong,
+                HardwareAccelerationKind.Vaapi => !isSong && _inputCodec != "mpeg4" &&
+                                                  (_deinterlace == false || !_pixelFormat.Contains("p10le")),
+
+                // we need an initial hwupload_cuda when only padding with these pixel formats
+                HardwareAccelerationKind.Nvenc when _scaleToSize.IsNone && _padToSize.IsSome =>
+                    !isSong && !_pixelFormat.Contains("p10le") && !_pixelFormat.Contains("444"),
+
+                HardwareAccelerationKind.Nvenc => !isSong &&
+                                                  (string.IsNullOrWhiteSpace(_videoDecoder) ||
+                                                   _videoDecoder.Contains("cuvid")),
                HardwareAccelerationKind.Qsv => !isSong,
+                HardwareAccelerationKind.VideoToolbox => false,
                _ => false
            };

+            bool nvencDeinterlace = acceleration == HardwareAccelerationKind.Nvenc && _videoDecoder == "mpeg2_cuvid" &&
+                                    _deinterlace; 
+            // mpeg2_cuvid will handle deinterlace and is "not" a hardware decode
+            if (nvencDeinterlace)
+            {
+                _deinterlace = false;
+                isHardwareDecode = false;
+            }
+
            var audioFilterQueue = new List<string>();
            var videoFilterQueue = new List<string>();
-            string watermarkPreprocess = string.Empty;
+            var watermarkPreprocess = new List<string>();
            string watermarkOverlay = string.Empty;
            
            if (_normalizeLoudness)
@@ -164,9 +196,11 @@ namespace ErsatzTV.Core.FFmpeg
                    audioFilterQueue.Add($"apad=whole_dur={durationString}ms");
                });

-            bool usesHardwareFilters = acceleration != HardwareAccelerationKind.None && !isHardwareDecode &&
+            bool usesHardwareFilters = acceleration != HardwareAccelerationKind.None &&
+                                       acceleration != HardwareAccelerationKind.VideoToolbox &&
+                                       !isHardwareDecode &&
                                       (_deinterlace || _scaleToSize.IsSome);
-            
+
            if (isSong)
            {
                switch (acceleration)
@@ -201,15 +235,17 @@ namespace ErsatzTV.Core.FFmpeg

            if (_deinterlace)
            {
-                string filter = acceleration switch
+                Option<string> maybeFilter = acceleration switch
                {
                    HardwareAccelerationKind.Qsv => "deinterlace_qsv",
+                    HardwareAccelerationKind.Nvenc when !usesHardwareFilters && _pixelFormat.Contains("p10le") =>
+                        "hwupload_cuda,yadif_cuda",
                    HardwareAccelerationKind.Nvenc => "yadif_cuda",
                    HardwareAccelerationKind.Vaapi => "deinterlace_vaapi",
                    _ => "yadif=1"
                };

-                if (!string.IsNullOrWhiteSpace(filter))
+                foreach (string filter in maybeFilter)
                {
                    videoFilterQueue.Add(filter);
                }
@@ -217,9 +253,9 @@ namespace ErsatzTV.Core.FFmpeg

            string[] h264hevc = { "h264", "hevc" };

-            if (acceleration == HardwareAccelerationKind.Vaapi && (_pixelFormat ?? string.Empty).EndsWith("p10le") &&
-                h264hevc.Contains(_inputCodec)
-                && (_pixelFormat != "yuv420p10le" || _inputCodec != "hevc"))
+            if (_deinterlace == false && acceleration == HardwareAccelerationKind.Vaapi &&
+                (_pixelFormat ?? string.Empty).EndsWith("p10le") &&
+                h264hevc.Contains(_inputCodec) && (_pixelFormat != "yuv420p10le" || _inputCodec != "hevc"))
            {
                videoFilterQueue.Add("format=p010le,format=nv12|vaapi,hwupload");
            }
@@ -229,66 +265,65 @@ namespace ErsatzTV.Core.FFmpeg
                videoFilterQueue.Add("format=nv12|vaapi,hwupload");
            }

-            _scaleToSize.IfSome(
-                size =>
-                {
-                    string filter = acceleration switch
-                    {
-                        HardwareAccelerationKind.Qsv => $"scale_qsv=w={size.Width}:h={size.Height}",
-                        HardwareAccelerationKind.Nvenc when _pixelFormat is "yuv420p10le" =>
-                            $"hwupload_cuda,scale_cuda={size.Width}:{size.Height}",
-                        HardwareAccelerationKind.Nvenc => $"scale_cuda={size.Width}:{size.Height}",
-                        HardwareAccelerationKind.Vaapi => $"scale_vaapi=format=nv12:w={size.Width}:h={size.Height}",
-                        _ when videoOnly => $"scale={size.Width}:{size.Height}:force_original_aspect_ratio=increase,crop={size.Width}:{size.Height}",
-                        _ => $"scale={size.Width}:{size.Height}:flags=fast_bilinear"
-                    };
-
-                    if (!string.IsNullOrWhiteSpace(filter))
-                    {
-                        videoFilterQueue.Add(filter);
-                    }
-                });
-
            bool scaleOrPad = _scaleToSize.IsSome || _padToSize.IsSome;
            bool usesSoftwareFilters = _padToSize.IsSome || _watermark.IsSome;
+            bool hasFadePoints = _maybeFadePoints.Map(fp => fp.Count).IfNone(0) > 0;

-            if (scaleOrPad && _boxBlur == false)
-            {
-                videoFilterQueue.Add("setsar=1");
-            }
-
+            var softwareFilterQueue = new List<string>();
            if (usesSoftwareFilters)
            {
                if (acceleration != HardwareAccelerationKind.None && (isHardwareDecode || usesHardwareFilters))
                {
-                    videoFilterQueue.Add("hwdownload");
-                    string format = acceleration switch
+                    Option<string> maybeFormat = acceleration switch
                    {
                        HardwareAccelerationKind.Vaapi => "format=nv12|vaapi",
+                        HardwareAccelerationKind.Nvenc when _padToSize.IsNone || nvencDeinterlace => None,
                        HardwareAccelerationKind.Nvenc when _pixelFormat == "yuv420p10le" =>
                            "format=p010le,format=nv12",
                        HardwareAccelerationKind.Qsv when isSong => "format=nv12,format=yuv420p",
                        _ when isSong => "format=yuv420p",
                        _ => "format=nv12"
                    };
-                    videoFilterQueue.Add(format);
+
+                    foreach (string format in maybeFormat)
+                    {
+                        softwareFilterQueue.Add("hwdownload");
+                        softwareFilterQueue.Add(format);
+                    }
+
+                    if (nvencDeinterlace)
+                    {
+                        softwareFilterQueue.Add("hwdownload");
+                    }
                }
-                
+
                if (_boxBlur)
                {
-                    videoFilterQueue.Add("boxblur=40");
+                    softwareFilterQueue.Add("boxblur=40");
                }

                if (videoOnly)
                {
-                    videoFilterQueue.Add("deband");
+                    softwareFilterQueue.Add("deband");
                }

                foreach (ChannelWatermark watermark in _watermark)
                {
-                    string enable = watermark.Mode == ChannelWatermarkMode.Intermittent
-                        ? $":enable='lt(mod(mod(time(0),60*60),{watermark.FrequencyMinutes}*60),{watermark.DurationSeconds})'"
-                        : string.Empty;
+                    Option<string> maybeFormats = acceleration switch
+                    {
+                        // overlay_cuda only supports alpha with yuva420p 
+                        HardwareAccelerationKind.Nvenc => "yuva420p",
+
+                        _ when watermark.Opacity != 100 || hasFadePoints =>
+                            "yuva420p|yuva444p|yuva422p|rgba|abgr|bgra|gbrap|ya8",
+
+                        _ => None
+                    };
+
+                    foreach (string formats in maybeFormats)
+                    {
+                        watermarkPreprocess.Add($"format={formats}");
+                    }

                    double horizontalMargin = Math.Round(watermark.HorizontalMarginPercent / 100.0 * _resolution.Width);
                    double verticalMargin = Math.Round(watermark.VerticalMarginPercent / 100.0 * _resolution.Height);
@@ -305,49 +340,47 @@ namespace ErsatzTV.Core.FFmpeg
                        _ => $"x=W-w-{horizontalMargin}:y=H-h-{verticalMargin}"
                    };

+                    if (watermark.Opacity != 100)
+                    {
+                        double opacity = watermark.Opacity / 100.0;
+                        watermarkPreprocess.Add($"colorchannelmixer=aa={opacity:F2}");
+                    }
+
                    if (watermark.Size == ChannelWatermarkSize.Scaled)
                    {
                        double width = Math.Round(watermark.WidthPercent / 100.0 * _resolution.Width);
-                        watermarkPreprocess = $"scale={width}:-1";
+                        watermarkPreprocess.Add($"scale={width}:-1");
                    }
-                    
-                    if (watermark.Opacity != 100)
+
+                    foreach (List<FadePoint> fadePoints in _maybeFadePoints)
                    {
-                        const string FORMATS = "yuva420p|yuva444p|yuva422p|rgba|abgr|bgra|gbrap|ya8"; 
-                        string join = string.Empty;
-                        double opacity = watermark.Opacity / 100.0;
-                        if (!string.IsNullOrWhiteSpace(watermarkPreprocess))
-                        {
-                            join = ",";
-                        }
-
-                        watermarkPreprocess = $"format={FORMATS},colorchannelmixer=aa={opacity:F2}{join}{watermarkPreprocess}";
+                        watermarkPreprocess.AddRange(fadePoints.Map(fp => fp.ToFilter()));
                    }

-                    watermarkOverlay = $"overlay={position}{enable}";
+                    if (acceleration == HardwareAccelerationKind.Nvenc)
+                    {
+                        watermarkPreprocess.Add("hwupload_cuda");
+                    }
+
+                    watermarkOverlay = acceleration switch
+                    {
+                        HardwareAccelerationKind.Nvenc => $"overlay_cuda={position}",
+                        _ => $"overlay={position}"
+                    };
+
+                    if (hasFadePoints && acceleration != HardwareAccelerationKind.Nvenc)
+                    {
+                        watermarkOverlay += "," + acceleration switch
+                        {
+                            HardwareAccelerationKind.Vaapi => "format=nv12|vaapi",
+                            _ when isSong => "format=yuv420p",
+                            _ => "format=nv12"
+                        };
+                    }
                }
            }
-
-            _padToSize.IfSome(size => videoFilterQueue.Add($"pad={size.Width}:{size.Height}:(ow-iw)/2:(oh-ih)/2"));
            
-            foreach (string subtitle in _subtitle)
-            {
-                videoFilterQueue.Add(subtitle);
-            }
-
            string outputPixelFormat = null;
-            
-            if (usesSoftwareFilters && acceleration != HardwareAccelerationKind.None &&
-                string.IsNullOrWhiteSpace(watermarkOverlay))
-            {
-                string upload = acceleration switch
-                {
-                    HardwareAccelerationKind.Qsv => "hwupload=extra_hw_frames=64",
-                    _ => "hwupload"
-                };
-                videoFilterQueue.Add(upload);
-            }
-
            if (!usesSoftwareFilters && string.IsNullOrWhiteSpace(watermarkOverlay))
            {
                switch (acceleration, _videoEncoder, _pixelFormat)
@@ -361,6 +394,90 @@ namespace ErsatzTV.Core.FFmpeg
                }
            }

+            string outputFormat = (_videoEncoder, _pixelFormat) switch
+            {
+                ("hevc_nvenc", "yuv420p10le") => "p010le",
+                ("h264_nvenc", "yuv420p10le") => "p010le",
+                _ => null
+            };
+
+            _scaleToSize.IfSome(
+                size =>
+                {
+                    string filter = acceleration switch
+                    {
+                        HardwareAccelerationKind.Qsv => $"scale_qsv=w={size.Width}:h={size.Height}",
+                        HardwareAccelerationKind.Nvenc when _watermark.IsSome && _scaleToSize.IsNone =>
+                            $"format=yuv420p,hwupload_cuda,scale_cuda={size.Width}:{size.Height}",
+                        HardwareAccelerationKind.Nvenc when _watermark.IsSome && _padToSize.IsNone =>
+                            $"scale_cuda={size.Width}:{size.Height}",
+                        HardwareAccelerationKind.Nvenc when _watermark.IsNone && !string.IsNullOrEmpty(outputFormat) =>
+                            $"scale_cuda={size.Width}:{size.Height}:format={outputFormat}",
+                        HardwareAccelerationKind.Nvenc when _pixelFormat is "yuv420p10le" && usesHardwareFilters == false =>
+                            $"hwupload_cuda,scale_cuda={size.Width}:{size.Height}",
+                        HardwareAccelerationKind.Nvenc => $"scale_cuda={size.Width}:{size.Height}",
+                        HardwareAccelerationKind.Vaapi => $"scale_vaapi=format=nv12:w={size.Width}:h={size.Height}",
+                        _ when videoOnly => $"scale={size.Width}:{size.Height}:force_original_aspect_ratio=increase,crop={size.Width}:{size.Height}",
+                        _ => $"scale={size.Width}:{size.Height}:flags=fast_bilinear"
+                    };
+
+                    if (!string.IsNullOrWhiteSpace(filter))
+                    {
+                        videoFilterQueue.Add(filter);
+                    }
+                });
+
+            if (scaleOrPad && _boxBlur == false)
+            {
+                if (acceleration == HardwareAccelerationKind.Nvenc)
+                {
+                    if (!isHardwareDecode && !string.IsNullOrWhiteSpace(outputPixelFormat))
+                    {
+                        videoFilterQueue.Add($"hwdownload,format={outputPixelFormat}");
+                    }
+                }
+
+                videoFilterQueue.Add("setsar=1");
+            }
+
+            videoFilterQueue.AddRange(softwareFilterQueue);
+
+            _padToSize.IfSome(size => videoFilterQueue.Add($"pad={size.Width}:{size.Height}:(ow-iw)/2:(oh-ih)/2"));
+            
+            if (acceleration == HardwareAccelerationKind.Nvenc && _watermark.IsSome)
+            {
+                if (_scaleToSize.IsSome)
+                {
+                    videoFilterQueue.Add("hwdownload,format=nv12,format=yuv420p");
+                    videoFilterQueue.Add("hwupload_cuda");
+                }
+                else if (_padToSize.IsNone)
+                {
+                    videoFilterQueue.Add("scale_cuda=format=yuv420p");
+                }
+                else
+                {
+                    videoFilterQueue.Add("format=yuv420p");
+                    videoFilterQueue.Add("hwupload_cuda");
+                }
+            }
+
+            foreach (string subtitle in _subtitle)
+            {
+                videoFilterQueue.Add(subtitle);
+            }
+            
+            if (usesSoftwareFilters && acceleration != HardwareAccelerationKind.None &&
+                string.IsNullOrWhiteSpace(watermarkOverlay))
+            {
+                string upload = acceleration switch
+                {
+                    HardwareAccelerationKind.Qsv => "hwupload=extra_hw_frames=64",
+                    _ => "hwupload"
+                };
+                videoFilterQueue.Add(upload);
+            }
+
            bool hasAudioFilters = audioFilterQueue.Any();
            if (hasAudioFilters)
            {
@@ -404,9 +521,10 @@ namespace ErsatzTV.Core.FFmpeg
                        watermarkLabel = $"[{audioInput+1}:{index}]";
                    }

-                    if (!string.IsNullOrWhiteSpace(watermarkPreprocess))
+                    if (watermarkPreprocess.Count > 0)
                    {
-                        complexFilter.Append($"{watermarkLabel}{watermarkPreprocess}[wmp];");
+                        var joined = string.Join(",", watermarkPreprocess);
+                        complexFilter.Append($"{watermarkLabel}{joined}[wmp];");
                        watermarkLabel = "[wmp]";
                    }

@@ -422,6 +540,9 @@ namespace ErsatzTV.Core.FFmpeg
                            case (true, HardwareAccelerationKind.Nvenc):
                                complexFilter.Append(",hwupload_cuda");
                                break;
+                            // no need to upload since we're already in the GPU with overlay_cuda
+                            case (_, HardwareAccelerationKind.Nvenc) when scaleOrPad == false && _watermark.IsSome:
+                                break;
                            case (_, HardwareAccelerationKind.Qsv):
                                complexFilter.Append(",format=yuv420p,hwupload=extra_hw_frames=64");
                                break;
@@ -12,7 +12,7 @@ namespace ErsatzTV.Core.FFmpeg
        public List<string> FormatFlags { get; set; }
        public HardwareAccelerationKind HardwareAcceleration { get; set; }
        public string VideoDecoder { get; set; }
-        public bool RealtimeOutput => true;
+        public bool RealtimeOutput { get; set; }
        public Option<TimeSpan> StreamSeek { get; set; }
        public Option<IDisplaySize> ScaledSize { get; set; }
        public bool PadToDesiredResolution { get; set; }
@@ -28,5 +28,6 @@ namespace ErsatzTV.Core.FFmpeg
        public bool Deinterlace { get; set; }
        public Option<int> VideoTrackTimeScale { get; set; }
        public bool NormalizeLoudness { get; set; }
+        public Option<int> FrameRate { get; set; }
    }
 }
@@ -36,6 +36,12 @@ namespace ErsatzTV.Core.FFmpeg
            "+igndts"
        };

+        private static readonly List<string> SegmenterFormatFlags = new()
+        {
+            "+discardcorrupt",
+            "+igndts"
+        };
+
        public FFmpegPlaybackSettings ConcatSettings => new()
        {
            ThreadCount = 1,
@@ -51,14 +57,27 @@ namespace ErsatzTV.Core.FFmpeg
            DateTimeOffset start,
            DateTimeOffset now,
            TimeSpan inPoint,
-            TimeSpan outPoint)
+            TimeSpan outPoint,
+            bool hlsRealtime,
+            Option<int> targetFramerate)
        {
            var result = new FFmpegPlaybackSettings
            {
-                ThreadCount = ffmpegProfile.ThreadCount,
-                FormatFlags = CommonFormatFlags
+                FormatFlags = streamingMode switch
+                {
+                    StreamingMode.HttpLiveStreamingSegmenter => SegmenterFormatFlags,
+                    _ => CommonFormatFlags,
+                },
+                RealtimeOutput = streamingMode switch
+                {
+                    StreamingMode.HttpLiveStreamingSegmenter => hlsRealtime,
+                    _ => true
+                }
            };

+            // always use one thread with realtime output
+            result.ThreadCount = result.RealtimeOutput ? 1 : ffmpegProfile.ThreadCount;
+
            if (now != start || inPoint != TimeSpan.Zero)
            {
                result.StreamSeek = now - start + inPoint;
@@ -71,7 +90,7 @@ namespace ErsatzTV.Core.FFmpeg
                    result.VideoCodec = "copy";
                    result.Deinterlace = false;
                    break;
-                case StreamingMode.HttpLiveStreamingHybrid:
+                case StreamingMode.TransportStreamHybrid:
                case StreamingMode.HttpLiveStreamingSegmenter:
                case StreamingMode.TransportStream:
                    result.HardwareAcceleration = ffmpegProfile.HardwareAcceleration;
@@ -95,6 +114,11 @@ namespace ErsatzTV.Core.FFmpeg

                    if (ffmpegProfile.Transcode && ffmpegProfile.NormalizeVideo)
                    {
+                        if (ffmpegProfile.NormalizeFramerate)
+                        {
+                            result.FrameRate = targetFramerate;
+                        }
+
                        result.VideoTrackTimeScale = 90000;
                    }

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -108,6 +109,10 @@ namespace ErsatzTV.Core.FFmpeg
                    _arguments.Add("-hwaccel_output_format");
                    _arguments.Add("vaapi");
                    break;
+                case HardwareAccelerationKind.VideoToolbox:
+                    _arguments.Add("-hwaccel");
+                    _arguments.Add("videotoolbox");
+                    break;
            }

            _complexFilterBuilder = _complexFilterBuilder.WithHardwareAcceleration(hwAccel);
@@ -202,30 +207,69 @@ namespace ErsatzTV.Core.FFmpeg
            return this;
        }

+        public FFmpegProcessBuilder WithCopyCodec()
+        {
+            _arguments.Add("-c");
+            _arguments.Add("copy");
+            return this;
+        }
+
+        public FFmpegProcessBuilder WithFrameRate(Option<int> frameRate)
+        {
+            foreach (int fr in frameRate)
+            {
+                _arguments.Add("-r");
+                _arguments.Add($"{fr}");
+            
+                _arguments.Add("-vsync");
+                _arguments.Add("1");
+            }
+
+            return this;
+        }
+
        public FFmpegProcessBuilder WithWatermark(
            Option<WatermarkOptions> watermarkOptions,
+            Option<List<FadePoint>> maybeFadePoints,
            IDisplaySize resolution)
        {
-            foreach (WatermarkOptions options in watermarkOptions)
+            ChannelWatermarkMode maybeWatermarkMode = watermarkOptions.Map(wmo => wmo.Watermark.Map(wm => wm.Mode)).Flatten()
+                .IfNone(ChannelWatermarkMode.None);
+
+            // skip watermark if intermittent and no fade points
+            if (maybeWatermarkMode != ChannelWatermarkMode.None &&
+                (maybeWatermarkMode != ChannelWatermarkMode.Intermittent ||
+                 maybeFadePoints.Map(fp => fp.Count > 0).IfNone(false)))
            {
-                foreach (string path in options.ImagePath)
+                foreach (WatermarkOptions options in watermarkOptions)
                {
-                    if (options.IsAnimated)
+                    foreach (string path in options.ImagePath)
                    {
-                        _arguments.Add("-ignore_loop");
-                        _arguments.Add("0");
+                        if (options.IsAnimated)
+                        {
+                            _arguments.Add("-ignore_loop");
+                            _arguments.Add("0");
+                        }
+
+                        // when we have fade points, we need to loop the static watermark image
+                        else if (maybeFadePoints.Map(fp => fp.Count).IfNone(0) > 0)
+                        {
+                            _arguments.Add("-stream_loop");
+                            _arguments.Add("-1");
+                        }
+
+                        _arguments.Add("-i");
+                        _arguments.Add(path);
+
+                        _complexFilterBuilder = _complexFilterBuilder.WithWatermark(
+                            options.Watermark,
+                            maybeFadePoints,
+                            resolution,
+                            options.ImageStreamIndex);
                    }
-
-                    _arguments.Add("-i");
-                    _arguments.Add(path);
-
-                    _complexFilterBuilder = _complexFilterBuilder.WithWatermark(
-                        options.Watermark,
-                        resolution,
-                        options.ImageStreamIndex);
                }
            }
-            
+
            return this;
        }

@@ -242,7 +286,8 @@ namespace ErsatzTV.Core.FFmpeg
            string audioPath,
            string decoder,
            Option<string> codec,
-            Option<string> pixelFormat)
+            Option<string> pixelFormat,
+            bool deinterlace)
        {
            if (audioPath == videoPath)
            {
@@ -262,6 +307,15 @@ namespace ErsatzTV.Core.FFmpeg
            {
                _arguments.Add("-c:v");
                _arguments.Add(decoder);
+
+                if (decoder == "mpeg2_cuvid" && deinterlace)
+                {
+                    _arguments.Add("-deint");
+                    _arguments.Add("2");
+                }
+
+                _complexFilterBuilder = _complexFilterBuilder
+                    .WithDecoder(decoder);
            }

            _complexFilterBuilder = _complexFilterBuilder
@@ -368,36 +422,33 @@ namespace ErsatzTV.Core.FFmpeg
            _arguments.Add($"{format}");
            return this;
        }
-        
-        public FFmpegProcessBuilder WithHls(string channelNumber, Option<MediaVersion> mediaVersion)
+
+        public FFmpegProcessBuilder WithInitialDiscontinuity()
+        {
+            _arguments.Add("-mpegts_flags");
+            _arguments.Add("+initial_discontinuity");
+            return this;
+        }
+
+        public FFmpegProcessBuilder WithHls(
+            string channelNumber,
+            Option<MediaVersion> mediaVersion,
+            long ptsOffset,
+            Option<int> maybeTimeScale,
+            Option<int> maybeFrameRate)
        {
            const int SEGMENT_SECONDS = 4;
+            int frameRate = maybeFrameRate.IfNone(GetFrameRateFromMediaVersion(mediaVersion));

-            var frameRate = 24;
-
-            foreach (MediaVersion version in mediaVersion)
+            foreach (int timescale in maybeTimeScale)
            {
-                if (!int.TryParse(version.RFrameRate, out int fr))
-                {
-                    string[] split = (version.RFrameRate ?? string.Empty).Split("/");
-                    if (int.TryParse(split[0], out int left) && int.TryParse(split[1], out int right))
-                    {
-                        fr = (int)Math.Round(left / (double)right);
-                    }
-                    else
-                    {
-                        _logger.LogInformation("Unable to detect framerate, using {FrameRate}", 24);
-                        fr = 24;
-                    }
-                }
-
-                frameRate = fr;
+                _arguments.Add("-output_ts_offset");
+                _arguments.Add($"{(ptsOffset / (double)timescale).ToString(NumberFormatInfo.InvariantInfo)}");
            }

            _arguments.AddRange(
                new[]
                {
-                    "-use_wallclock_as_timestamps", "1",
                    "-g", $"{frameRate * SEGMENT_SECONDS}",
                    "-keyint_min", $"{frameRate * SEGMENT_SECONDS}",
                    "-force_key_frames", $"expr:gte(t,n_forced*{SEGMENT_SECONDS})",
@@ -407,7 +458,8 @@ namespace ErsatzTV.Core.FFmpeg
                    "-segment_list_flags", "+live",
                    "-hls_segment_filename",
                    Path.Combine(FileSystemLayout.TranscodeFolder, channelNumber, "live%06d.ts"),
-                    "-hls_flags", "program_date_time+append_list+omit_endlist+independent_segments",
+                    "-hls_flags", "program_date_time+append_list+discont_start+omit_endlist+independent_segments",
+                    "-mpegts_flags", "+initial_discontinuity",
                    Path.Combine(FileSystemLayout.TranscodeFolder, channelNumber, "live.m3u8")
                });

@@ -591,14 +643,14 @@ namespace ErsatzTV.Core.FFmpeg
                    }
                });

-            _arguments.Add("-map");
-            _arguments.Add(videoLabel);
-
            foreach (string _ in audioPath)
            {
                _arguments.Add("-map");
                _arguments.Add(audioLabel);
            }
+            
+            _arguments.Add("-map");
+            _arguments.Add(videoLabel);

            return this;
        }
@@ -626,13 +678,13 @@ namespace ErsatzTV.Core.FFmpeg
                switch (_vaapiDriver)
                {
                    case VaapiDriver.i965:
-                        startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "i965");
+                        startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "i965";
                        break;
                    case VaapiDriver.iHD:
-                        startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "iHD");
+                        startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "iHD";
                        break;
                    case VaapiDriver.RadeonSI:
-                        startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "radeonsi");
+                        startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "radeonsi";
                        break;
                }
            }
@@ -652,8 +704,8 @@ namespace ErsatzTV.Core.FFmpeg
                    // colon after drive letter needs to be escaped
                    fileName = fileName.Replace(@":/", @"\:/");
                }
-                
-                startInfo.EnvironmentVariables.Add("FFREPORT", $"file={fileName}:level=32");
+
+                startInfo.EnvironmentVariables["FFREPORT"] = $"file={fileName}:level=32";
            }

            startInfo.ArgumentList.Add("-nostdin");
@@ -667,5 +719,31 @@ namespace ErsatzTV.Core.FFmpeg
                StartInfo = startInfo
            };
        }
+
+        private int GetFrameRateFromMediaVersion(Option<MediaVersion> mediaVersion)
+        {
+            var frameRate = 24;
+
+            foreach (MediaVersion version in mediaVersion)
+            {
+                if (!int.TryParse(version.RFrameRate, out int fr))
+                {
+                    string[] split = (version.RFrameRate ?? string.Empty).Split("/");
+                    if (int.TryParse(split[0], out int left) && int.TryParse(split[1], out int right))
+                    {
+                        fr = (int)Math.Round(left / (double)right);
+                    }
+                    else
+                    {
+                        _logger.LogInformation("Unable to detect framerate, using {FrameRate}", 24);
+                        fr = 24;
+                    }
+                }
+
+                frameRate = fr;
+            }
+
+            return frameRate;
+        }
    }
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
@@ -51,7 +52,9 @@ namespace ErsatzTV.Core.FFmpeg
            bool hlsRealtime,
            FillerKind fillerKind,
            TimeSpan inPoint,
-            TimeSpan outPoint)
+            TimeSpan outPoint,
+            long ptsOffset,
+            Option<int> targetFramerate)
        {
            MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(channel, videoVersion);
            Option<MediaStream> maybeAudioStream = await _ffmpegStreamSelector.SelectAudioStream(channel, audioVersion);
@@ -65,11 +68,35 @@ namespace ErsatzTV.Core.FFmpeg
                start,
                now,
                inPoint,
-                outPoint);
+                outPoint,
+                hlsRealtime,
+                targetFramerate);

            Option<WatermarkOptions> watermarkOptions =
                await GetWatermarkOptions(channel, globalWatermark, videoVersion, None, None);

+            Option<List<FadePoint>> maybeFadePoints = watermarkOptions
+                .Map(o => o.Watermark)
+                .Flatten()
+                .Where(wm => wm.Mode == ChannelWatermarkMode.Intermittent)
+                .Map(
+                    wm =>
+                        WatermarkCalculator.CalculateFadePoints(
+                            start,
+                            inPoint,
+                            outPoint,
+                            playbackSettings.StreamSeek,
+                            wm.FrequencyMinutes,
+                            wm.DurationSeconds));
+
+            // foreach (List<FadePoint> fadePoints in maybeFadePoints)
+            // {
+            //     foreach (FadePoint fadePoint in fadePoints)
+            //     {
+            //         _logger.LogDebug("Fade point filter: {FadePointFilter}", fadePoint.ToFilter());
+            //     }
+            // }
+
            FFmpegProcessBuilder builder = new FFmpegProcessBuilder(ffmpegPath, saveReports, _logger)
                .WithThreads(playbackSettings.ThreadCount)
                .WithVaapiDriver(vaapiDriver, vaapiDevice)
@@ -87,8 +114,10 @@ namespace ErsatzTV.Core.FFmpeg
                    audioPath,
                    playbackSettings.VideoDecoder,
                    videoStream.Codec,
-                    videoStream.PixelFormat)
-                .WithWatermark(watermarkOptions, channel.FFmpegProfile.Resolution)
+                    videoStream.PixelFormat,
+                    playbackSettings.Deinterlace)
+                .WithWatermark(watermarkOptions, maybeFadePoints, channel.FFmpegProfile.Resolution)
+                .WithFrameRate(playbackSettings.FrameRate)
                .WithVideoTrackTimeScale(playbackSettings.VideoTrackTimeScale)
                .WithAlignedAudio(videoPath == audioPath ? playbackSettings.AudioDuration : Option<TimeSpan>.None)
                .WithNormalizeLoudness(playbackSettings.NormalizeLoudness);
@@ -157,11 +186,16 @@ namespace ErsatzTV.Core.FFmpeg
            {
                // HLS needs to segment and generate playlist
                case StreamingMode.HttpLiveStreamingSegmenter:
-                    return builder.WithHls(channel.Number, videoVersion)
-                        .WithRealtimeOutput(hlsRealtime)
+                    return builder.WithHls(
+                            channel.Number,
+                            videoVersion,
+                            ptsOffset,
+                            playbackSettings.VideoTrackTimeScale,
+                            playbackSettings.FrameRate)
                        .Build();
                default:
                    return builder.WithFormat("mpegts")
+                        .WithInitialDiscontinuity()
                        .WithPipe()
                        .Build();
            }
@@ -172,7 +206,8 @@ namespace ErsatzTV.Core.FFmpeg
            Channel channel,
            Option<TimeSpan> duration,
            string errorMessage,
-            bool hlsRealtime)
+            bool hlsRealtime,
+            long ptsOffset)
        {
            FFmpegPlaybackSettings playbackSettings =
                _playbackSettingsCalculator.CalculateErrorSettings(channel.FFmpegProfile);
@@ -220,8 +255,12 @@ namespace ErsatzTV.Core.FFmpeg
            {
                // HLS needs to segment and generate playlist
                case StreamingMode.HttpLiveStreamingSegmenter:
-                    return builder.WithHls(channel.Number, None)
-                        .WithRealtimeOutput(hlsRealtime)
+                    return builder.WithHls(
+                            channel.Number,
+                            None,
+                            ptsOffset,
+                            playbackSettings.VideoTrackTimeScale,
+                            playbackSettings.FrameRate)
                        .Build();
                default:
                    return builder.WithFormat("mpegts")
@@ -247,6 +286,24 @@ namespace ErsatzTV.Core.FFmpeg
                .Build();
        }

+        public Process WrapSegmenter(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host)
+        {
+            FFmpegPlaybackSettings playbackSettings = _playbackSettingsCalculator.ConcatSettings;
+
+            return new FFmpegProcessBuilder(ffmpegPath, saveReports, _logger)
+                .WithThreads(1)
+                .WithQuiet()
+                .WithFormatFlags(playbackSettings.FormatFlags)
+                .WithRealtimeOutput(true)
+                .WithInput($"http://localhost:{Settings.ListenPort}/iptv/channel/{channel.Number}.m3u8?mode=segmenter")
+                .WithMap("0")
+                .WithCopyCodec()
+                .WithMetadata(channel, None)
+                .WithFormat("mpegts")
+                .WithPipe()
+                .Build();
+        }
+
        public Process ConvertToPng(string ffmpegPath, string inputFile, string outputFile)
        {
            return new FFmpegProcessBuilder(ffmpegPath, false, _logger)
@@ -317,14 +374,16 @@ namespace ErsatzTV.Core.FFmpeg
                    DateTimeOffset.UnixEpoch,
                    DateTimeOffset.UnixEpoch,
                    TimeSpan.Zero,
-                    TimeSpan.Zero);
+                    TimeSpan.Zero,
+                    false,
+                    Option<int>.None);

                FFmpegProcessBuilder builder = new FFmpegProcessBuilder(ffmpegPath, false, _logger)
                    .WithThreads(1)
                    .WithQuiet()
                    .WithFormatFlags(playbackSettings.FormatFlags)
                    .WithSongInput(videoPath, videoStream.Codec, videoStream.PixelFormat, boxBlur)
-                    .WithWatermark(watermarkOptions, channel.FFmpegProfile.Resolution)
+                    .WithWatermark(watermarkOptions, None, channel.FFmpegProfile.Resolution)
                    .WithSubtitleFile(subtitleFile);

                foreach (IDisplaySize scaledSize in scalePlaybackSettings.ScaledSize)
@@ -0,0 +1,23 @@
+using System;
+using System.Globalization;
+
+namespace ErsatzTV.Core.FFmpeg;
+
+public abstract record FadePoint(TimeSpan Time, string InOut)
+{
+    public TimeSpan EnableStart { get; set; }
+    public TimeSpan EnableFinish { get; set; }
+
+    public string ToFilter()
+    {
+        var startTime = Time.TotalSeconds.ToString(NumberFormatInfo.InvariantInfo);
+        var enableStart = EnableStart.TotalSeconds.ToString(NumberFormatInfo.InvariantInfo);
+        var enableFinish = EnableFinish.TotalSeconds.ToString(NumberFormatInfo.InvariantInfo);
+
+        return $"fade={InOut}:st={startTime}:d=1:alpha=1:enable='between(t,{enableStart},{enableFinish})'";
+    }
+}
+
+public record FadeInPoint(TimeSpan Time) : FadePoint(Time, "in");
+
+public record FadeOutPoint(TimeSpan Time) : FadePoint(Time, "out");
@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Text;

 namespace ErsatzTV.Core.FFmpeg
@@ -55,7 +56,11 @@ namespace ErsatzTV.Core.FFmpeg
                    continue;
                }

-                var duration = TimeSpan.FromSeconds(double.Parse(lines[i].TrimEnd(',').Split(':')[1]));
+                var duration = TimeSpan.FromSeconds(
+                    double.Parse(
+                        lines[i].TrimEnd(',').Split(':')[1],
+                        NumberStyles.Number,
+                        CultureInfo.InvariantCulture));
                if (currentTime < filterBefore)
                {
                    currentTime += duration;
@@ -90,12 +95,13 @@ namespace ErsatzTV.Core.FFmpeg
                i += 3;
            }

-            if (endWithDiscontinuity)
+            var playlist = output.ToString();
+            if (endWithDiscontinuity && !playlist.EndsWith($"#EXT-X-DISCONTINUITY{Environment.NewLine}"))
            {
-                output.AppendLine("#EXT-X-DISCONTINUITY");
+                playlist += "#EXT-X-DISCONTINUITY" + Environment.NewLine;
            }

-            return new TrimPlaylistResult(nextPlaylistStart, startSequence, output.ToString());
+            return new TrimPlaylistResult(nextPlaylistStart, startSequence, playlist, segments);
        }

        public static TrimPlaylistResult TrimPlaylistWithDiscontinuity(
@@ -107,5 +113,5 @@ namespace ErsatzTV.Core.FFmpeg
        }
    }

-    public record TrimPlaylistResult(DateTimeOffset PlaylistStart, int Sequence, string Playlist);
+    public record TrimPlaylistResult(DateTimeOffset PlaylistStart, int Sequence, string Playlist, int SegmentCount);
 }
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using LanguageExt;
+
+namespace ErsatzTV.Core.FFmpeg;
+
+public static class WatermarkCalculator
+{
+    public static List<FadePoint> CalculateFadePoints(
+        DateTimeOffset itemStartTime,
+        TimeSpan inPoint,
+        TimeSpan outPoint,
+        Option<TimeSpan> streamSeek,
+        int frequencyMinutes,
+        int durationSeconds)
+    {
+        var result = new List<FadePoint>();
+        
+        TimeSpan duration = outPoint - inPoint;
+        DateTimeOffset itemFinishTime = itemStartTime + duration;
+
+        DateTimeOffset start = itemStartTime.AddMinutes(-16);
+
+        // find the next whole minute
+        if (start.Second > 0 || start.Millisecond > 0)
+        {
+            start = start.AddMinutes(1);
+            start = start.AddSeconds(-start.Second);
+            start = start.AddMilliseconds(-start.Millisecond);
+        }
+
+        DateTimeOffset finish = itemFinishTime;
+
+        // find the previous whole minute
+        if (finish.Second > 0 || finish.Millisecond > 0)
+        {
+            finish = finish.AddSeconds(-finish.Second);
+            finish = finish.AddMilliseconds(-finish.Millisecond);
+        }
+
+        DateTimeOffset current = start;
+        while (current <= finish)
+        {
+            current = current.AddMinutes(1);
+            if (current.Minute % frequencyMinutes == 0)
+            {
+                TimeSpan fadeInTime = inPoint + (current - itemStartTime);
+
+                result.Add(new FadeInPoint(fadeInTime));
+                result.Add(new FadeOutPoint(fadeInTime.Add(TimeSpan.FromSeconds(durationSeconds))));
+            }
+        }
+        
+        // if we're seeking, subtract the seek from each item and return that
+        foreach (TimeSpan ss in streamSeek)
+        {
+            result = result.Map(fp => fp with { Time = fp.Time - ss }).ToList();
+        }
+
+        // trim points that have already passed
+        result.RemoveAll(fp => fp.Time < TimeSpan.Zero);
+        
+        // trim points that are past the end
+        result.RemoveAll(fp => fp.Time >= outPoint);
+
+        if (result.Any())
+        {
+            for (var i = 0; i < result.Count; i++)
+            {
+                result[i].EnableStart = i == 0 ? TimeSpan.Zero : result[i - 1].Time.Add(TimeSpan.FromSeconds(1));
+            }
+
+            for (var i = 0; i < result.Count; i++)
+            {
+                result[i].EnableFinish = i == result.Count - 1
+                    ? outPoint
+                    : result[i + 1].Time.Subtract(TimeSpan.FromSeconds(1));
+            }
+        }
+
+        return result;
+    }
+}
@@ -18,9 +18,12 @@ namespace ErsatzTV.Core
                Environment.SpecialFolderOption.Create),
            "etv-transcode");

+        public static readonly string LogsFolder = Path.Combine(AppDataFolder, "logs");
+
        public static readonly string DatabasePath = Path.Combine(AppDataFolder, "ersatztv.sqlite3");

        public static readonly string LogDatabasePath = Path.Combine(AppDataFolder, "logs.sqlite3");
+        public static readonly string LogFilePath = Path.Combine(LogsFolder, "ersatztv.log");

        public static readonly string LegacyImageCacheFolder = Path.Combine(AppDataFolder, "cache", "images");
        public static readonly string ResourcesCacheFolder = Path.Combine(AppDataFolder, "cache", "resources");
@@ -22,8 +22,7 @@ namespace ErsatzTV.Core.Hdhr

        public string URL => _channel.StreamingMode switch
        {
-            StreamingMode.HttpLiveStreamingDirect or StreamingMode.HttpLiveStreamingHybrid =>
-                $"{_scheme}://{_host}/iptv/channel/{_channel.Number}.m3u8",
+            StreamingMode.TransportStream => $"{_scheme}://{_host}/iptv/channel/{_channel.Number}.ts?mode=ts-legacy",
            _ => $"{_scheme}://{_host}/iptv/channel/{_channel.Number}.ts"
        };
    }
@@ -0,0 +1,5 @@
+namespace ErsatzTV.Core.Health.Checks;
+
+public interface IFileNotFoundHealthCheck : IHealthCheck
+{
+}
@@ -1,4 +1,6 @@
-namespace ErsatzTV.Core.Health
+using LanguageExt;
+
+namespace ErsatzTV.Core.Health
 {
-    public record HealthCheckResult(string Title, HealthCheckStatus Status, string Message);
+    public record HealthCheckResult(string Title, HealthCheckStatus Status, string Message, Option<string> Link);
 }
@@ -27,17 +27,22 @@ namespace ErsatzTV.Core.Interfaces.FFmpeg
            bool hlsRealtime,
            FillerKind fillerKind,
            TimeSpan inPoint,
-            TimeSpan outPoint);
+            TimeSpan outPoint,
+            long ptsOffset,
+            Option<int> targetFramerate);

        Task<Process> ForError(
            string ffmpegPath,
            Channel channel,
            Option<TimeSpan> duration,
            string errorMessage,
-            bool hlsRealtime);
+            bool hlsRealtime,
+            long ptsOffset);

        Process ConcatChannel(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host);

+        Process WrapSegmenter(string ffmpegPath, bool saveReports, Channel channel, string scheme, string host);
+
        Process ConvertToPng(string ffmpegPath, string inputFile, string outputFile);

        Process ExtractAttachedPicAsPng(string ffmpegPath, string inputFile, int streamIndex, string outputFile);
@@ -14,6 +14,7 @@ namespace ErsatzTV.Core.Interfaces.Metadata
        IEnumerable<string> ListSubdirectories(string folder);
        IEnumerable<string> ListFiles(string folder);
        bool FileExists(string path);
+        bool FolderExists(string folder);
        Task<Either<BaseError, Unit>> CopyFile(string source, string destination);
        Unit EmptyFolder(string folder);
    }
@@ -19,5 +19,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories
        Task<List<int>> GetMediaIdsByLocalPath(int libraryPathId);
        Task DeleteLocalPath(int libraryPathId);
        Task<Unit> SetEtag(LibraryPath libraryPath, Option<LibraryFolder> knownFolder, string path, string etag);
+        Task<Unit> CleanEtagsForLibraryPath(LibraryPath libraryPath);
    }
 }
@@ -18,5 +18,6 @@ namespace ErsatzTV.Core.Interfaces.Repositories
        Task<List<int>> PlayoutIdsUsingMultiCollection(int multiCollectionId);
        Task<List<int>> PlayoutIdsUsingSmartCollection(int smartCollectionId);
        Task<bool> IsCustomPlaybackOrder(int collectionId);
+        Task<Option<string>> GetNameFromKey(CollectionKey emptyCollection);
    }
 }
@@ -1,10 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using ErsatzTV.Core.Domain;
+using LanguageExt;

 namespace ErsatzTV.Core.Interfaces.Repositories
 {
    public interface IMediaItemRepository
    {
        Task<List<string>> GetAllLanguageCodes();
+        Task<List<int>> FlagFileNotFound(LibraryPath libraryPath, string path);
+        Task<Unit> FlagNormal(MediaItem mediaItem);
+        Task<Either<BaseError, Unit>> DeleteItems(List<int> mediaItemIds);
    }
 }
@@ -15,7 +15,7 @@ namespace ErsatzTV.Core.Interfaces.Repositories
        Task<bool> RemoveActor(Actor actor);
        Task<bool> Update(Domain.Metadata metadata);
        Task<bool> Add(Domain.Metadata metadata);
-        Task<bool> UpdateLocalStatistics(int mediaVersionId, MediaVersion incoming, bool updateVersion = true);
+        Task<bool> UpdateLocalStatistics(MediaItem mediaItem, MediaVersion incoming, bool updateVersion = true);
        Task<bool> UpdatePlexStatistics(int mediaVersionId, MediaVersion incoming);
        Task<Unit> UpdateArtworkPath(Artwork artwork);
        Task<Unit> AddArtwork(Domain.Metadata metadata, Artwork artwork);
@@ -14,6 +14,7 @@ namespace ErsatzTV.Core.Interfaces.Search
        public int Version { get; }
        Task<bool> Initialize(ILocalFileSystem localFileSystem);
        Task<Unit> Rebuild(ISearchRepository searchRepository, List<int> itemIds);
+        Task<Unit> RebuildItems(ISearchRepository searchRepository, List<int> itemIds);
        Task<Unit> AddItems(ISearchRepository searchRepository, List<MediaItem> items);
        Task<Unit> UpdateItems(ISearchRepository searchRepository, List<MediaItem> items);
        Task<Unit> RemoveItems(List<int> ids);
@@ -9,7 +9,6 @@ using ErsatzTV.Core.Domain.Filler;
 using ErsatzTV.Core.Emby;
 using ErsatzTV.Core.Jellyfin;
 using LanguageExt;
-using LanguageExt.UnsafeValueAccess;
 using Serilog;
 using static LanguageExt.Prelude;

@@ -158,15 +157,20 @@ namespace ErsatzTV.Core.Iptv
                                xml.WriteString(metadata.Year.Value.ToString());
                                xml.WriteEndElement(); // date
                            }
-                        }

-                        xml.WriteStartElement("category");
-                        xml.WriteAttributeString("lang", "en");
-                        xml.WriteString("Movie");
-                        xml.WriteEndElement(); // category
+                            xml.WriteStartElement("category");
+                            xml.WriteAttributeString("lang", "en");
+                            xml.WriteString("Movie");
+                            xml.WriteEndElement(); // category
+
+                            foreach (Genre genre in Optional(metadata.Genres).Flatten())
+                            {
+                                xml.WriteStartElement("category");
+                                xml.WriteAttributeString("lang", "en");
+                                xml.WriteString(genre.Name);
+                                xml.WriteEndElement(); // category
+                            }

-                        foreach (MovieMetadata metadata in movie.MovieMetadata.HeadOrNone())
-                        {
                            string poster = Optional(metadata.Artwork).Flatten()
                                .Filter(a => a.ArtworkKind == ArtworkKind.Poster)
                                .HeadOrNone()
@@ -191,15 +195,35 @@ namespace ErsatzTV.Core.Iptv
                                xml.WriteString(metadata.Year.Value.ToString());
                                xml.WriteEndElement(); // date
                            }
-                        }

-                        xml.WriteStartElement("category");
-                        xml.WriteAttributeString("lang", "en");
-                        xml.WriteString("Music");
-                        xml.WriteEndElement(); // category
+                            xml.WriteStartElement("category");
+                            xml.WriteAttributeString("lang", "en");
+                            xml.WriteString("Music");
+                            xml.WriteEndElement(); // category
+
+                            // music video genres
+                            foreach (Genre genre in Optional(metadata.Genres).Flatten())
+                            {
+                                xml.WriteStartElement("category");
+                                xml.WriteAttributeString("lang", "en");
+                                xml.WriteString(genre.Name);
+                                xml.WriteEndElement(); // category
+                            }
+
+                            // artist genres
+                            Option<ArtistMetadata> maybeMetadata =
+                                Optional(musicVideo.Artist?.ArtistMetadata.HeadOrNone()).Flatten();
+                            foreach (ArtistMetadata artistMetadata in maybeMetadata)
+                            {
+                                foreach (Genre genre in Optional(artistMetadata.Genres).Flatten())
+                                {
+                                    xml.WriteStartElement("category");
+                                    xml.WriteAttributeString("lang", "en");
+                                    xml.WriteString(genre.Name);
+                                    xml.WriteEndElement(); // category
+                                }
+                            }

-                        foreach (MusicVideoMetadata metadata in musicVideo.MusicVideoMetadata.HeadOrNone())
-                        {
                            string thumbnail = Optional(metadata.Artwork).Flatten()
                                .Filter(a => a.ArtworkKind == ArtworkKind.Thumbnail)
                                .HeadOrNone()
@@ -213,7 +237,7 @@ namespace ErsatzTV.Core.Iptv
                            }
                        }
                    }
-                    
+
                    if (!hasCustomTitle && displayItem.MediaItem is Song song)
                    {
                        xml.WriteStartElement("category");
@@ -241,9 +265,21 @@ namespace ErsatzTV.Core.Iptv
                    {
                        Option<ShowMetadata> maybeMetadata =
                            Optional(episode.Season?.Show?.ShowMetadata.HeadOrNone()).Flatten();
-                        if (maybeMetadata.IsSome)
+                        foreach (ShowMetadata metadata in maybeMetadata)
                        {
-                            ShowMetadata metadata = maybeMetadata.ValueUnsafe();
+                            xml.WriteStartElement("category");
+                            xml.WriteAttributeString("lang", "en");
+                            xml.WriteString("Series");
+                            xml.WriteEndElement(); // category
+                            
+                            foreach (Genre genre in Optional(metadata.Genres).Flatten())
+                            {
+                                xml.WriteStartElement("category");
+                                xml.WriteAttributeString("lang", "en");
+                                xml.WriteString(genre.Name);
+                                xml.WriteEndElement(); // category
+                            }
+
                            string artwork = Optional(metadata.Artwork).Flatten()
                                .Filter(a => a.ArtworkKind == ArtworkKind.Thumbnail)
                                .HeadOrNone()
@@ -43,9 +43,9 @@ namespace ErsatzTV.Core.Iptv
                string format = channel.StreamingMode switch
                {
                    StreamingMode.HttpLiveStreamingDirect => "m3u8?mode=hls-direct",
-                    StreamingMode.HttpLiveStreamingHybrid => "m3u8",
                    StreamingMode.HttpLiveStreamingSegmenter => "m3u8?mode=segmenter",
-                    _ => "ts"
+                    StreamingMode.TransportStreamHybrid => "ts",
+                    _ => "ts?mode=ts-legacy"
                };

                string vcodec = channel.FFmpegProfile.VideoCodec.Split("_").Head();
@@ -23,7 +23,7 @@ namespace ErsatzTV.Core.Metadata
        {
            try
            {
-                if (!Directory.Exists(folder))
+                if (folder != null && !Directory.Exists(folder))
                {
                    Directory.CreateDirectory(folder);
                }
@@ -42,14 +42,44 @@ namespace ErsatzTV.Core.Metadata
        public bool IsLibraryPathAccessible(LibraryPath libraryPath) =>
            Directory.Exists(libraryPath.Path);

-        public IEnumerable<string> ListSubdirectories(string folder) =>
-            Try(Directory.EnumerateDirectories(folder)).IfFail(new List<string>());
+        public IEnumerable<string> ListSubdirectories(string folder)
+        {
+            if (Directory.Exists(folder))
+            {
+                try
+                {
+                    return Directory.EnumerateDirectories(folder);
+                }
+                catch
+                {
+                    // do nothing
+                }
+            }

-        public IEnumerable<string> ListFiles(string folder) =>
-            Try(Directory.EnumerateFiles(folder, "*", SearchOption.TopDirectoryOnly)).IfFail(new List<string>());
+            return new List<string>();
+        }
+
+        public IEnumerable<string> ListFiles(string folder)
+        {
+            if (Directory.Exists(folder))
+            {
+                try
+                {
+                    return Directory.EnumerateFiles(folder, "*", SearchOption.TopDirectoryOnly);
+                }
+                catch
+                {
+                    // do nothing
+                }
+            }
+
+            return new List<string>();
+        }

        public bool FileExists(string path) => File.Exists(path);

+        public bool FolderExists(string folder) => Directory.Exists(folder);
+
        public async Task<Either<BaseError, Unit>> CopyFile(string source, string destination)
        {
            try
@@ -57,11 +57,13 @@ namespace ErsatzTV.Core.Metadata
        private readonly ILocalStatisticsProvider _localStatisticsProvider;
        private readonly ILogger _logger;
        private readonly IMetadataRepository _metadataRepository;
+        private readonly IMediaItemRepository _mediaItemRepository;

        protected LocalFolderScanner(
            ILocalFileSystem localFileSystem,
            ILocalStatisticsProvider localStatisticsProvider,
            IMetadataRepository metadataRepository,
+            IMediaItemRepository mediaItemRepository,
            IImageCache imageCache,
            IFFmpegProcessService ffmpegProcessService, 
            ITempFilePool tempFilePool,
@@ -70,6 +72,7 @@ namespace ErsatzTV.Core.Metadata
            _localFileSystem = localFileSystem;
            _localStatisticsProvider = localStatisticsProvider;
            _metadataRepository = metadataRepository;
+            _mediaItemRepository = mediaItemRepository;
            _imageCache = imageCache;
            _ffmpegProcessService = ffmpegProcessService;
            _tempFilePool = tempFilePool;
@@ -265,6 +268,29 @@ namespace ErsatzTV.Core.Metadata
            return false;
        }

+        protected Task<List<int>> FlagFileNotFound(LibraryPath libraryPath, string path) =>
+            _mediaItemRepository.FlagFileNotFound(libraryPath, path);
+
+        protected async Task<Either<BaseError, MediaItemScanResult<T>>> FlagNormal<T>(MediaItemScanResult<T> result)
+            where T : MediaItem
+        {
+            try
+            {
+                T mediaItem = result.Item;
+                if (mediaItem.State != MediaItemState.Normal)
+                {
+                    await _mediaItemRepository.FlagNormal(mediaItem);
+                    result.IsUpdated = true;
+                }
+
+                return result;
+            }
+            catch (Exception ex)
+            {
+                return BaseError.New(ex.ToString());
+            }
+        }
+
        protected bool ShouldIncludeFolder(string folder) =>
            !Path.GetFileName(folder).StartsWith('.') &&
            !_localFileSystem.FileExists(Path.Combine(folder, ".etvignore"));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jason Dove	ab1f294c1f	update changelog for release v0.4.1-alpha	2022-02-10 20:49:26 -06:00
Jason DoveandGitHub	ea08453913	vaapi improvements (#629 ) * fix interlaced video with vaapi * downgrade imagesharp to fix blurhash generation * fix ui crash loading collection editor	2022-02-10 20:19:59 -06:00
Jason DoveandGitHub	87deaa6f3a	nvidia improvements (#628 )	2022-02-10 15:39:45 -06:00
Jason DoveandGitHub	9d99c19ea4	fix playback with unknown pixel format (#627 )	2022-02-10 08:37:25 -06:00
Jason DoveandGitHub	49d14b05f6	update more dependencies (#626 )	2022-02-09 11:08:49 -06:00
Jason DoveandGitHub	a8ba9edf2b	update dependencies (#624 ) * update dependencies * include refit xml serializer	2022-02-09 10:10:12 -06:00
Jason DoveandGitHub	89811a1203	wait for one segment by default (#617 )	2022-02-07 12:44:12 -06:00
Jason DoveandGitHub	534e2c4512	add hls segmenter initial segment count (#616 )	2022-02-07 12:18:58 -06:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	c1e148633d	Bump Blazored.LocalStorage from 4.1.5 to 4.2.0 (#614 ) Bumps [Blazored.LocalStorage](https://github.com/Blazored/LocalStorage) from 4.1.5 to 4.2.0. - [Release notes](https://github.com/Blazored/LocalStorage/releases) - [Commits](https://github.com/Blazored/LocalStorage/compare/v4.1.5...v4.2.0) --- updated-dependencies: - dependency-name: Blazored.LocalStorage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-02-07 03:10:34 -06:00
Jason DoveandGitHub	a9dff5eff7	properly flag local missing folders (#615 )	2022-02-07 02:39:24 -06:00
Jason Dove	a2da043f4b	try to fix mac permission issues	2022-02-06 17:45:28 -06:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	252c185562	Bump MudBlazor from 6.0.5 to 6.0.6 (#609 ) Bumps [MudBlazor](https://github.com/MudBlazor/MudBlazor) from 6.0.5 to 6.0.6. - [Release notes](https://github.com/MudBlazor/MudBlazor/releases) - [Changelog](https://github.com/MudBlazor/MudBlazor/blob/dev/CHANGELOG.md) - [Commits](https://github.com/MudBlazor/MudBlazor/compare/v6.0.5...v6.0.6) --- updated-dependencies: - dependency-name: MudBlazor dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-02-05 18:20:45 -06:00
Jason DoveandGitHub	a47987a9d7	revert windows trimming (#613 ) * Revert "disable trimming in docker" This reverts commit `5937211bb8`. * Revert "try to reduce windows artifact size" This reverts commit `e32dbd0474`.	2022-02-05 18:09:02 -06:00
Jason Dove	5937211bb8	disable trimming in docker	2022-02-05 13:41:47 -06:00
Jason Dove	e32dbd0474	try to reduce windows artifact size	2022-02-05 13:34:21 -06:00
Jason Dove	6bcc1ede2b	try again	2022-02-05 11:25:14 -06:00
Jason Dove	6c9764a51e	try a different method for downloading ffmpeg	2022-02-05 11:19:56 -06:00
Jason Dove	ff5438459c	try to bundle ffmpeg with windows artifacts	2022-02-05 11:09:01 -06:00
Jason DoveandGitHub	0c53a4509c	show collection name in some error messages (#612 )	2022-02-04 20:17:17 -06:00
Jason DoveandGitHub	5fd315ead8	change framerate normalization method (#611 )	2022-02-04 14:39:27 -06:00
Jason DoveandGitHub	f02b0ac345	re-introduce framerate normalization (#610 )	2022-02-04 12:57:40 -06:00
Jason Dove	fd83007296	try to fix watermark on vaapi	2022-02-01 17:50:47 -06:00
Jason DoveandGitHub	70ca5bf050	fix bug with watermark and short content (#608 )	2022-01-31 14:07:12 -06:00
Jason DoveandGitHub	eed9f60273	fade in and fade out intermittent watermarks (#607 ) * first pass at fading in/out overlay * fix tests * update changelog	2022-01-31 12:31:56 -06:00
Jason Dove	0e2e6cd52e	build linux-arm64 artifacts	2022-01-31 01:07:03 -06:00
Jason DoveandGitHub	c9b557f2e6	more xmltv category improvements (#606 )	2022-01-30 17:58:45 -06:00
Jason Dove	cde869f3eb	enable docker dependency scanning [no build]	2022-01-30 11:50:16 -06:00
Jason DoveandGitHub	90d6a59d3f	normalize smart quotes in search queries (#605 )	2022-01-30 11:09:32 -06:00
Jason DoveandGitHub	b972947747	xmltv category improvements (#604 )	2022-01-30 10:56:53 -06:00
Jason Dove	17bc988b49	update changelog for release v0.4.0-alpha [no ci]	2022-01-29 18:22:07 -06:00
Jason Dove	749eea836b	update install docs for tray apps (win, mac) [no build]	2022-01-29 18:18:58 -06:00
Jason DoveandGitHub	37c52c4cb4	update docs and dependencies (#603 )	2022-01-29 18:08:05 -06:00
Jason DoveandGitHub	33ba58aa68	add windows launcher (#602 )	2022-01-29 17:58:11 -06:00
Jason DoveandGitHub	5f6043e593	index added date (#601 )	2022-01-29 14:47:58 -06:00
Jason Dove	96e95a21fb	update changelog [no ci]	2022-01-29 12:34:10 -06:00
Jason DoveandGitHub	9168fd6bf2	write text file logs (#600 )	2022-01-29 12:31:22 -06:00
Jason Dove	14413f62a7	properly sent content root on macos	2022-01-29 11:49:38 -06:00
Jason Dove	34c71a0c12	try to fix static resource loading	2022-01-29 10:20:03 -06:00
Jason Dove	a487e7fe15	use absolute paths in bundle script	2022-01-28 22:11:50 -06:00
Jason Dove	cd4ea42597	fix bundle script	2022-01-28 22:05:20 -06:00
Jason Dove	a3d42145f7	update macos submodule	2022-01-28 21:57:16 -06:00
Jason Dove	261cf5052a	fetch submodules for mac build	2022-01-28 21:48:29 -06:00
Jason Dove	de9af2f0f6	first pass at native macos app	2022-01-28 21:41:26 -06:00
Jason DoveandGitHub	8d4e18ed2f	update mac app icon (#599 )	2022-01-28 19:46:34 -06:00
Jason DoveandGitHub	1ee01c1d78	fix hls timestamps (#598 )	2022-01-27 23:51:18 -06:00
Jason DoveandGitHub	7de50dd916	minor hls segmenter improvements (#593 )	2022-01-26 20:12:29 -06:00
Jason DoveandGitHub	744fd3beaa	link file not found health check to trash (#592 ) * update dependencies * fix file not found health check	2022-01-26 08:37:40 -06:00
Jason DoveandGitHub	861c95e1bd	fix m3u mode override (#590 )	2022-01-25 18:36:54 -06:00
Jason Dove	bb5b9f9be4	update changelog for release v0.3.8-alpha [no ci]	2022-01-23 21:46:00 -06:00
Jason Dove	135628441a	re-add mac launcher script	2022-01-23 21:09:04 -06:00
Jason DoveandGitHub	4aa7204984	fix ts mode with hdhr clients (#588 )	2022-01-23 18:58:15 -06:00
Jason Dove	1af59a0337	don't use macos launcher script	2022-01-23 18:47:00 -06:00
Jason Dove	c4c97fcc8c	customize mac dmg	2022-01-23 18:36:31 -06:00
Jason Dove	9c46e42792	fix gon variables	2022-01-23 14:21:13 -06:00
Jason Dove	efa803aab6	split mac artifacts job	2022-01-23 14:10:57 -06:00
Jason Dove	6ea02a2d77	use proper version number in ci artifacts [no docs] [no build]	2022-01-23 14:04:13 -06:00
Jason Dove	631f7d2d5e	don't use reserved secret name	2022-01-23 13:54:37 -06:00
Jason Dove	e44a4cb2e1	properly pass secrets between workflows	2022-01-23 13:53:31 -06:00
Jason Dove	f4b95419a6	properly pass data between jobs	2022-01-23 13:46:47 -06:00
Jason DoveandGitHub	1a5cf49563	refactor reusable docker workflow (#587 ) * refactor reusable docker workflow * refactor reusable artifacts workflow * fix name * try to fix * fix	2022-01-23 13:42:01 -06:00
Jason Dove	efef0b0fee	don't use single file for mac bundles	2022-01-22 17:29:35 -06:00
Jason Dove	ee7b8a71ab	fix docker builds [no build]	2022-01-22 14:19:49 -06:00
Jason DoveandGitHub	e7c9a51e96	macos app bundle (#585 ) * test signed app bundle * fix vars * fix condition * typo * fix quoting * use recursive signing script * fix release cleanup * restore proper ci action	2022-01-22 14:03:42 -06:00
Jason Dove	78a954f365	link to development builds in install docs	2022-01-21 20:55:38 -06:00
Jason Dove	355c0b7be9	try to fix deleting old assets	2022-01-21 20:29:50 -06:00
Jason Dove	3bcb2d36f9	another attempt at publishing artifacts	2022-01-21 20:21:26 -06:00
Jason Dove	b240de9d4a	publish develop artifacts to stable release url	2022-01-21 18:44:25 -06:00
Jason Dove	f5001837cb	properly separate build artifacts	2022-01-21 18:20:51 -06:00
Jason Dove	6ea916b1f0	fix fetch depth	2022-01-21 15:30:40 -06:00
Jason Dove	db6fd22215	try to fix build	2022-01-21 15:25:03 -06:00
Jason DoveandGitHub	691842008d	upload develop binaries for every merge to main (#584 ) * upload develop binaries for every merge to main * rename step	2022-01-21 15:18:08 -06:00
Jason DoveandGitHub	685f78bef8	fix search results bug (#583 )	2022-01-21 14:05:09 -06:00
Jason DoveandGitHub	3ce267863b	fix hls segmenter in some cultures (#582 )	2022-01-21 10:42:33 -06:00
Jason DoveandGitHub	e4231cb57d	upgrade from ffmpeg 4.4 to 5.0 (#581 )	2022-01-20 20:57:38 -06:00
Jason DoveandGitHub	03946b13ca	always use a single ffmpeg thread with realtime (#580 )	2022-01-20 14:53:13 -06:00
Jason DoveandGitHub	f1a81bf086	clarify library kind/media kind support (#579 ) [no docker]	2022-01-19 09:11:23 -06:00
Jason Dove	7a88374362	clarify flood scheduling calc [no ci]	2022-01-18 18:22:46 -06:00
Jason DoveandGitHub	663a62431b	properly fix startup paths (#576 )	2022-01-17 16:31:22 -06:00
Jason Dove	1d4acc284d	Update changelog for release v0.3.7-alpha [no ci]	2022-01-17 15:23:39 -06:00
Jason DoveandGitHub	0440f7643b	add videotoolbox acceleration (#575 )	2022-01-17 15:05:23 -06:00
Jason DoveandGitHub	0f4219f731	properly unlock libraries after failed scans (#574 )	2022-01-14 13:03:15 -06:00
Jason DoveandGitHub	cbe5d47611	fix trakt list sync when show does not contain a year (#572 )	2022-01-12 21:09:26 -06:00
Jason DoveandGitHub	afa52ccc89	add trash system for local libraries (#571 ) * flag local movies as file not found * show warning icon on cards * unflag movie that is found during scan * skip missing files when building playouts * add state to search index * add file not found health check * link to search from file not found health check * support flagging other media kinds as file not found * continue to schedule missing items * support episode files not found * wip trash page * fix trash url * trash page is functional * update changelog * fix changelog merge	2022-01-12 20:27:53 -06:00
Jason DoveandGitHub	7d1163c68f	fix double-click startup on mac (#570 )	2022-01-11 15:36:12 -06:00
Jason Dove	883492bd33	update changelog for release v0.3.6-alpha [no ci]	2022-01-10 19:51:01 -06:00
Jason DoveandGitHub	a4eac4feea	properly overwrite environment variables (#567 )	2022-01-08 10:01:22 -06:00
Jason Dove	dab58f5840	fix tests	2022-01-07 19:18:31 -06:00
Jason DoveandGitHub	176f136c23	fix some nvenc edge cases where only padding is needed for normalization (#565 )	2022-01-07 18:53:28 -06:00
Jason Dove	816d77e15b	update changelog [no ci]	2022-01-06 12:01:25 -06:00
Jason Dove	7c4d47a211	update changelog [no ci]	2022-01-06 10:31:18 -06:00
Jason DoveandGitHub	d9d2cfa8be	search index fixes (#559 ) * add music video artist to search index * properly index minutes field when adding from scan * bump search index version	2022-01-06 10:28:53 -06:00
Jason DoveandGitHub	8036e46966	update streaming mode docs (#558 ) [no docker]	2022-01-06 09:10:12 -06:00
Jason DoveandGitHub	594ce437fb	rework mpeg-ts mode (#557 )	2022-01-05 21:27:28 -06:00