diff --git a/src/main/external-resources/UMS.conf b/src/main/external-resources/UMS.conf index 74e039ca75..e1c65129a2 100644 --- a/src/main/external-resources/UMS.conf +++ b/src/main/external-resources/UMS.conf @@ -1233,7 +1233,7 @@ vlc_path = script_dir = ############################################ -## Buffer settings +## Buffer settings (non-GUI) ############################################ # Transcode keep first connection @@ -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 diff --git a/src/main/external-resources/renderers/DefaultRenderer.conf b/src/main/external-resources/renderers/DefaultRenderer.conf index 1200e5db04..71a6574c96 100644 --- a/src/main/external-resources/renderers/DefaultRenderer.conf +++ b/src/main/external-resources/renderers/DefaultRenderer.conf @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 = diff --git a/src/main/external-resources/renderers/Google-Android-BubbleUPnP-MXPlayer.conf b/src/main/external-resources/renderers/Google-Android-BubbleUPnP-MXPlayer.conf index 549c4af725..6435973348 100644 --- a/src/main/external-resources/renderers/Google-Android-BubbleUPnP-MXPlayer.conf +++ b/src/main/external-resources/renderers/Google-Android-BubbleUPnP-MXPlayer.conf @@ -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 @@ -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 @@ -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 # ============================================================================ diff --git a/src/main/external-resources/renderers/Google-ChromecastUltra.conf b/src/main/external-resources/renderers/Google-ChromecastUltra.conf index 03974e8fa1..2247501dd0 100644 --- a/src/main/external-resources/renderers/Google-ChromecastUltra.conf +++ b/src/main/external-resources/renderers/Google-ChromecastUltra.conf @@ -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 diff --git a/src/main/external-resources/renderers/Kodi.conf b/src/main/external-resources/renderers/Kodi.conf index 5792907827..06edcb2e2f 100644 --- a/src/main/external-resources/renderers/Kodi.conf +++ b/src/main/external-resources/renderers/Kodi.conf @@ -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 diff --git a/src/main/external-resources/renderers/LG-BP.conf b/src/main/external-resources/renderers/LG-BP.conf index d2cc5c00a5..c8ce5df968 100644 --- a/src/main/external-resources/renderers/LG-BP.conf +++ b/src/main/external-resources/renderers/LG-BP.conf @@ -20,23 +20,23 @@ TranscodeFastStart = true MediaInfo = true # Supported video formats: -Supported = f:3gp|3g2 v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/3gpp -Supported = f:avi v:h264|mp4|mpeg1|mpeg2 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-divx qpel:no gmc:0 -Supported = f:flv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-flv -Supported = f:mov v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/quicktime -Supported = f:mkv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-matroska -Supported = f:mp4 v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/mp4 -Supported = f:mpegps v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/mpeg -Supported = f:mpegts v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/mpeg -Supported = f:wmv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-ms-wmv +Supported = f:3gp|3g2 v:h264|mp4 a:aac-lc|ac3|he-aac|mp3 m:video/3gpp +Supported = f:avi v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma m:video/x-divx qpel:no gmc:0 +Supported = f:flv v:h264|mp4 a:aac-lc|ac3|he-aac|mp3 +Supported = f:mov v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma +Supported = f:mkv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma +Supported = f:mp4 v:h264|mp4 a:aac-lc|ac3|dts|he-aac|mpa|mp3 +Supported = f:mpegps v:h264|mp4|mpeg1|mpeg2 a:aac-lc|ac3|dts|mpa|mp3 +Supported = f:mpegts v:h264|mp4|mpeg1|mpeg2 a:aac-lc|ac3|dts|mpa|mp3 m:video/mpeg +Supported = f:wmv v:mp4|vc1 a:aac-lc|ac3|mpa|mp3|wma # Supported audio formats: -Supported = f:flac m:audio/flac +Supported = f:flac Supported = f:m4a m:audio/mp4 -Supported = f:mp3 m:audio/mpeg -Supported = f:oga m:audio/ogg +Supported = f:mp3 +Supported = f:oga Supported = f:wav m:audio/wav -Supported = f:wma m:audio/x-ms-wma +Supported = f:wma SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP,TEXT SupportedInternalSubtitlesFormats = ASS,DIVX,MICRODVD,SAMI,SUBRIP,TEXT diff --git a/src/main/external-resources/renderers/LG-BP550.conf b/src/main/external-resources/renderers/LG-BP550.conf index 031df3c43f..547ec9dedc 100644 --- a/src/main/external-resources/renderers/LG-BP550.conf +++ b/src/main/external-resources/renderers/LG-BP550.conf @@ -21,23 +21,23 @@ TranscodeFastStart = true MediaInfo = true # Supported video formats: -Supported = f:3gp|3g2 v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/3gpp -Supported = f:avi v:h264|mp4|mpeg1|mpeg2 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-divx qpel:no gmc:0 -Supported = f:flv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-flv -Supported = f:mov v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/quicktime -Supported = f:mkv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma m:video/x-matroska -Supported = f:mp4 v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma m:video/mp4 -Supported = f:mpegps v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/mpeg -Supported = f:mpegts v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/mpeg -Supported = f:wmv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/x-ms-wmv +Supported = f:3gp|3g2 v:h264|mp4 a:aac-lc|mpa|mp3 m:video/3gpp +Supported = f:avi v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma m:video/x-divx qpel:no gmc:0 +Supported = f:flv v:h264|mp4 a:aac-lc|ac3|he-aac|mp3 +Supported = f:mov v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma +Supported = f:mkv v:h264|mp4|mpeg1|mpeg2|vc1 a:aac-lc|ac3|dts|he-aac|mpa|mp3|wma +Supported = f:mp4 v:h264|mp4 a:aac-lc|ac3|dts|he-aac|mpa|mp3 +Supported = f:mpegps v:h264|mp4|mpeg1|mpeg2 a:aac-lc|ac3|mpa|mp3 +Supported = f:mpegts v:h264|mp4|mpeg1|mpeg2 a:aac-lc|ac3|dts|mpa|mp3|wma m:video/mpeg +Supported = f:wmv v:mp4|vc1 a:aac-lc|ac3|dts|mpa|mp3|wma # Supported audio formats: -Supported = f:flac m:audio/flac +Supported = f:flac Supported = f:m4a m:audio/mp4 -Supported = f:mp3 m:audio/mpeg -Supported = f:oga m:audio/ogg +Supported = f:mp3 +Supported = f:oga Supported = f:wav m:audio/wav -Supported = f:wma m:audio/x-ms-wma +Supported = f:wma SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP,TEXT SupportedInternalSubtitlesFormats = ASS,DIVX,MICRODVD,SAMI,SUBRIP,TEXT diff --git a/src/main/external-resources/renderers/LG-EG910V.conf b/src/main/external-resources/renderers/LG-EG910V.conf index 17b12fb3b3..a16e19005c 100644 --- a/src/main/external-resources/renderers/LG-EG910V.conf +++ b/src/main/external-resources/renderers/LG-EG910V.conf @@ -33,7 +33,7 @@ Supported = f:m4a m:audio/x-m4a Supported = f:aiff m:audio/L16 Supported = f:flac m:audio/flac Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg +Supported = f:oga m:audio/x-ogg Supported = f:wma m:audio/x-ms-wma Supported = f:wav m:audio/wav diff --git a/src/main/external-resources/renderers/Microsoft-WindowsMediaPlayer.conf b/src/main/external-resources/renderers/Microsoft-WindowsMediaPlayer.conf index 353c846b77..2b849efa63 100644 --- a/src/main/external-resources/renderers/Microsoft-WindowsMediaPlayer.conf +++ b/src/main/external-resources/renderers/Microsoft-WindowsMediaPlayer.conf @@ -99,10 +99,10 @@ Supported = f:mpegts v:h264|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:lpcm|mpa|wma m:video/x-ms-wmv +Supported = f:wmv v:mp4|mpeg2|vc1|wmv a:lpcm|mpa|wma|wma10|wmalossless|wmapro m:video/x-ms-wmv # Supported audio formats: -Supported = f:3ga|3ga2 a:aac-lc|he-aac m:audio/3gpp +Supported = f:3ga|3g2a a:aac-lc|he-aac m:audio/3gpp Supported = f:ac3 a:ac3 m:audio/ac3 Supported = f:adts a:aac-lc|he-aac m:audio/aac Supported = f:aiff a:lpcm m:audio/aiff diff --git a/src/main/external-resources/renderers/Naim-Mu-So.conf b/src/main/external-resources/renderers/Naim-Mu-So.conf index 10ad18b043..da9623218b 100644 --- a/src/main/external-resources/renderers/Naim-Mu-So.conf +++ b/src/main/external-resources/renderers/Naim-Mu-So.conf @@ -30,6 +30,6 @@ Supported = f:aiff n:2 m:audio/L16 Supported = f:atrac n:2 m:audio/x-oma Supported = f:flac n:2 m:audio/x-flac Supported = f:mp3 n:2 m:audio/mpeg -Supported = f:ogg n:2 m:audio/x-ogg +Supported = f:oga n:2 m:audio/x-ogg Supported = f:wav n:2 s:48000 m:audio/wav -Supported = f:wma n:2 m:audio/x-ms-wma \ No newline at end of file +Supported = f:wma n:2 m:audio/x-ms-wma diff --git a/src/main/external-resources/renderers/Panasonic-VieraE6.conf b/src/main/external-resources/renderers/Panasonic-VieraE6.conf index dcbb42846e..dbeef742a2 100644 --- a/src/main/external-resources/renderers/Panasonic-VieraE6.conf +++ b/src/main/external-resources/renderers/Panasonic-VieraE6.conf @@ -31,6 +31,7 @@ TranscodeFastStart = true KeepAspectRatioTranscoding = true H264Level41Limited = false SendDateMetadata = false +Output3DFormat = ml PushMetadata = false MediaInfo = true @@ -53,13 +54,13 @@ Supported = f:mpegts v:mp4 a:aac-lc|he-aac|ac3|eac3| Supported = f:wmv v:vc1 a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/x-ms-wmv # Supported audio formats: -Supported = f:3ga|3g2a|m4a m:audio/mp4 a:aac-lc|aac-ltp|he-aac|he-aacv2 -Supported = f:m4a m:audio/x-m4a a:(?!aac-|he-aac) -Supported = f:adts m:audio/vnd.dlna.adts a:aac-lc|he-aac -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:wav m:audio/wav a:dts|lpcm s:48000 -Supported = f:wma m:audio/x-ms-wma +Supported = f:3ga|3g2a|m4a m:audio/mp4 a:aac-lc|aac-ltp|he-aac|he-aacv2 +Supported = f:m4a a:(?!aac-|he-aac) +Supported = f:adts a:aac-lc|he-aac +Supported = f:flac +Supported = f:mp3 +Supported = f:wav m:audio/wav a:dts|lpcm s:48000 +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = SUBRIP,MICRODVD,TEXT diff --git a/src/main/external-resources/renderers/Philips-PFL.conf b/src/main/external-resources/renderers/Philips-PFL.conf index 53eb409b7d..5dcb0cbe43 100644 --- a/src/main/external-resources/renderers/Philips-PFL.conf +++ b/src/main/external-resources/renderers/Philips-PFL.conf @@ -30,36 +30,6 @@ # According the specs from the 'Codec_table_all.xls' downloaded from Philips support, # it is suitable for the xxPFLxxx5 serie. Not tested by me! -# Specification Philips 40pfl8605h_12: -# ---------------------------------------------------------------------------- -# Taken from leaflet 15.6.9 -# -# Picture playback format: jpeg -# Music playback formats: mp3,wma(v2 up to v9.2),aac -# -# Video playback formats: -# Codec support: h.264/mpeg-4 avc,mpeg 1,mpeg 2,mpeg 4,wmv9/vc1 -# Containers: avi,mkv -# -# Taken from manual. -# playback formats: -# jpeg (still pictures) -# mpeg program and transport stream -# mp4 -# asf - -# Information from the "Device Sniffer for UPnP Technologies" program: -# -# HTTP/1.1 200 OK -# CACHE-CONTROL: max-age=1800 -# DATE: Mon, 26 Sep 2011 22:19:40 GMT -# EXT: -# LOCATION: http://192.168.2.8:49153/nmrDescription.xml -# SERVER: Windows2000/0.0 UPnP/1.0 PhilipsIntelSDK/1.4 DLNADOC/1.50 -# X-User-Agent: redsonic -# ST: upnp:rootdevice -# USN: uuid:F00DBABE-SA5E-BABA-DADA00903EF2D114::upnp:rootdevice - # Protocol info: # ---------------------------------------------------------------------------- # Mime types obtained with the "device spy for upnP technologies" program: @@ -121,12 +91,6 @@ # avi mpeg-4 visual with MP42 codec id. # mp4 avc (h264) with format profile baseline@L4.1 and high@L4.1 (birate limited b:4528690) # mov mpeg-4 quickTime with avc (h264) and format profile main@L4.1 (mov removed version 1.5) -# -# audio: -# wma voice -# wma pro -# wav with dts -# wav with mp3 # ---------------------------------------------------------------------------- # If some sound issue is met while transcoding, set the AC3 bitrate to 448 Kbps in the transcoding tab. # ---------------------------------------------------------------------------- @@ -137,52 +101,39 @@ RendererIcon = philips-pfl.png # ============================================================================ # This renderer has sent the following string/s: # -# HTTP User-Agent: Windows2000/0.0 UPnP/1.0 PhilipsIntelSDK/1.4 DLNADOC/1.50 +# User-Agent: Windows2000/0.0 UPnP/1.0 PhilipsIntelSDK/1.4 DLNADOC/1.50 +# X-User-Agent: redsonic +# uuid:F00DBABE-SA5E-BABA-DADA00903EF2D114 # ============================================================================ # UserAgentSearch = PhilipsIntelSDK/1.4|Streamium/1.0 -UpnpDetailsSearch = Philips TV +UpnpDetailsSearch = Philips TV|Philips.*NMR -TranscodeAudio = WAV -MimeTypesChanges = audio/x-m4a = audio/mp4 TranscodeExtensions = m2ts MaxVideoBitrateMbps = 75 ShowDVDTitleDuration = true -CreateDLNATreeFaster = true TranscodeFastStart = true KeepAspectRatio = true HalveBitrate = true MediaInfo = true -# Our Philips PFL-specific notes: -# DTS is not supported. -# MPEG-TS with H.264 is not supported. -# 6 (5.1) audio channels are supported. -# H.264 within AVI containers is not supported. -# DivX with QPEL within AVI container is not supported. -# GMC is supported. -# WMV is supported, but not with 5.1 or PRO audio. -# WMA audio is only supported within a WMA or WMV container. -# LPCM audio is only supported with MPEG-2, AIFF or WAV. -# MOV is not supported well enough to confidently stream. -# MKV with VC-1, MPEG-2, MPEG-4 or DivX is not supported. - -# Supported video formats: -Supported = f:mpegps v:mpeg1 a:mpa|mp3 m:video/mpeg -Supported = f:mpegps v:mpeg2 a:ac3|lpcm|mp3|mpa m:video/mpeg +# Supported video formats: (MOV is not supported well enough to confidently stream) +Supported = f:mpegps v:mpeg1 a:mpa|mp3 +Supported = f:mpegps v:mpeg2 a:ac3|lpcm|mp3|mpa Supported = f:mpegts v:mpeg2 a:mpa|ac3|lpcm m:video/vnd.dlna.mpeg-tts Supported = f:avi v:mp4 a:ac3|mp3|mpa m:video/x-msvideo Supported = f:avi v:divx a:ac3|mp3|mpa m:video/x-msvideo qpel:no Supported = f:divx v:divx a:ac3|mp3|mpa m:video/x-msvideo Supported = f:mp4 v:h264 a:aac-lc|he-aac|ac3|mp3|mpa m:video/h264 b:4528690 Supported = f:mp4 v:mp4 a:aac-lc|he-aac|ac3|mp3|mpa m:video/h264 -Supported = f:wmv v:vc1 a:wma m:video/x-ms-wmv n:2 s:48000 -Supported = f:mkv v:h264 a:aac-lc|he-aac|ac3|mp3|mpa m:video/x-matroska +Supported = f:wmv v:vc1 a:wma n:2 s:48000 +Supported = f:mkv v:h264 a:aac-lc|he-aac|ac3|mp3|mpa # Supported audio formats: -Supported = f:adts n:2 a:aac-lc s:48000 m:audio/vnd.dlna.adts -Supported = f:aiff|wav n:2 a:lpcm s:44100 b:1445069 m:audio/L16 -Supported = f:mp3|mpa n:2 s:48000 b:327680 m:audio/mpeg -Supported = f:mp4 n:6 a:aac-lc s:48000 b:327680 m:audio/mp4 -Supported = f:wma n:2 a:wma s:48000 b:348160 m:audio/x-ms-wma +Supported = f:adts n:2 a:aac-lc|he-aac s:48000 +Supported = f:aiff n:2 s:192000 +Supported = f:mp3|mpa n:2 s:48000 b:327680 +Supported = f:m4a n:6 a:aac-lc|he-aac s:48000 b:327680 m:audio/mp4 +Supported = f:wav n:2 a:lpcm s:192000 m:audio/wav +Supported = f:wma n:2 a:wma s:48000 b:348160 diff --git a/src/main/external-resources/renderers/Samsung-BDC6800.conf b/src/main/external-resources/renderers/Samsung-BDC6800.conf index c83178988d..49f56ad418 100644 --- a/src/main/external-resources/renderers/Samsung-BDC6800.conf +++ b/src/main/external-resources/renderers/Samsung-BDC6800.conf @@ -17,18 +17,18 @@ UserAgentSearch = BD-C6800 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 PrependTrackNumbers = true CharMap = / : +MediaInfo = true # Supported video formats: -Supported = f:avi v:divx|h264|mp4 a:ac3|dts|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:divx|h264|vc1 a:ac3|dts|mp3 m:video/x-matroska -Supported = f:mp4 v:h264|mp4 a:aac-lc m:video/mp4 -Supported = f:mpegps v:h264|mpeg1|mpeg2 a:ac3|dts|mpa m:video/mpeg -Supported = f:wmv v:vc1|wmv a:wma m:video/x-ms-wmv +Supported = f:avi v:divx|h264|mp4 a:ac3|dts|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|vc1 a:ac3|dts|mp3 m:video/x-mkv +Supported = f:mp4 v:h264|mp4 a:aac-lc +Supported = f:mpegps v:h264|mpeg1|mpeg2 a:ac3|dts|mpa +Supported = f:wmv v:vc1|wmv a:wma # Supported audio formats: -Supported = f:mp3 m:audio/mpeg -Supported = f:wma m:audio/x-ms-wma +Supported = f:mp3 +Supported = f:wma diff --git a/src/main/external-resources/renderers/Samsung-BDH6500.conf b/src/main/external-resources/renderers/Samsung-BDH6500.conf index 68079ea8c3..6310f332a6 100644 --- a/src/main/external-resources/renderers/Samsung-BDH6500.conf +++ b/src/main/external-resources/renderers/Samsung-BDH6500.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = H6500 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -29,26 +28,26 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma gmc:0 m:video/avi -Supported = f:flv v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mov v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mp4 +Supported = f:flv v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mp4 v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:mpegps|mpegts v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:wmv v:h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|wmv a:adpcm|aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:ape m:audio/x-ape -Supported = f:flac n:2 m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg n:2 m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:ape +Supported = f:flac n:2 +Supported = f:mp3 +Supported = f:oga n:2 +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB diff --git a/src/main/external-resources/renderers/Samsung-C6600.conf b/src/main/external-resources/renderers/Samsung-C6600.conf index ac5d6d293d..ede9dacdb2 100644 --- a/src/main/external-resources/renderers/Samsung-C6600.conf +++ b/src/main/external-resources/renderers/Samsung-C6600.conf @@ -21,7 +21,6 @@ UpnpDetailsSearch = Otthoni DefaultVBVBufSize = true MuxDTSToMpeg = true -WrapDTSIntoPCM = false MaxVideoBitrateMbps = 50 SeekByTime = true ChunkedTransfer = true @@ -31,14 +30,14 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:h264|mp4 a:aac-lc|he-aac m:video/3gpp -Supported = f:avi v:divx|h264|mjpeg|mp4 a:ac3|dts|lpcm|mp3 m:video/avi -Supported = f:mkv v:divx|h264|mjpeg|mp4 a:ac3|dts|lpcm|mp3 m:video/x-matroska -Supported = f:mp4 v:divx|h264|mp4 a:aac-lc|mp3 m:video/mp4 -Supported = f:mpegps v:h264|mpeg1|mpeg2 a:aac-lc|ac3|lpcm|mpa m:video/mpeg +Supported = f:3gp v:h264|mp4 a:aac-lc|he-aac +Supported = f:avi v:divx|h264|mjpeg|mp4 a:ac3|dts|lpcm|mp3 +Supported = f:mkv v:divx|h264|mjpeg|mp4 a:ac3|dts|lpcm|mp3 m:video/x-mmv +Supported = f:mp4 v:divx|h264|mp4 a:aac-lc|mp3 +Supported = f:mpegps v:h264|mpeg1|mpeg2 a:aac-lc|ac3|lpcm|mpa Supported = f:mpegts v:h264|mpeg2|vc1 a:aac-lc|he-aac|ac3|eac3|mp3 m:video/mpeg -Supported = f:wmv v:wmv a:wma m:video/x-ms-wmv +Supported = f:wmv v:wmv a:wma # Supported audio formats: -Supported = f:mp3 m:audio/mpeg -Supported = f:wav m:audio/wav +Supported = f:mp3 +Supported = f:wav diff --git a/src/main/external-resources/renderers/Samsung-CD.conf b/src/main/external-resources/renderers/Samsung-CD.conf index 6ce5ac859c..0b52fd52ce 100644 --- a/src/main/external-resources/renderers/Samsung-CD.conf +++ b/src/main/external-resources/renderers/Samsung-CD.conf @@ -38,7 +38,6 @@ UserAgentSearch = SEC_HHP.*(TV|HT|BD).*[CD]S?\d{3}\d?/ UpnpDetailsSearch = [CD]S?\d{3}\d? , (Samsung|AllShare) DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 25 SubtitleHttpHeader = CaptionInfo.sec PrependTrackNumbers = true @@ -48,11 +47,11 @@ MediaInfo = true # Supported video formats: Supported = f:avi|mkv m:video/avi Supported = f:flv m:video/mp4 -Supported = f:mov m:video/quicktime +Supported = f:mov Supported = f:mp4|mpegps|mpegts m:video/mpeg # Supported audio formats: -Supported = f:mp3 m:audio/mpeg +Supported = f:mp3 Supported = f:wav m:audio/L16 # Supported subtitles formats: diff --git a/src/main/external-resources/renderers/Samsung-D6400.conf b/src/main/external-resources/renderers/Samsung-D6400.conf index 62549f7ad5..e222ab99c9 100644 --- a/src/main/external-resources/renderers/Samsung-D6400.conf +++ b/src/main/external-resources/renderers/Samsung-D6400.conf @@ -19,21 +19,20 @@ UpnpDetailsSearch = UA\d{2}D6400 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 25 SubtitleHttpHeader = CaptionInfo.sec PrependTrackNumbers = true MediaInfo = true # Supported video formats: -Supported = f:3gp v:h264|mp4 a:aac-lc|he-aac|adpcm m:video/3gpp +Supported = f:3gp v:h264|mp4 a:aac-lc|he-aac|adpcm Supported = f:avi|mkv m:video/avi Supported = f:flv m:video/mp4 -Supported = f:mov m:video/quicktime +Supported = f:mov Supported = f:mp4|mpegps|mpegts m:video/mpeg # Supported audio formats: -Supported = f:mp3 m:audio/mpeg +Supported = f:mp3 Supported = f:wav m:audio/L16 # Supported subtitles formats: diff --git a/src/main/external-resources/renderers/Samsung-D7000.conf b/src/main/external-resources/renderers/Samsung-D7000.conf index bad96e5518..4f366f2b61 100644 --- a/src/main/external-resources/renderers/Samsung-D7000.conf +++ b/src/main/external-resources/renderers/Samsung-D7000.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = \d{2}D7000 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 25 SubtitleHttpHeader = CaptionInfo.sec PrependTrackNumbers = true @@ -28,11 +27,11 @@ MediaInfo = true # Supported video formats: Supported = f:avi|mkv m:video/avi Supported = f:flv m:video/mp4 -Supported = f:mov m:video/quicktime +Supported = f:mov Supported = f:mp4|mpegps|mpegts m:video/mpeg # Supported audio formats: -Supported = f:mp3 m:audio/mpeg +Supported = f:mp3 Supported = f:wav m:audio/L16 # Supported subtitles formats: diff --git a/src/main/external-resources/renderers/Samsung-EH5300.conf b/src/main/external-resources/renderers/Samsung-EH5300.conf index 0d575cd0dd..3ee17d40ac 100644 --- a/src/main/external-resources/renderers/Samsung-EH5300.conf +++ b/src/main/external-resources/renderers/Samsung-EH5300.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = \d{2}EH5300 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -30,21 +29,21 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/3gpp -Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma gmc:0 m:video/avi -Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mp4 +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma gmc:0 +Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:mpegps|mpegts v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|vp8|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:flac m:audio/mpeg -Supported = f:mp3 m:audio/mpeg -Supported = f:vorbis m:audio/vorbis -Supported = f:wma m:audio/x-ms-wma +Supported = f:mp3 +Supported = f:oga m:audio/vorbis +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-EH6070.conf b/src/main/external-resources/renderers/Samsung-EH6070.conf index 29bbc3c250..987d6ef74d 100644 --- a/src/main/external-resources/renderers/Samsung-EH6070.conf +++ b/src/main/external-resources/renderers/Samsung-EH6070.conf @@ -18,7 +18,6 @@ UpnpDetailsSearch = \d{2}EH6070 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -29,19 +28,19 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/3gpp -Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-matroska -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/mp4 +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma Supported = f:mpegps|mpegts v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/mpeg -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:wma m:audio/x-ms-wma +Supported = f:m4a m:audio/mp4 +Supported = f:flac +Supported = f:mp3 +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-ES8000.conf b/src/main/external-resources/renderers/Samsung-ES8000.conf index ca62db7927..9d9fef6987 100644 --- a/src/main/external-resources/renderers/Samsung-ES8000.conf +++ b/src/main/external-resources/renderers/Samsung-ES8000.conf @@ -21,7 +21,6 @@ UpnpDetailsSearch = ES8000 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -32,20 +31,19 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/3gpp -Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/mp4 +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma Supported = f:mpegps|mpegts v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/mpeg -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-ms-wmv - +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma +Supported = f:m4a m:audio/mp4 +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-ES8005.conf b/src/main/external-resources/renderers/Samsung-ES8005.conf index 3cba6030cc..e882375ada 100644 --- a/src/main/external-resources/renderers/Samsung-ES8005.conf +++ b/src/main/external-resources/renderers/Samsung-ES8005.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = ES8005 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -30,22 +29,22 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mp4 +Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:mpegps|mpegts v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma +Supported = f:m4a m:audio/mp4 +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-F5100.conf b/src/main/external-resources/renderers/Samsung-F5100.conf index cf673547fc..f33cced505 100644 --- a/src/main/external-resources/renderers/Samsung-F5100.conf +++ b/src/main/external-resources/renderers/Samsung-F5100.conf @@ -18,7 +18,6 @@ UpnpDetailsSearch = F5100 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true diff --git a/src/main/external-resources/renderers/Samsung-F5505.conf b/src/main/external-resources/renderers/Samsung-F5505.conf index 656077d908..51da012c55 100644 --- a/src/main/external-resources/renderers/Samsung-F5505.conf +++ b/src/main/external-resources/renderers/Samsung-F5505.conf @@ -20,7 +20,6 @@ UpnpDetailsSearch = SamsungTV 5505 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -31,24 +30,24 @@ MediaInfo = true # Supported video formats: Supported = f:3gp|3g2 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/3gpp -Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/mp4 +Supported = f:avi v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma +Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma Supported = f:mpegps|mpegts v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vp6|wmv a:aac-lc|he-aac|ac3|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a -Supported = f:ape m:audio/x-ape -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wav m:audio/wav -Supported = f:wma m:audio/x-ms-wma +Supported = f:m4a m:audio/mp4 +Supported = f:ape +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wav +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-F5900.conf b/src/main/external-resources/renderers/Samsung-F5900.conf index 6e795b17b4..17bf130ea4 100644 --- a/src/main/external-resources/renderers/Samsung-F5900.conf +++ b/src/main/external-resources/renderers/Samsung-F5900.conf @@ -18,7 +18,6 @@ UpnpDetailsSearch = F5900 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -29,23 +28,23 @@ MediaInfo = true # Supported video formats: Supported = f:3gp|3g2 v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/3gpp -Supported = f:avi v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/avi -Supported = f:flv v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-matroska -Supported = f:mov v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/mp4 +Supported = f:avi v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:flv v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:mkv v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma +Supported = f:mp4 v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma Supported = f:mpegps|mpegts v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/mpeg -Supported = f:wmv v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:wmv v:h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|dts|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a -Supported = f:ape m:audio/x-ape -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wav m:audio/wav -Supported = f:wma m:audio/x-ms-wma +Supported = f:m4a m:audio/mp4 +Supported = f:ape +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wav +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-H4500.conf b/src/main/external-resources/renderers/Samsung-H4500.conf index e5e51a9b68..50b1c6e6f0 100644 --- a/src/main/external-resources/renderers/Samsung-H4500.conf +++ b/src/main/external-resources/renderers/Samsung-H4500.conf @@ -21,26 +21,26 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mp4 -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:mpegts v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB diff --git a/src/main/external-resources/renderers/Samsung-H6203.conf b/src/main/external-resources/renderers/Samsung-H6203.conf index d607ddd3be..8a94fd8c15 100644 --- a/src/main/external-resources/renderers/Samsung-H6203.conf +++ b/src/main/external-resources/renderers/Samsung-H6203.conf @@ -11,7 +11,6 @@ UpnpDetailsSearch = H6203 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -22,27 +21,27 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mp4 -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:mpegts v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:ape m:audio/x-ape -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:ape +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB diff --git a/src/main/external-resources/renderers/Samsung-H6400.conf b/src/main/external-resources/renderers/Samsung-H6400.conf index 338c362df7..3fafddd148 100644 --- a/src/main/external-resources/renderers/Samsung-H6400.conf +++ b/src/main/external-resources/renderers/Samsung-H6400.conf @@ -12,7 +12,6 @@ UserAgentSearch = H6400 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -23,26 +22,26 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mp4 -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:mpegts v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:ape m:audio/x-ape -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:ape +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-HTE3.conf b/src/main/external-resources/renderers/Samsung-HTE3.conf index 46d04611f4..afbcaa52bb 100644 --- a/src/main/external-resources/renderers/Samsung-HTE3.conf +++ b/src/main/external-resources/renderers/Samsung-HTE3.conf @@ -17,7 +17,6 @@ UserAgentSearch = SEC_HHP_HT-E3 LoadingPriority = 1 TranscodeVideo = MPEGTS-H264-AC3 -MuxDTSToMpeg = true TranscodeFastStart = true MaxVideoBitrateMbps = 25 PrependTrackNumbers = true @@ -25,13 +24,13 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:avi v:h264|mp4 a:ac3|dts|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:h264|vc1 a:ac3|dts|mp3 m:video/x-matroska -Supported = f:mp4 v:h264|mp4 a:aac-lc m:video/mp4 -Supported = f:mpegps v:mpeg1|mpeg2|h264 a:ac3|dts|mpa m:video/mpeg +Supported = f:avi v:h264|mp4 a:ac3|dts|lpcm|mp3|wma +Supported = f:mkv v:h264|vc1 a:ac3|dts|mp3 m:video/x-mmk +Supported = f:mp4 v:h264|mp4 a:aac-lc +Supported = f:mpegps v:mpeg1|mpeg2|h264 a:ac3|dts|mpa Supported = f:mpegts v:mpeg1|mpeg2|h264 a:aac-lc|ac3|dts|mpa m:video/mpeg -Supported = f:wmv v:wmv a:wma m:video/x-ms-wmv +Supported = f:wmv v:wmv a:wma # Supported audio formats: -Supported = f:mp3 m:audio/mpeg -Supported = f:wma m:audio/x-ms-wma +Supported = f:mp3 +Supported = f:wma diff --git a/src/main/external-resources/renderers/Samsung-HTF4.conf b/src/main/external-resources/renderers/Samsung-HTF4.conf index e4417ffadf..ec9a154dd5 100644 --- a/src/main/external-resources/renderers/Samsung-HTF4.conf +++ b/src/main/external-resources/renderers/Samsung-HTF4.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = HT-F4\d{3} LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -28,12 +27,12 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:avi v:divx|h264|mp4 a:ac3|dts|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:divx|h264|vc1 a:ac3|dts|mp3 m:video/x-matroska -Supported = f:mp4 v:h264|mp4 a:aac-lc m:video/mp4 -Supported = f:wmv v:vc1 a:wma m:video/x-ms-wmv +Supported = f:avi v:divx|h264|mp4 a:ac3|dts|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|vc1 a:ac3|dts|mp3 m:video/x-mkv +Supported = f:mp4 v:h264|mp4 a:aac-lc +Supported = f:wmv v:vc1 a:wma Supported = f:mpegps|mpegts v:h264|mpeg1|mpeg2 a:ac3|dts|mpa m:video/mpeg # Supported audio formats: -Supported = f:mp3 m:audio/mpeg -Supported = f:wma m:audio/x-ms-wma +Supported = f:mp3 +Supported = f:wma diff --git a/src/main/external-resources/renderers/Samsung-HU7000.conf b/src/main/external-resources/renderers/Samsung-HU7000.conf index 6f9d0fd79a..7cdc1b07c6 100644 --- a/src/main/external-resources/renderers/Samsung-HU7000.conf +++ b/src/main/external-resources/renderers/Samsung-HU7000.conf @@ -10,7 +10,6 @@ UserAgentSearch = HU7000 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -21,26 +20,26 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mp4 -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:mpegts v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB diff --git a/src/main/external-resources/renderers/Samsung-HU9000.conf b/src/main/external-resources/renderers/Samsung-HU9000.conf index 4ac6900c5d..548e5c9c19 100644 --- a/src/main/external-resources/renderers/Samsung-HU9000.conf +++ b/src/main/external-resources/renderers/Samsung-HU9000.conf @@ -10,7 +10,6 @@ UserAgentSearch = HU9000 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -21,26 +20,26 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mp4 -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma +Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma Supported = f:mpegts v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|vc1|vp6|wmv a:aac-lc|he-aac|ac3|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP -SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP,VOBSUB diff --git a/src/main/external-resources/renderers/Samsung-J55xx.conf b/src/main/external-resources/renderers/Samsung-J55xx.conf index d3235e2595..eecf74efcf 100644 --- a/src/main/external-resources/renderers/Samsung-J55xx.conf +++ b/src/main/external-resources/renderers/Samsung-J55xx.conf @@ -18,7 +18,6 @@ UpnpDetailsSearch = U[EN]\d{2}J55\d{2} LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 25 TranscodedVideoFileSize = 1000000 ChunkedTransfer = true diff --git a/src/main/external-resources/renderers/Samsung-J6200.conf b/src/main/external-resources/renderers/Samsung-J6200.conf index 24cf19c865..f26202dcfd 100644 --- a/src/main/external-resources/renderers/Samsung-J6200.conf +++ b/src/main/external-resources/renderers/Samsung-J6200.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = U.\\d{2}(J|JS)6200 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -30,26 +29,26 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-flv -Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mp4 -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg +Supported = f:flv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mkv v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mp4 v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mpegps v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:mpegts v:divx|h264|h265|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:webm v:vp8 a:vorbis m:video/webm -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:webm v:vp8 a:vorbis +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|sor|vc1|vp6|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a +Supported = f:m4a m:audio/mp4 Supported = f:aiff m:audio/L16 -Supported = f:ape m:audio/x-ape -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma -Supported = f:wav m:audio/wav +Supported = f:ape +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma +Supported = f:wav # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-NotCD.conf b/src/main/external-resources/renderers/Samsung-NotCD.conf index 27b85430b9..18e64b431c 100644 --- a/src/main/external-resources/renderers/Samsung-NotCD.conf +++ b/src/main/external-resources/renderers/Samsung-NotCD.conf @@ -30,7 +30,6 @@ UserAgentSearch = SEC_HHP(?!.*[CD]S?\d{3}\d?/) UpnpDetailsSearch = (?!.*[CD]S?\d{3}\d?) , (Samsung|AllShare) DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 25 TranscodedVideoFileSize = 1000000 ChunkedTransfer = true @@ -42,11 +41,11 @@ MediaInfo = true # Supported video formats: Supported = f:avi|mkv m:video/avi Supported = f:flv m:video/mp4 -Supported = f:mov m:video/quicktime +Supported = f:mov Supported = f:mp4|mpegps|mpegts m:video/mpeg # Supported audio formats: -Supported = f:mp3 m:audio/mpeg +Supported = f:mp3 Supported = f:wav m:audio/L16 # Supported subtitles formats: diff --git a/src/main/external-resources/renderers/Samsung-PL51E490.conf b/src/main/external-resources/renderers/Samsung-PL51E490.conf index 6b9e5715f4..f959f8475f 100644 --- a/src/main/external-resources/renderers/Samsung-PL51E490.conf +++ b/src/main/external-resources/renderers/Samsung-PL51E490.conf @@ -19,7 +19,6 @@ UpnpDetailsSearch = PL51E490 LoadingPriority = 1 DefaultVBVBufSize = true -MuxDTSToMpeg = true MaxVideoBitrateMbps = 60 SeekByTime = true ChunkedTransfer = true @@ -30,21 +29,21 @@ CharMap = / : MediaInfo = true # Supported video formats: -Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/3gpp +Supported = f:3gp v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:avi|divx v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/avi -Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-matroska -Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/quicktime -Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mp4 +Supported = f:mkv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-mkv +Supported = f:mov v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma +Supported = f:mp4 v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma Supported = f:mpegps|mpegts v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/mpeg -Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma m:video/x-ms-wmv +Supported = f:wmv v:divx|h264|mjpeg|mp4|mpeg1|mpeg2|wmv a:aac-lc|he-aac|ac3|adpcm|dts|eac3|lpcm|mp3|wma # Supported audio formats: -Supported = f:m4a m:audio/x-m4a -Supported = f:flac m:audio/flac -Supported = f:mp3 m:audio/mpeg -Supported = f:ogg m:audio/x-ogg -Supported = f:wma m:audio/x-ms-wma +Supported = f:m4a m:audio/mp4 +Supported = f:flac +Supported = f:mp3 +Supported = f:oga +Supported = f:wma # Supported subtitles formats: SupportedExternalSubtitlesFormats = ASS,MICRODVD,SAMI,SUBRIP,TEXT -SupportedInternalSubtitlesFormats = ASS,SUBRIP \ No newline at end of file +SupportedInternalSubtitlesFormats = ASS,SUBRIP diff --git a/src/main/external-resources/renderers/Samsung-WiseLink.conf b/src/main/external-resources/renderers/Samsung-WiseLink.conf index 7ef4344979..f3e25ab9fe 100644 --- a/src/main/external-resources/renderers/Samsung-WiseLink.conf +++ b/src/main/external-resources/renderers/Samsung-WiseLink.conf @@ -10,7 +10,6 @@ UserAgentSearch = wiselink TranscodeVideo = MPEGTS-H264-AC3 TranscodeAudio = WAV DefaultVBVBufSize = true -MuxDTSToMpeg = true MediaInfo = true # Supported video formats: diff --git a/src/main/external-resources/renderers/Sony-PlayStationVita.conf b/src/main/external-resources/renderers/Sony-PlayStationVita.conf index 0691844751..b8f7ea381c 100644 --- a/src/main/external-resources/renderers/Sony-PlayStationVita.conf +++ b/src/main/external-resources/renderers/Sony-PlayStationVita.conf @@ -32,10 +32,9 @@ Supported = f:mp4 v:h264|mp4 a:aac-lc m:video/mp4 Supported = f:mpegts v:h264|mp4 a:aac-lc m:video/mpeg # Supported audio formats: -Supported = f:mp3 n:2 m:audio/mpeg -Supported = f:mp4 a:aac-lc n:2 m:audio/x-m4a -Supported = f:wav a:lpcm n:2 s:48000 m:audio/L16 -Supported = f:wav n:2 s:48000 m:audio/wav +Supported = f:mp3 n:2 m:audio/mpeg +Supported = f:m4a a:aac-lc n:2 m:audio/x-m4a +Supported = f:wav a:lpcm n:2 s:48000 m:audio/L16 # ============================================================================ # Supported File Formats: @@ -51,4 +50,4 @@ Supported = f:wav n:2 s:48000 m:audio/wav # 06(Hours):12:49. # - When trying to stream a video, whatever folder you browse it will say # "There are no compatible files in this folder." -#============================================================================= \ No newline at end of file +#============================================================================= diff --git a/src/main/java/net/pms/dlna/LibMediaInfoParser.java b/src/main/java/net/pms/dlna/LibMediaInfoParser.java index 16c5e13696..767ca11b85 100644 --- a/src/main/java/net/pms/dlna/LibMediaInfoParser.java +++ b/src/main/java/net/pms/dlna/LibMediaInfoParser.java @@ -890,6 +890,7 @@ protected static void setFormat(StreamType streamType, DLNAMediaInfo media, DLNA format = FormatConfiguration.MPA; } else if (value.equals("wma")) { format = FormatConfiguration.WMA; + if (media.getCodecV() == null) { media.setContainer(format); } diff --git a/src/main/java/net/pms/formats/audio/MPGAudio.java b/src/main/java/net/pms/formats/audio/MPGAudio.java index 9f4189e5e9..c92901d732 100644 --- a/src/main/java/net/pms/formats/audio/MPGAudio.java +++ b/src/main/java/net/pms/formats/audio/MPGAudio.java @@ -33,6 +33,10 @@ public Identifier getIdentifier() { */ @Override public String[] getSupportedExtensions() { - return new String[] {"mpa", "mp2"}; + return new String[] { + "mpa", + "mp1", + "mp2" + }; } } diff --git a/src/test/java/net/pms/test/formats/FormatFactoryTest.java b/src/test/java/net/pms/test/formats/FormatFactoryTest.java index 68fe675416..498b9bbb31 100644 --- a/src/test/java/net/pms/test/formats/FormatFactoryTest.java +++ b/src/test/java/net/pms/test/formats/FormatFactoryTest.java @@ -170,6 +170,7 @@ public final void testFormatRetrieval() { testSingleFormat("test.wmv", "MPG", Format.VIDEO); testSingleFormat("test.wtv", "MPG", Format.VIDEO); testSingleFormat("test.mpa", "MPGAudio", Format.AUDIO); + testSingleFormat("test.mp1", "MPGAudio", Format.AUDIO); testSingleFormat("test.mp2", "MPGAudio", Format.AUDIO); testSingleFormat("test.sub", "MicroDVD", Format.SUBTITLE); testSingleFormat("test.ape", "MonkeysAudio", Format.AUDIO);