github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 05:57:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

updated dlna profile format

Browse source
This commit is contained in:
Luke Pulverenti 2014-04-01 00:16:25 -04:00
parent 49b121e87f
commit 4afe2c3f73
37 changed files with 217 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

30
MediaBrowser.Api/Playback/BaseStreamingService.cs
View file

@ -1492,21 +1492,9 @@ namespace MediaBrowser.Api.Playback
state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
foreach (var setting in transcodingProfile.Settings)
if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.Profile))
{
switch (setting.Name)
{
case TranscodingSettingType.VideoProfile:
{
if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.Profile))
{
state.VideoRequest.Profile = setting.Value;
}
break;
}
default:
throw new ArgumentException("Unrecognized TranscodingSettingType");
}
state.VideoRequest.Profile = transcodingProfile.VideoProfile;
}
}
}
@ -1523,12 +1511,6 @@ namespace MediaBrowser.Api.Playback
{
var timeSeek = GetHeader("TimeSeekRange.dlna.org");
if (!string.IsNullOrEmpty(timeSeek))
{
ResultFactory.ThrowError(406, "Time seek not supported during encoding.", responseHeaders);
return;
}
var transferMode = GetHeader("transferMode.dlna.org");
responseHeaders["transferMode.dlna.org"] = string.IsNullOrEmpty(transferMode) ? "Streaming" : transferMode;
responseHeaders["realTimeInfo.dlna.org"] = "DLNA.ORG_TLAG=*";
@ -1537,7 +1519,13 @@ namespace MediaBrowser.Api.Playback
var extension = GetOutputFileExtension(state);
// first bit means Time based seek supported, second byte range seek supported (not sure about the order now), so 01 = only byte seek, 10 = time based, 11 = both, 00 = none
var orgOp = isStaticallyStreamed || state.TranscodeSeekInfo == TranscodeSeekInfo.Bytes ? ";DLNA.ORG_OP=01" : ";DLNA.ORG_OP=00";
var orgOp = ";DLNA.ORG_OP=";
// Time-based seeking currently only possible when transcoding
orgOp += isStaticallyStreamed ? "0" : "1";
// Byte-based seeking only possible when not transcoding
orgOp += isStaticallyStreamed || state.TranscodeSeekInfo == TranscodeSeekInfo.Bytes ? "1" : "0";
// 0 = native, 1 = transcoded
var orgCi = isStaticallyStreamed ? ";DLNA.ORG_CI=0" : ";DLNA.ORG_CI=1";

16
MediaBrowser.Controller/Dlna/DeviceProfile.cs
View file

@ -74,13 +74,13 @@ namespace MediaBrowser.Controller.Dlna
public ContainerProfile[] ContainerProfiles { get; set; }
public CodecProfile[] CodecProfiles { get; set; }
public MediaProfile[] MediaProfiles { get; set; }
public ResponseProfile[] ResponseProfiles { get; set; }
public DeviceProfile()
{
DirectPlayProfiles = new DirectPlayProfile[] { };
TranscodingProfiles = new TranscodingProfile[] { };
MediaProfiles = new MediaProfile[] { };
ResponseProfiles = new ResponseProfile[] { };
CodecProfiles = new CodecProfile[] { };
ContainerProfiles = new ContainerProfile[] { };
@ -147,11 +147,11 @@ namespace MediaBrowser.Controller.Dlna
});
}
public MediaProfile GetAudioMediaProfile(string container, string audioCodec, MediaStream audioStream)
public ResponseProfile GetAudioMediaProfile(string container, string audioCodec, MediaStream audioStream)
{
container = (container ?? string.Empty).TrimStart('.');
return MediaProfiles.FirstOrDefault(i =>
return ResponseProfiles.FirstOrDefault(i =>
{
if (i.Type != DlnaProfileType.Audio)
{
@ -174,11 +174,11 @@ namespace MediaBrowser.Controller.Dlna
});
}
public MediaProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, MediaStream audioStream, MediaStream videoStream)
public ResponseProfile GetVideoMediaProfile(string container, string audioCodec, string videoCodec, MediaStream audioStream, MediaStream videoStream)
{
container = (container ?? string.Empty).TrimStart('.');
return MediaProfiles.FirstOrDefault(i =>
return ResponseProfiles.FirstOrDefault(i =>
{
if (i.Type != DlnaProfileType.Video)
{
@ -207,11 +207,11 @@ namespace MediaBrowser.Controller.Dlna
});
}
public MediaProfile GetPhotoMediaProfile(string container)
public ResponseProfile GetPhotoMediaProfile(string container)
{
container = (container ?? string.Empty).TrimStart('.');
return MediaProfiles.FirstOrDefault(i =>
return ResponseProfiles.FirstOrDefault(i =>
{
if (i.Type != DlnaProfileType.Photo)
{

4
MediaBrowser.Controller/Dlna/MediaProfile.cs → MediaBrowser.Controller/Dlna/ResponseProfile.cs
View file

@ -4,7 +4,7 @@ using System.Xml.Serialization;
namespace MediaBrowser.Controller.Dlna
{
public class MediaProfile
public class ResponseProfile
{
[XmlAttribute("container")]
public string Container { get; set; }
@ -26,7 +26,7 @@ namespace MediaBrowser.Controller.Dlna
public ProfileCondition[] Conditions { get; set; }
public MediaProfile()
public ResponseProfile()
{
Conditions = new ProfileCondition[] {};
}

23
MediaBrowser.Controller/Dlna/TranscodingProfile.cs
View file

@ -30,13 +30,8 @@ namespace MediaBrowser.Controller.Dlna
[XmlAttribute("transcodeSeekInfo")]
public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
public TranscodingSetting[] Settings { get; set; }
public TranscodingProfile()
{
Settings = new TranscodingSetting[] { };
}
[XmlAttribute("videoProfile")]
public string VideoProfile { get; set; }
public List<string> GetAudioCodecs()
{
@ -44,20 +39,6 @@ namespace MediaBrowser.Controller.Dlna
}
}
public class TranscodingSetting
{
[XmlAttribute("name")]
public TranscodingSettingType Name { get; set; }
[XmlAttribute("value")]
public string Value { get; set; }
}
public enum TranscodingSettingType
{
VideoProfile = 0
}
public enum TranscodeSeekInfo
{
Auto = 0,

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View file

@ -84,7 +84,7 @@
<Compile Include="Dlna\DirectPlayProfile.cs" />
<Compile Include="Dlna\IDlnaManager.cs" />
<Compile Include="Dlna\DeviceProfile.cs" />
<Compile Include="Dlna\MediaProfile.cs" />
<Compile Include="Dlna\ResponseProfile.cs" />
<Compile Include="Dlna\TranscodingProfile.cs" />
<Compile Include="Drawing\IImageProcessor.cs" />
<Compile Include="Drawing\ImageFormat.cs" />

8
MediaBrowser.Dlna/PlayTo/PlaylistItem.cs
View file

@ -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>();
}
}
}

3
MediaBrowser.Dlna/PlayTo/PlaylistItemFactory.cs
View file

@ -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;

6
MediaBrowser.Dlna/Profiles/DefaultProfile.cs
View file

@ -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"
}
};

6
MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs
View file

@ -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",

16
MediaBrowser.Dlna/Profiles/SonyBlurayPlayerProfile.cs
View file

@ -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",

12
MediaBrowser.Dlna/Profiles/SonyBravia2010Profile.cs
View file

@ -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",

12
MediaBrowser.Dlna/Profiles/SonyBravia2011Profile.cs
View file

@ -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",

12
MediaBrowser.Dlna/Profiles/SonyBravia2012Profile.cs
View file

@ -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",

12
MediaBrowser.Dlna/Profiles/SonyBravia2013Profile.cs
View file

@ -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",

8
MediaBrowser.Dlna/Profiles/SonyPs3Profile.cs
View file

@ -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",

10
MediaBrowser.Dlna/Profiles/WdtvLiveProfile.cs
View file

@ -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",

12
MediaBrowser.Dlna/Profiles/Xbox360Profile.cs
View file

@ -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",

4
MediaBrowser.Dlna/Profiles/XboxOneProfile.cs
View file

@ -42,9 +42,9 @@ namespace MediaBrowser.Dlna.Profiles
}
};
MediaProfiles = new[]
ResponseProfiles = new[]
{
new MediaProfile
new ResponseProfile
{
Container = "avi",
MimeType = "video/x-msvideo",

12
MediaBrowser.Dlna/Profiles/Xml/Default.xml
View file

@ -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>

12
MediaBrowser.Dlna/Profiles/Xml/Denon AVR.xml
View file

@ -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>

14
MediaBrowser.Dlna/Profiles/Xml/LG Smart TV.xml
View file

@ -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>

12
MediaBrowser.Dlna/Profiles/Xml/Linksys DMA2100.xml
View file

@ -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>

14
MediaBrowser.Dlna/Profiles/Xml/Panasonic Viera.xml
View file

@ -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>

24
MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml
View file

@ -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>

14
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player 2013.xml
View file

@ -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>

44
MediaBrowser.Dlna/Profiles/Xml/Sony Blu-ray Player.xml
View file

@ -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>

36
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2010).xml
View file

@ -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>

36
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2011).xml
View file

@ -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>

36
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2012).xml
View file

@ -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>

36
MediaBrowser.Dlna/Profiles/Xml/Sony Bravia (2013).xml
View file

@ -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>

28
MediaBrowser.Dlna/Profiles/Xml/Sony PlayStation 3.xml
View file

@ -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>

22
MediaBrowser.Dlna/Profiles/Xml/WDTV Live.xml
View file

@ -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>

22
MediaBrowser.Dlna/Profiles/Xml/Xbox 360.xml
View file

@ -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>

16
MediaBrowser.Dlna/Profiles/Xml/Xbox One.xml
View file

@ -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>

12
MediaBrowser.Dlna/Profiles/Xml/foobar2000.xml
View file

@ -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>

16
MediaBrowser.MediaEncoding/Encoder/InternalEncodingTaskFactory.cs
View file

@ -282,21 +282,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode;
//state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo;
foreach (var setting in transcodingProfile.Settings)
if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile))
{
switch (setting.Name)
{
case TranscodingSettingType.VideoProfile:
{
if (state.VideoRequest != null && string.IsNullOrWhiteSpace(state.VideoRequest.VideoProfile))
{
state.VideoRequest.VideoProfile = setting.Value;
}
break;
}
default:
throw new ArgumentException("Unrecognized TranscodingSettingType");
}
state.VideoRequest.VideoProfile = transcodingProfile.VideoProfile;
}
}
}

