Skip to content
This repository has been archived by the owner on Feb 9, 2018. It is now read-only.

Commit

Permalink
cosmetics
Browse files Browse the repository at this point in the history
  • Loading branch information
@ikarsokolov
ikarsokolov committed May 12, 2013
1 parent 815deb1 commit 4bf38b9
Show file tree
Hide file tree
Showing 30 changed files with 153 additions and 113 deletions.
5 changes: 2 additions & 3 deletions src/main/external-resources/renderers/AirPlayer.conf
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
#----------------------------------------------------------------------------
# AirPlayer.conf
#
# PS3 Media Server profile for the AirPlayer app on iPad, iPhone and iPod.
# Profile for the AirPlayer app on iPad, iPhone and iPod.
# See PS3.conf for a description of all possible configuration options.
#
# This profile is still in an experimental stage.
# You are encouraged to experiment and report back the results on the forums
# at http://www.ps3mediaserver.org/.
#
# TODO: Set MediaInfo=true and configure the supported types correctly.
#

#----------------------------------------------------------------------------
# General informations / detection
Expand Down
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/Android.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Android
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Android.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Android
RendererIcon=android.png
Expand Down
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/Bravia4500.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Sony Bravia 4500 series
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Sony Bravia 4500 series.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Sony Bravia 4500
RendererIcon=bravia4500.png
Expand Down
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/BraviaEX.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Sony Bravia EX500/EX700 series
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Sony Bravia EX500/EX700 series.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Sony Bravia EX
RendererIcon=braviaex.png
Expand Down
36 changes: 19 additions & 17 deletions src/main/external-resources/renderers/BraviaHX.conf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# ps3mediaserver renderer profile for Sony Bravia HX series
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Sony Bravia HX series TVs.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Sony Bravia HX
RendererIcon=bravia-hx.png
RendererIcon=braviahx.png

#===========================================================
# Reported identifying headers:
Expand Down Expand Up @@ -41,24 +43,24 @@ CreateDLNATreeFaster = true

# [Supported video formats]:
# Here we declare support (or lack) of DTS (here, none of the entries declare dts as a supported audio codec)
Supported = f:mpegps|mpegts v:mpeg1|mpeg2|mp4|h264 a:ac3|lpcm|aac|mpa m:video/mpeg
Supported = f:mpegps|mpegts v:mpeg1|mpeg2|mp4|h264 a:ac3|lpcm|aac|mpa m:video/mpeg
# No H264 for AVI files, plus specific mediainfo attributes, for better auto detection (qpel and gmc are not supported here)
Supported = f:avi|divx v:mp4|divx|mjpeg a:mp3|lpcm|mpa|ac3 m:video/x-divx qpel:no gmc:0
Supported = f:mp4 v:mp4|h264 a:ac3|aac m:video/mp4
Supported = f:avi|divx v:mp4|divx|mjpeg a:mp3|lpcm|mpa|ac3 m:video/x-divx qpel:no gmc:0
Supported = f:mp4 v:mp4|h264 a:ac3|aac m:video/mp4
# WMV files are supported, but not with 5.1 audio: (hence the n:2)
Supported = f:wmv v:wmv|vc1 a:wma n:2 m:video/x-ms-wmv
Supported = f:wmv v:wmv|vc1 a:wma n:2 m:video/x-ms-wmv

# [Supported audio formats]:
Supported = f:wav a:dts|lpcm n:6 s:48000 m:audio/wav
Supported = f:wav n:2 s:48000 m:audio/wav
Supported = f:mp3 n:2 m:audio/mpeg
Supported = f:wav a:dts|lpcm n:6 s:48000 m:audio/wav
Supported = f:wav n:2 s:48000 m:audio/wav
Supported = f:mp3 n:2 m:audio/mpeg
# Apple lossless not supported
Supported = f:aac n:2 a:(?!alac).+ m:audio/x-m4a
Supported = f:wma n:2 m:audio/x-ms-wma
Supported = f:atrac n:2 m:audio/x-oma
Supported = f:aac a:(?!alac).+ n:2 m:audio/x-m4a
Supported = f:wma n:2 m:audio/x-ms-wma
Supported = f:atrac n:2 m:audio/x-oma

# [Supported image formats]
Supported = f:jpg m:image/jpeg
Supported = f:png m:image/png
Supported = f:gif m:image/gif
Supported = f:tiff m:image/tiff
Supported = f:jpg m:image/jpeg
Supported = f:png m:image/png
Supported = f:gif m:image/gif
Supported = f:tiff m:image/tiff
7 changes: 4 additions & 3 deletions src/main/external-resources/renderers/DLinkDSM510.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver Custom renderer profile for D-link DSM-510
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for D-Link DSM-510.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=D-Link DSM-510
RendererIcon=dlinkdsm510.png
Expand Down Expand Up @@ -43,4 +45,3 @@ CBRVideoBitrate=15000
# If the conversion isn't 100% accurate so a little rewind can be nice
ByteToTimeseekRewindSeconds=0
ShowAudioMetadata=true

