Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update some renderer's configuration #1320

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/external-resources/UMS.conf
Expand Up @@ -1233,7 +1233,7 @@ vlc_path =
script_dir =

############################################
## Buffer settings
## Buffer settings (non-GUI)
############################################

# Transcode keep first connection
Expand All @@ -1246,11 +1246,11 @@ transcode_keep_first_connection =
# Transcode block multiple connections
# ------------------------------------
# When set to "true" activate the BufferOutputFile.java.
# Have a Boolean value opposite to that of transcode_keep_first_connection.
# Have a boolean value opposite to that of transcode_keep_first_connection.
# Default: false
transcode_block_multiple_connections =

# Maximum audo buffer size
# Maximum audio buffer size
# ------------------------
# The maximum size (in MB) that UMS should use for buffering audio.
# Default: 100
Expand Down
69 changes: 39 additions & 30 deletions src/main/external-resources/renderers/DefaultRenderer.conf
Expand Up @@ -588,7 +588,7 @@ CharMap =
#
# Tag: Full Name: MIME type: Notes:
# ------------------------------------------------------------------------------------------------
# 3ga 3rd Generation Partnership Project Audio audio/3gpp
# 3ga 3rd Generation Partnership Project Audio audio/3gpp Some renderers also use audio/3ga
# 3gp 3rd Generation Partnership Project video/3gpp
# 3g2a 3rd Generation Partnership Project 2 Audio audio/3gpp2
# 3g2 3rd Generation Partnership Project 2 video/3gpp2
Expand All @@ -614,9 +614,9 @@ CharMap =
# celp Code-Excited Linear Prediction
# cook RealAudio audio codec audio/vnd.rn-realaudio
# cvid Cinepak (previously CompactVideo) video/x-cinepak
# dff DSD File Format audio/x-dff
# dff DSD File Format audio/x-dff Only used in "StreamExtensions"
# divx DivX Video video/avi Also video/x-divx with Samsung J series
# dsf DSD Storage Facility audio/x-dsf
# dsf DSD Storage Facility audio/x-dsf Only used in "StreamExtensions"
# dts Digital Theater Systems audio/vnd.dts
# dtshd Digital Theater Systems (HD) audio/vnd.dts.hd
# dv Digital Video video/dv
Expand Down Expand Up @@ -647,7 +647,7 @@ CharMap =
# mp2 MPEG Audio Layer II audio/mpeg
# mp3 MPEG-1 or MPEG-2 Audio Layer III audio/mpeg
# mp4 ISOM/MPEG4 container, or MPEG-4 codec video/mp4 For Video files
# m4a ISOM/MPEG4 container, AAC-LC/HE-AAC/ALAC audio/mp4 For Audio files
# m4a ISOM/MPEG4 container, AAC-LC/HE-AAC/ALAC audio/mp4 Set to audio/x-m4a by default for now
# mpa MPEG Audio audio/mpeg
# mpc MusePack audio/x-musepack
# mpeg1 MPEG-1 video/mpeg Used in VCDs
Expand All @@ -657,8 +657,7 @@ CharMap =
# nellymoser Also known as Asao. Used in Flash
# oga Ogg container with only audio content audio/ogg
# ogg Ogg container video/ogg Applies for Vorbis I files only, use with FLAC and Theora should use oga and ogv respectively
# ogv Ogg container with video content video/ogg
# ogx Ogg container application/ogg
# ogv Ogg container with video content video/ogg Some renderers seem to use application/ogg
# opus Ogg Opus Need audio/ogg or audio/opus
# png Portable Network Graphics image/png
# qcelp Qualcomm Code-Excited Linear Prediction Also known as Qualcomm PureVoice
Expand Down Expand Up @@ -774,36 +773,46 @@ StreamSubsForTranscodedVideo =
RemoveTagsFromSRTSubtitles =