2
MediaBrowser.Server.Implementations/Localization/Server/fr.json
View file

@ -30,7 +30,7 @@
"LabelEnableVideoImageExtraction": "Activer l'extraction d'image des videos",
"VideoImageExtractionHelp": "Pour les vid\u00e9os sans images et que nous n'avons pas trouv\u00e9 par Internet. Ce processus prolongera la mise \u00e0 jour initiale de biblioth\u00e8que mais offrira une meilleure pr\u00e9sentation visuelle.",
"LabelEnableChapterImageExtractionForMovies": "Extraire les images de chapitre pour les films",
"LabelChapterImageExtractionForMoviesHelp": "Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.",
"LabelChapterImageExtractionForMoviesHelp": "L'extraction d'images de chapitre permettra aux clients d'afficher des menus graphiques des sc\u00e8nes. Le processus peut \u00eatre long et exigeant en ressource processeur et de stockage (plusieurs Gigabytes). Il s'ex\u00e9cute par d\u00e9faut dans les t\u00e2ches programm\u00e9es \u00e0 4:00 AM mais peut \u00eatre modifi\u00e9 dans les options de t\u00e2ches programm\u00e9es. Il n'est pas recommand\u00e9 d'ex\u00e9cuter cette t\u00e2che dans les heures d'utilisation standard.",
"LabelEnableAutomaticPortMapping": "Activer la configuration automatique de port",
"LabelEnableAutomaticPortMappingHelp": "UPnP permet la configuration automatique de routeur pour un acc\u00e8s distance facile. Ceci peut ne pas fonctionner sur certains mod\u00e8les de routeur.",
"ButtonOk": "Ok",