6 changes: 3 additions & 3 deletions src/main/external-resources/renderers/DirecTVHR.conf
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#----------------------------------------------------------------------------
# DirecTVHR.conf
#
# Profile for DirecTV HR-xx Series Boxes.
# See PS3.conf for a description of all possible configuration options.
#
# This profile is still in an experimental stage.
# You are encouraged to experiment and report back the results on the forums
# at http://www.universalmediaserver.com/forum/
#

#----------------------------------------------------------------------------
# General informations / detection
Expand Down Expand Up @@ -111,7 +111,7 @@ StreamExtensions=
# 1- Parse files with mediainfo on Windows/OSX (Linux too if libmediainfo and libzen installed)
# 2- Deprecate following parameters: MuxH264ToMpegTS,MuxDTSToMpeg,MuxLPCMToMpeg,MimeTypesChanges
# 3- The server will skip badly parsed, corrupted files or wrong coding, preventing potential playback errors
# 4- Faster browsing, due to the launch of ffmpeg/mplayer first thumbnailer process with each http client request, rather than in the browse DLNA request
# 4- Faster browsing, due to the launch of FFmpeg/MPlayer first thumbnailer process with each http client request, rather than in the browse DLNA request
# Use MediaInfo for faster and proper file, codec and mime type management
# system (false by default).

Expand Down
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/FreeboxHD.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Freebox HD
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Freebox HD.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Freebox HD
RendererIcon=freeboxhd.png
Expand Down
7 changes: 4 additions & 3 deletions src/main/external-resources/renderers/FreecomMusicPal.conf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#------------------------------------------------------------
# ps3mediaserver profile for the Freecom MusicPal webradio client
# DO NOT MODIFY THIS (OR AT YOUR OWN RISK)
#----------------------------------------------------------------------------
# Profile for the Freecom MusicPal webradio client.
# See PS3.conf for a description of all possible configuration options.
#

#------------------------------------------------------------
# General informations / detection
Expand Down
7 changes: 4 additions & 3 deletions src/main/external-resources/renderers/Kuro.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Sony Bravia 5500 series
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Pioneer Kuro.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Pioneer Kuro
RendererIcon=kuro.png
Expand All @@ -24,7 +26,6 @@ DLNALocalizationRequired=true
TranscodeExtensions=dvr-ms,dvr,mkv,dv,ty,mov,ogm,hdmov,hdm,rmv,rmvb,rm,asf,evo,asx,flv,m2v,mpe,mod,tivo,ty,tmf,ts,tp,m2p,mp4,m4v,avi,wmv,wm,divx,div,flac,mlp,fla,wma,m4a,aac,dts,mka,ape,ogg,shn,mpc,ra,mp2,wv,oma,aa3,gif,png,arw,cr2,crw,dng,raf,mrw,nef,pef,tif,tiff
StreamExtensions=


#Better/faster codec detection method ! true to enable it
#Need testing !
MediaInfo=false
Expand Down
9 changes: 5 additions & 4 deletions src/main/external-resources/renderers/LGST600.conf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#------------------------------------------------------------
# ps3mediaserver profile for LG600ST
# DO NOT MODIFY THIS (OR AT YOUR OWN RISK)
#----------------------------------------------------------------------------
# Profile for LG 600ST Smart TV Upgrader.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=LG Smart TV Upgrader
RendererIcon=lgst600.png
Expand Down Expand Up @@ -43,4 +44,4 @@ Supported = f:atrac n:2 m:audio/x-oma
Supported = f:jpg m:image/jpeg
Supported = f:png m:image/png
Supported = f:gif m:image/gif
Supported = f:tiff m:image/tiff
Supported = f:tiff m:image/tiff
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/N900.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Nokia N900
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Nokia N900.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Nokia N900
RendererIcon=n900.png
Expand Down
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/OPPOBDP83.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Universal Media Server renderer profile for OPPO BDP-83
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for OPPO BDP-83.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=OPPO BDP-83
RendererIcon=oppobdp83.png
Expand Down
6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/OPPOBDP93.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Universal Media Server renderer profile for OPPO BDP-93
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for OPPO BDP-93.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=OPPO BDP-93
RendererIcon=oppobdp93.png
Expand Down
6 changes: 3 additions & 3 deletions src/main/external-resources/renderers/Philips.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# ps3mediaserver renderer profile for Philips Aurea TV and Net TV
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Philips Aurea TV and Net TV.
# See PS3.conf for a description of all possible configuration options.
#
# The protocol string is (for mpeg2) :
# http-get:*:video/mpeg:DLNA.ORG_PN=MPEG_PS_PAL
Expand Down Expand Up @@ -97,4 +98,3 @@ StreamExtensions=
# Needed for Philips Aurea that can only handle mpg, mp3
# Not needed for Philips NetTV that can handle many formats natively
TranscodeExtensions=avi,wmv,mkv,wmv,ts,m2ts,tp,iso,mp4,mov