# The preferred 3D video format. This option forces FFmpeg to convert it.
# https://ffmpeg.org/ffmpeg-filters.html#stereo3d
# Note: The conversion is CPU-intensive so some CPUs may not be fast enough.
#
# Options:
#
# Preset: Description:
# ----------------------
# arcg Anaglyph (Red, cyan, gray)
# arch Anaglyph (Red, cyan, half color)
# arcc Anaglyph (Red, cyan, color)
# arcd Anaglyph (Red, cyan, dubois)
# agmg Anaglyph (Green, magenta, gray)
# agmh Anaglyph (Green, magenta, half color)
# agmc Anaglyph (Green, magenta, color)
# agmd Anaglyph (Green, magenta, dubois)
# aybg Anaglyph (Yellow, blue, gray)
# aybh Anaglyph (Yellow, blue, half color)
# aybc Anaglyph (Yellow, blue, color)
# aybd Anaglyph (Yellow, blue, dubois)
# ml Mono (Left eye first). It converts 3D video to 2D
# mr Mono (Right eye first). It converts 3D video to 2D
# sbsl Side by side (Left eye first)
# sbsr Side by side (Right eye first)
# sbs2l Half side by side (Left eye first)
# sbs2r Half side by side (Right eye first)
# abl Over under (Left eye first)
# abr Over under (Right eye first)
# ab2l Half over under (Left eye first)
# ab2r Half over under (Right eye first)
# irl Interleave rows (Left eye first)
# irr Interleave rows (Right eye first)
# sbsl side by side parallel (left eye left, right eye right)
# sbsr side by side crosseye (right eye left, left eye right)
# sbs2l side by side parallel with half width resolution (left eye left, right eye right)
# sbs2r side by side crosseye with half width resolution (right eye left, left eye right)
# abl above-below (left eye above, right eye below)
# abr above-below (right eye above, left eye below)
# ab2l above-below with half height resolution (left eye above, right eye below)
# ab2r above-below with half height resolution (right eye above, left eye below)
# al alternating frames (left eye first, right eye second)
# ar alternating frames (right eye first, left eye second)
# irl interleaved rows (left eye has top row, right eye starts on next row)
# irr interleaved rows (right eye has top row, left eye starts on next row)
# arbg anaglyph red/blue gray (red filter on left eye, blue filter on right eye)
# argg anaglyph red/green gray (red filter on left eye, green filter on right eye)
# arcg anaglyph red/cyan gray (red filter on left eye, cyan filter on right eye)
# arch anaglyph red/cyan half colored (red filter on left eye, cyan filter on right eye)
# arcc anaglyph red/cyan color (red filter on left eye, cyan filter on right eye)
# arcd anaglyph red/cyan color optimized with the least squares projection of dubois (red filter on left eye, cyan filter on right eye)
# agmg anaglyph green/magenta gray (green filter on left eye, magenta filter on right eye)
# agmh anaglyph green/magenta half colored (green filter on left eye, magenta filter on right eye)
# agmc anaglyph green/magenta colored (green filter on left eye, magenta filter on right eye)
# agmd anaglyph green/magenta color optimized with the least squares projection of dubois (green filter on left eye, magenta filter on right eye)
# aybg anaglyph yellow/blue gray (yellow filter on left eye, blue filter on right eye)
# aybh anaglyph yellow/blue half colored (yellow filter on left eye, blue filter on right eye)
# aybc anaglyph yellow/blue colored (yellow filter on left eye, blue filter on right eye)
# aybd anaglyph yellow/blue color optimized with the least squares projection of dubois (yellow filter on left eye, blue filter on right eye)
# ml mono output (left eye only)
# mr mono output (right eye only)
# chl checkerboard, left eye first
# chr checkerboard, right eye first
# icl interleaved columns, left eye first
# icr interleaved columns, right eye first
# hdmi HDMI frame pack
#
# Default: ""
Output3DFormat =
Expand Down
Expand Up @@ -20,8 +20,8 @@
# BubbleUPnP (Chromecast/DLNA)
# MX Player
#
# For AC-3 and DTS audio support, install the custom codec for MX Player instead of the one provided
# in the Play Store wich you can download from:
# For DTS, Enhanced AC-3, and MLP audio support. Install the custom codec for MX Player instead of
# the one provided in the Play Store that can be downloaded from:
# http://forum.xda-developers.com/apps/mx-player/mx-player-custom-codec-dts-support-t2156254
#
# Uncheck "Mime-type check" in the BubbleUPnP app so that MX Player is used to play audio files
Expand Down Expand Up @@ -96,7 +96,6 @@ UpnpDetailsSearch = BubbleUPnP Media Renderer
# override the "Google-Android.conf" and the ""Google-Android-Chromecast.conf"
LoadingPriority = 2

TranscodeAudio = LPCM
H264Level41Limited = false
MaxVolume = 13
MediaInfo = true
Expand All @@ -117,22 +116,50 @@ Supported = f:mpegts v:h264|h265|mpeg2|vc1 a:aac-lc|he
Supported = f:ogg v:divx|theora a:vorbis m:video/ogg
Supported = f:rm v:rm a:aac-lc|he-aac|ac3|cook|ralf m:application/vnd.rn-realmedia-vbr
Supported = f:webm v:vp8|vp9 a:vorbis m:video/webm
Supported = f:wmv v:mp4|mpeg2|vc1|wmv a:adpcm|lpcm|mpa|wma m:video/x-ms-wmv
Supported = f:wmv v:mp4|mpeg2|vc1|wmv a:adpcm|lpcm|mpa|wma|wma10|wmalossless|wmapro m:video/x-ms-wmv
Supported = f:wtv m:video/wtv

