diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-01 00:16:25 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-01 00:16:25 -0400 |
| commit | 4afe2c3f731562efbe42147d1bcbdc0a7542cfeb (patch) | |
| tree | cbfa2811dfff4c818d34de926f68be2ef8a78948 /MediaBrowser.Dlna | |
| parent | 49b121e87fc4fa9fd74f7eabca47450e6fdccb1c (diff) | |
updated dlna profile format
Diffstat (limited to 'MediaBrowser.Dlna')
30 files changed, 192 insertions, 319 deletions
diff --git a/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs b/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs index 50605c61fe..9f990bcb7b 100644 --- a/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs +++ b/MediaBrowser.Dlna/PlayTo/PlaylistItem.cs @@ -1,5 +1,4 @@ using MediaBrowser.Controller.Dlna; -using System.Collections.Generic; namespace MediaBrowser.Dlna.PlayTo { @@ -27,8 +26,6 @@ namespace MediaBrowser.Dlna.PlayTo public string AudioCodec { get; set; } - public List<TranscodingSetting> TranscodingSettings { get; set; } - public int? AudioStreamIndex { get; set; } public int? SubtitleStreamIndex { get; set; } @@ -47,10 +44,5 @@ namespace MediaBrowser.Dlna.PlayTo public int? MaxFramerate { get; set; } public string DeviceProfileId { get; set; } - - public PlaylistItem() - { - TranscodingSettings = new List<TranscodingSetting>(); - } } }
\ No newline at end of file diff --git a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs index c14a851cab..6a42e6a756 100644 --- a/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs +++ b/MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs @@ -48,7 +48,6 @@ namespace MediaBrowser.Dlna.PlayTo if (transcodingProfile != null) { playlistItem.Transcode = true; - playlistItem.TranscodingSettings = transcodingProfile.Settings.ToList(); playlistItem.Container = "." + transcodingProfile.Container.TrimStart('.'); playlistItem.AudioCodec = transcodingProfile.AudioCodec; @@ -88,7 +87,6 @@ namespace MediaBrowser.Dlna.PlayTo if (transcodingProfile != null) { playlistItem.Transcode = true; - playlistItem.TranscodingSettings = transcodingProfile.Settings.ToList(); playlistItem.Container = "." + transcodingProfile.Container.TrimStart('.'); } @@ -137,7 +135,6 @@ namespace MediaBrowser.Dlna.PlayTo if (transcodingProfile != null) { playlistItem.Transcode = true; - playlistItem.TranscodingSettings = transcodingProfile.Settings.ToList(); playlistItem.Container = "." + transcodingProfile.Container.TrimStart('.'); playlistItem.AudioCodec = transcodingProfile.AudioCodec.Split(',').FirstOrDefault(); playlistItem.VideoCodec = transcodingProfile.VideoCodec; diff --git a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs index 6b5513e289..e6b5668faf 100644 --- a/MediaBrowser.Dlna/Profiles/DefaultProfile.cs +++ b/MediaBrowser.Dlna/Profiles/DefaultProfile.cs @@ -35,11 +35,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video, AudioCodec = "aac", VideoCodec = "h264", - - Settings = new [] - { - new TranscodingSetting {Name = TranscodingSettingType.VideoProfile, Value = "baseline"} - } + VideoProfile= "baseline" } }; diff --git a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs index 122bde875f..b008947d3f 100644 --- a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs @@ -302,16 +302,16 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "avi", MimeType = "video/x-msvideo", Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mkv", MimeType = "video/x-mkv", diff --git a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs index c5025edbb6..972fc48ed7 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs @@ -206,9 +206,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec = "h264,mpeg4,vc1", @@ -218,42 +218,42 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "avi", MimeType = "video/mpeg", Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mkv", MimeType = "video/vnd.dlna.mpeg-tts", Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", MimeType = "video/vnd.dlna.mpeg-tts", Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mp4", MimeType = "video/mpeg", Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mpeg", MimeType = "video/mpeg", Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mp3", MimeType = "audio/mpeg", diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs index 8f29ad76e3..870b97fe72 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs @@ -89,9 +89,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -101,7 +101,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -111,7 +111,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -121,7 +121,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="mpeg2video", @@ -130,7 +130,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mpeg", VideoCodec="mpeg1video,mpeg2video", diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs index eaf6979a6b..2bba58696e 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs @@ -131,9 +131,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -143,7 +143,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -153,7 +153,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -163,7 +163,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="mpeg2video", @@ -172,7 +172,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mpeg", VideoCodec="mpeg1video,mpeg2video", diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs index 41d057ef8a..f8a6dcfbd7 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs @@ -119,9 +119,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -131,7 +131,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -141,7 +141,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -151,7 +151,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="mpeg2video", @@ -160,7 +160,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mpeg", VideoCodec="mpeg1video,mpeg2video", diff --git a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs index 386a36ae0c..56eaf47f4f 100644 --- a/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs @@ -175,9 +175,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -187,7 +187,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -197,7 +197,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="h264", @@ -207,7 +207,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "ts", VideoCodec="mpeg2video", @@ -216,7 +216,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "mpeg", VideoCodec="mpeg1video,mpeg2video", diff --git a/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs b/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs index 351a13f001..06d721f52e 100644 --- a/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs +++ b/MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs @@ -207,9 +207,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "mp4,mov", AudioCodec="aac", @@ -217,7 +217,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "avi", MimeType = "video/divx", @@ -225,7 +225,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video }, - new MediaProfile + new ResponseProfile { Container = "wav", MimeType = "audio/wav", diff --git a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs index f0b95d4e88..c3b88f7bfc 100644 --- a/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs +++ b/MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs @@ -43,11 +43,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video, VideoCodec = "h264", AudioCodec = "aac", - - Settings = new [] - { - new TranscodingSetting {Name = TranscodingSettingType.VideoProfile, Value = "baseline"} - } + VideoProfile= "baseline" }, new TranscodingProfile { @@ -157,9 +153,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "ts", OrgPn = "MPEG_TS_SD_NA", diff --git a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs index 38d08adef7..3fae85f594 100644 --- a/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs +++ b/MediaBrowser.Dlna/Profiles/Xbox360Profile.cs @@ -25,7 +25,7 @@ namespace MediaBrowser.Dlna.Profiles { ModelName = "Xbox 360", - Headers = new [] + Headers = new[] { new HttpHeaderInfo {Name = "User-Agent", Value = "Xbox", Match = HeaderMatchType.Substring}, new HttpHeaderInfo {Name = "User-Agent", Value = "Xenon", Match = HeaderMatchType.Substring} @@ -48,11 +48,7 @@ namespace MediaBrowser.Dlna.Profiles Type = DlnaProfileType.Video, TranscodeSeekInfo = TranscodeSeekInfo.Bytes, EstimateContentLength = true, - - Settings = new [] - { - new TranscodingSetting {Name = TranscodingSettingType.VideoProfile, Value = "baseline"} - } + VideoProfile= "baseline" }, new TranscodingProfile { @@ -110,9 +106,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "avi", MimeType = "video/avi", diff --git a/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs b/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs index 058c69e1ff..59372655c0 100644 --- a/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs +++ b/MediaBrowser.Dlna/Profiles/XboxOneProfile.cs @@ -42,9 +42,9 @@ namespace MediaBrowser.Dlna.Profiles } }; - MediaProfiles = new[] + ResponseProfiles = new[] { - new MediaProfile + new ResponseProfile { Container = "avi", MimeType = "video/x-msvideo", diff --git a/MediaBrowser.Dlna/Profiles/Xml/Default.xml b/MediaBrowser.Dlna/Profiles/Xml/Default.xml index 895cb99d32..9d72d68d23 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Default.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Default.xml @@ -20,16 +20,10 @@ <DirectPlayProfile container="avi,mp4" type="Video" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings> - <TranscodingSetting name="VideoProfile" value="baseline" /> - </Settings> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" /> </TranscodingProfiles> <ContainerProfiles /> <CodecProfiles /> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml index 58c5cefbc5..31ab8b85c7 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml @@ -24,16 +24,10 @@ <DirectPlayProfile container="mp3,flac,m4a,wma" type="Audio" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings> - <TranscodingSetting name="VideoProfile" value="baseline" /> - </Settings> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" /> </TranscodingProfiles> <ContainerProfiles /> <CodecProfiles /> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml index 53781ad324..0e9ce618e7 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml @@ -29,15 +29,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -69,5 +63,5 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml index fc833b9186..39822e0a38 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml @@ -24,16 +24,10 @@ <DirectPlayProfile container="avi,mp4,mkv,ts" type="Video" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings> - <TranscodingSetting name="VideoProfile" value="baseline" /> - </Settings> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" /> </TranscodingProfiles> <ContainerProfiles /> <CodecProfiles /> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml index 49fd05b1e0..ab815a645f 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml @@ -35,15 +35,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -62,5 +56,5 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index 75c50aae36..bd17802a24 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -33,15 +33,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -91,12 +85,12 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="avi" type="Video" mimeType="video/x-msvideo"> + <ResponseProfiles> + <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo"> <Conditions /> - </MediaProfile> - <MediaProfile container="mkv" type="Video" mimeType="video/x-mkv"> + </ResponseProfile> + <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml index 5bd27c7716..53b515e106 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml @@ -33,15 +33,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -65,5 +59,5 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml index f5502ca14a..76b52c7438 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml @@ -32,15 +32,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="mpeg2video" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -71,27 +65,27 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> + <ResponseProfiles> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264,mpeg4,vc1" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="avi" type="Video" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="avi" type="Video" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="mkv" type="Video" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" type="Video" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" type="Video" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="mp4" type="Video" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="mp4" type="Video" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="mpeg" type="Video" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="mpeg" type="Video" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="mp3" type="Audio" mimeType="audio/mpeg"> + </ResponseProfile> + <ResponseProfile container="mp3" type="Audio" mimeType="audio/mpeg"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml index 1337b59361..8c41cc3b7e 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml @@ -30,15 +30,9 @@ <DirectPlayProfile container="mp3" audioCodec="mp3" type="Audio" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -80,21 +74,21 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> + <ResponseProfiles> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml index b022c10a51..1ccd5f1dec 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml @@ -33,15 +33,9 @@ <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -83,21 +77,21 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> + <ResponseProfiles> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml index cbef70b378..b578a98b61 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml @@ -35,15 +35,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -66,21 +60,21 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> + <ResponseProfiles> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml index 47db46ce11..fe5c63f90d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml @@ -40,15 +40,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3,aac" estimateContentLength="false" enableMpegtsM2TsMode="true" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -66,21 +60,21 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> + <ResponseProfiles> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_T,AVC_TS_HD_50_AC3_T,AVC_TS_HD_60_AC3_T,AVC_TS_HD_EU_T" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3_ISO,AVC_TS_HD_50_AC3_ISO,AVC_TS_HD_60_AC3_ISO,AVC_TS_HD_EU_ISO" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" audioCodec="ac3,aac,mp3" videoCodec="h264" type="Video" orgPn="AVC_TS_HD_24_AC3,AVC_TS_HD_50_AC3,AVC_TS_HD_60_AC3,AVC_TS_HD_EU" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> + </ResponseProfile> + <ResponseProfile container="ts" videoCodec="mpeg2video" type="Video" orgPn="MPEG_TS_SD_EU,MPEG_TS_SD_NA,MPEG_TS_SD_KO" mimeType="video/vnd.dlna.mpeg-tts"> <Conditions /> - </MediaProfile> - <MediaProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> + </ResponseProfile> + <ResponseProfile container="mpeg" videoCodec="mpeg1video,mpeg2video" type="Video" orgPn="MPEG_PS_NTSC,MPEG_PS_PAL" mimeType="video/mpeg"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml index d9aa441bb4..f0db13e2af 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml @@ -29,15 +29,9 @@ <DirectPlayProfile container="avi,mp4" type="Video" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -80,15 +74,15 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4"> + <ResponseProfiles> + <ResponseProfile container="mp4,mov" audioCodec="aac" type="Video" mimeType="video/mp4"> <Conditions /> - </MediaProfile> - <MediaProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx"> + </ResponseProfile> + <ResponseProfile container="avi" type="Video" orgPn="AVI" mimeType="video/divx"> <Conditions /> - </MediaProfile> - <MediaProfile container="wav" type="Audio" mimeType="audio/wav"> + </ResponseProfile> + <ResponseProfile container="wav" type="Audio" mimeType="audio/wav"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml index 0f4ad54a77..bebdb2b45e 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml @@ -38,17 +38,9 @@ <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings> - <TranscodingSetting name="VideoProfile" value="baseline" /> - </Settings> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Photo"> @@ -72,9 +64,9 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="ts" type="Video" orgPn="MPEG_TS_SD_NA"> + <ResponseProfiles> + <ResponseProfile container="ts" type="Video" orgPn="MPEG_TS_SD_NA"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml index 1e8d8164c3..a2ac02ff91 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml @@ -33,17 +33,9 @@ <DirectPlayProfile container="jpeg" type="Photo" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="asf" type="Video" videoCodec="wmv2" audioCodec="wmav2" estimateContentLength="true" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes"> - <Settings> - <TranscodingSetting name="VideoProfile" value="baseline" /> - </Settings> - </TranscodingProfile> - <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="asf" type="Video" videoCodec="wmv2" audioCodec="wmav2" estimateContentLength="true" enableMpegtsM2TsMode="false" transcodeSeekInfo="Bytes" videoProfile="baseline" /> + <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles> <ContainerProfile type="Video" container="mp4,mov"> @@ -95,9 +87,9 @@ </Conditions> </CodecProfile> </CodecProfiles> - <MediaProfiles> - <MediaProfile container="avi" type="Video" mimeType="video/avi"> + <ResponseProfiles> + <ResponseProfile container="avi" type="Video" mimeType="video/avi"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml index f6c338b2f5..aa2081dc0d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml @@ -24,18 +24,14 @@ <DirectPlayProfile container="mp3,wma" type="Audio" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> </TranscodingProfiles> <ContainerProfiles /> <CodecProfiles /> - <MediaProfiles> - <MediaProfile container="avi" type="Video" mimeType="video/x-msvideo"> + <ResponseProfiles> + <ResponseProfile container="avi" type="Video" mimeType="video/x-msvideo"> <Conditions /> - </MediaProfile> - </MediaProfiles> + </ResponseProfile> + </ResponseProfiles> </Profile>
\ No newline at end of file diff --git a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml index f682e4c421..02a1529f3d 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml @@ -26,16 +26,10 @@ <DirectPlayProfile container="avi,mp4" type="Video" /> </DirectPlayProfiles> <TranscodingProfiles> - <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings /> - </TranscodingProfile> - <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto"> - <Settings> - <TranscodingSetting name="VideoProfile" value="baseline" /> - </Settings> - </TranscodingProfile> + <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" /> + <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="aac" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" videoProfile="baseline" /> </TranscodingProfiles> <ContainerProfiles /> <CodecProfiles /> - <MediaProfiles /> + <ResponseProfiles /> </Profile>
\ No newline at end of file |