13 changes: 5 additions & 8 deletions src/main/external-resources/renderers/PhilipsPFL.conf
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
# --------------------------------------------------------------------------------------------
# PS3 Media Server renderer configuration profile for the Philips 40pfl8605h_12
# 2010 lcd full hd ambilight tv.
# Revision number 1.6
#----------------------------------------------------------------------------
# Profile for Philips PFL (40pfl8605h_12).
# See PS3.conf for a description of all possible configuration options.
#
# Tested with 40pfl8605h_12 with firmware 140.040.000
# Tested with ps3 media server 1.50.0
# Refer to PS3.conf for help.
# By Leo from Holland.
# leroy on forum.

# Histoy:
# History:
# --------------------------------------------------------------------------------------------
# version 1.0 First tested version posted.
# version 1.1 Added lpcm to mpegps mpeg2 as a supported audio codec.
Expand Down Expand Up @@ -325,4 +323,3 @@ Supported = f:jpg m:image/jpeg
# as an unsupported format.
Supported = f:tiff m:image/tiff
# -------------------------------------- end of config ---------------------------------------

6 changes: 4 additions & 2 deletions src/main/external-resources/renderers/PopcornHour.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for popcorn hour
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Popcorn Hour.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Popcorn Hour
RendererIcon=popcornhour.png
Expand Down
9 changes: 5 additions & 4 deletions src/main/external-resources/renderers/Realtek.conf
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#------------------------------------------------------------
# ps3mediaserver profile for Realtek media players
# Asus O!Play, Xtreamer, AC Ryan PlayOn!HD, Brite-view CinemaTube
# DO NOT MODIFY THIS (OR AT YOUR OWN RISK)
#----------------------------------------------------------------------------
# Profile for Realtek media players.
# Asus O!Play, Xtreamer, AC Ryan PlayOn!HD, Brite-view CinemaTube.
# See PS3.conf for a description of all possible configuration options.
#

#------------------------------------------------------------
# General informations / detection
Expand Down
7 changes: 5 additions & 2 deletions src/main/external-resources/renderers/SMP-N100.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# PS3 Media Server renderer profile for Sony SMP-N100
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Sony SMP-N100.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Sony SMP-N100
RendererIcon=smp-n100.png

Expand Down
10 changes: 3 additions & 7 deletions src/main/external-resources/renderers/Samsung-SMT-G7400.conf
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#-----------------------------------------------------------------------------
# PS3 Media Server renderer configuration for Samsung SMT-G7400 (a.k.a. UPC Horizon)
#
# This configuration profile serves two purposes:
#
# - Allow PMS to recognize a specific connecting renderer
# - Define the possibilities of that renderer
#----------------------------------------------------------------------------
# Profile for Samsung SMT-G7400 (a.k.a. UPC Horizon).
# See PS3.conf for a description of all possible configuration options.
#

#-----------------------------------------------------------------------------
Expand Down
10 changes: 7 additions & 3 deletions src/main/external-resources/renderers/SamsungAllShare.conf
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# ps3mediaserver renderer profile for Samsung TVs with AllShare DLNA
#----------------------------------------------------------------------------
# Profile for Samsung TVs with AllShare DLNA.
# See PS3.conf for a description of all possible configuration options.
# http://ps3mediaserver.org/forum/viewtopic.php?f=15&t=8889
# Conf: Version 1.4.4
# Version: 1.4.4 (modified)
#

RendererName=Samsung AllShare
RendererIcon=samsung.png
Expand All @@ -19,7 +22,7 @@ RendererIcon=samsung.png
# Note: the "[TV]PS51D6900" is the default type name.
# It can be edited via the TV menu into any string.
# ====================================================
UserAgentSearch=SEC_HHP_
UserAgentSearch=SEC_HHP

# Recent firmware (0016 and 0019) has been reported to no longer send additional headers info
# Leaving this in for backwards compatibility with older firmware
Expand All @@ -44,3 +47,4 @@ MimeTypesChanges=audio/wav=audio/L16|video/x-matroska=video/avi|video/x-flv=vide
TranscodeExtensions=flv,wav
StreamExtensions=mkv,mp3,mp4,avi,mov
SubtitleHttpHeader=CaptionInfo.sec
ChunkedTransfer=true
8 changes: 5 additions & 3 deletions src/main/external-resources/renderers/SamsungWiseLink.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ps3mediaserver renderer profile for Samsung WiseLink
# Refer to PS3.conf for help
#----------------------------------------------------------------------------
# Profile for Samsung WiseLink.
# See PS3.conf for a description of all possible configuration options.
#

RendererName=Samsung WiseLink
RendererIcon=samsung.png
Expand All @@ -20,4 +22,4 @@ MaxVideoWidth=0
MaxVideoHeight=0
MimeTypesChanges=audio/wav=audio/L16
TranscodeExtensions=mov
StreamExtensions=mp3,mp4,avi
StreamExtensions=mp3,mp4,avi
Loading

0 comments on commit 4bf38b9

Please sign in to comment.