# Supported audio formats:
Supported = f:adts a:aac-lc|he-aac m:audio/aac
Supported = f:aiff m:audio/L16
Supported = f:amr a:amr m:audio/3gpp
Supported = f:flac m:audio/flac
Supported = f:lpcm s:192000 n:2 m:audio/L16
Supported = f:m4a|3ga a:alac b:705000 s:44100 m:audio/mp4
Supported = f:m4a|3ga a:aac-lc|he-aac|amr m:audio/mp4
Supported = f:mp3|mp2|mpa m:audio/mpeg
Supported = f:oga a:flac|opus
Supported = f:oga a:vorbis n:2 m:audio/x-ogg
Supported = f:aiff s:6000 n:1 m:audio/L16;rate=6000;channels=1
Supported = f:aiff s:6000 n:2 m:audio/L16;rate=6000;channels=2
Supported = f:aiff s:8000 n:1 m:audio/L16;rate=8000;channels=1
Supported = f:aiff s:8000 n:2 m:audio/L16;rate=8000;channels=2
Supported = f:aiff s:11025 n:1 m:audio/L16;rate=11025;channels=1
Supported = f:aiff s:11025 n:2 m:audio/L16;rate=11025;channels=2
Supported = f:aiff s:16000 n:1 m:audio/L16;rate=16000;channels=1
Supported = f:aiff s:16000 n:2 m:audio/L16;rate=16000;channels=2
Supported = f:aiff s:22050 n:1 m:audio/L16;rate=22050;channels=1
Supported = f:aiff s:22050 n:2 m:audio/L16;rate=22050;channels=2
Supported = f:aiff s:24000 n:1 m:audio/L16;rate=24000;channels=1
Supported = f:aiff s:24000 n:2 m:audio/L16;rate=24000;channels=2
Supported = f:aiff s:32000 n:1 m:audio/L16;rate=32000;channels=1
Supported = f:aiff s:32000 n:2 m:audio/L16;rate=32000;channels=2
Supported = f:aiff s:44100 n:1 m:audio/L16;rate=44100;channels=1
Supported = f:aiff s:44100 n:2 m:audio/L16;rate=44100;channels=2
Supported = f:aiff s:48000 n:1 m:audio/L16;rate=48000;channels=1
Supported = f:aiff s:48000 n:2 m:audio/L16;rate=48000;channels=2
Supported = f:aiff s:64000 n:1 m:audio/L16;rate=640060;channels=1
Supported = f:aiff s:64000 n:2 m:audio/L16;rate=64000;channels=2
Supported = f:aiff s:88200 n:1 m:audio/L16;rate=88200;channels=1
Supported = f:aiff s:88200 n:2 m:audio/L16;rate=88200;channels=2
Supported = f:aiff s:96000 n:1 m:audio/L16;rate=96000;channels=1
Supported = f:aiff s:96000 n:2 m:audio/L16;rate=96000;channels=2
Supported = f:aiff s:176400 n:1 m:audio/L16;rate=176400;channels=1
Supported = f:aiff s:176400 n:2 m:audio/L16;rate=176400;channels=2
Supported = f:aiff s:192000 n:1 m:audio/L16;rate=192000;channels=1
Supported = f:aiff s:192000 n:2 m:audio/L16;rate=192000;channels=2
Supported = f:amr a:amr m:audio/3gpp
Supported = f:flac m:audio/flac
Supported = f:lpcm s:192000 n:2 m:audio/L16
Supported = f:m4a|3ga a:alac b:705000 s:44100 m:audio/mp4
Supported = f:m4a|3ga a:aac-lc|he-aac|amr m:audio/mp4
Supported = f:mp3|mp2|mpa m:audio/mpeg
Supported = f:oga a:vorbis n:2 m:audio/x-ogg
Supported = f:wav a:adpcm|lpcm|mp3 m:audio/wav

# Supported subtitles formats:
SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP,TEXT,WEBTT
SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP,TEXT,WEBVTT
SupportedInternalSubtitlesFormats = ASS,DIVX,PGS,SUBRIP,TEXT,VOBSUB

# ============================================================================
Expand Down
20 changes: 9 additions & 11 deletions src/main/external-resources/renderers/Google-ChromecastUltra.conf
Expand Up @@ -17,29 +17,27 @@ RendererIcon = Google-ChromecastUltra.png
UserAgentSearch = CrKey.*aarch64|aarch64.*CrKey
LoadingPriority = 2

#MaxVideoWidth = 3840
#MaxVideoHeight = 2160
MaxVideoWidth = 3840
MaxVideoHeight = 2160
SeekByTime = exclusive
TranscodeVideo = MPEGTS-H264-AC3
TranscodeAudio = MP3
videoBitDepth = 8,10
SupportedVideoBitDepths = 8,10
H264Level41Limited = false
MaxVideoBitrateMbps = 40
MimeTypesChanges = video/mpeg=video/mp4
CustomFFmpegOptions = -async 1 -fflags +genpts -c:a libmp3lame -ac 2 -b:v 35000k -bufsize 35000k -f matroska
MediaInfo = true

# Supported video formats:
# ChromecastUltra seems to be fine with mkv, and plays h265 unlike the classic
Supported = f:mpegts|mp4|mkv v:mp4|h264|h265 a:aac-lc|he-aac|mp3 n:2 m:video/mpeg
Supported = f:webm v:vp8|vp9 a:opus|vorbis n:2 m:video/webm
Supported = f:mpegts|mp4|mkv v:mp4|h264|h265 a:aac-lc|he-aac|mp3 n:2 m:video/mp4
Supported = f:webm v:vp8|vp9 a:opus|vorbis n:2

# Supported audio formats:
Supported = f:flac n:2 m:audio/flac
Supported = f:mp3 n:2 m:audio/mp3
Supported = f:flac n:2
Supported = f:mp3 n:2
Supported = f:m4a n:2 a:aac-lc|he-aac|mp3 m:audio/mp4
Supported = f:wav n:2 a:lpcm m:audio/x-wav
Supported = f:weba n:2 a:opus|vorbis m:audio/webm
Supported = f:wav n:2 a:lpcm
Supported = f:weba n:2 a:opus|vorbis

# Supported subtitles formats:
SupportedExternalSubtitlesFormats = WEBVTT
21 changes: 10 additions & 11 deletions src/main/external-resources/renderers/Kodi.conf
Expand Up @@ -35,34 +35,33 @@ Supported = f:theora|ogg v:cvid|divx|h263|h264|h265|mjpeg|mp4|mpeg1|mpeg2|v
Supported = f:webm v:vp6|vp7|vp8|vp9 a:opus m:video/webm
Supported = f:wmv v:cvid|divx|h263|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|eac3|dts|dtshd|lpcm|mp2|mp3|mpa|truehd|wma m:video/x-ms-wmv


# Supported audio formats:
Supported = f:ac3 m:audio/vnd.dolby.dd-raw
Supported = f:ac3
Supported = f:acdpm m:audio/x-adpcm
Supported = f:adts a:aac-lc|he-aac m:audio/aac
Supported = f:aiff m:audio/aiff
Supported = f:aiff
Supported = f:amr m:audio/amr
Supported = f:ape m:audio/x-ape
Supported = f:ape
Supported = f:atmos m:audio/atmos
Supported = f:atrac m:audio/x-sony-oma
Supported = f:atrac
Supported = f:cook m:audio/cook
Supported = f:eac3 m:audio/eac3
Supported = f:flac m:audio/flac
Supported = f:lpcm m:audio/L16
Supported = f:m4a|3ga a:alac m:audio/x-m4a
Supported = f:m4a|3ga a:aac-lc|he-aac m:audio/x-m4a
Supported = f:m4a|3ga a:aac-lc|he-aac m:audio/mp4
Supported = f:mka m:audio/x-matroska
Supported = f:mlp m:audio/mlp
Supported = f:mp3 m:audio/mpeg
Supported = f:mpa m:audio/mpa
Supported = f:oga m:audio/ogg
Supported = f:oga
Supported = f:opus m:audio/opus
Supported = f:ralf m:audio/ralf
Supported = f:truehd m:audio/truehd
Supported = f:tta m:audio/tta
Supported = f:wav m:audio/wav
Supported = f:wavpack m:audio/x-wavpack
Supported = f:wma m:audio/x-ms-wma
Supported = f:tta
Supported = f:wav
Supported = f:wavpack
Supported = f:wma

# Supported subtitles formats:
SupportedExternalSubtitlesFormats = ASS,PGS,SAMI,SUBRIP,TEXT,UFS,WEBVTT
Expand Down