michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add codec tag value

Browse Source
This commit is contained in:
Luke Pulverenti 2015-10-19 12:05:03 -04:00
parent 00bb68d2e8
commit 51c3f270ae
14 changed files with 73 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -1993,7 +1993,8 @@ namespace MediaBrowser.Api.Playback
state.IsTargetCabac,
state.TargetRefFrames,
state.TargetVideoStreamCount,
state.TargetAudioStreamCount);
state.TargetAudioStreamCount,
state.TargetVideoCodecTag);
if (mediaProfile != null)
{
@ -2090,7 +2091,8 @@ namespace MediaBrowser.Api.Playback
state.IsTargetCabac,
state.TargetRefFrames,
state.TargetVideoStreamCount,
state.TargetAudioStreamCount
state.TargetAudioStreamCount,
state.TargetVideoCodecTag
).FirstOrDefault() ?? string.Empty;
}

11
MediaBrowser.Api/Playback/StreamState.cs
View File

@ -457,6 +457,17 @@ namespace MediaBrowser.Api.Playback
}
}
public string TargetVideoCodecTag
{
get
{
var stream = VideoStream;
return !Request.Static
? null
: stream == null ? null : stream.CodecTag;
}
}
public bool? IsTargetAnamorphic
{
get

6
MediaBrowser.Dlna/Didl/DidlBuilder.cs
View File

@ -163,7 +163,8 @@ namespace MediaBrowser.Dlna.Didl
streamInfo.IsTargetCabac,
streamInfo.TargetRefFrames,
streamInfo.TargetVideoStreamCount,
streamInfo.TargetAudioStreamCount);
streamInfo.TargetAudioStreamCount,
streamInfo.TargetVideoCodecTag);
foreach (var contentFeature in contentFeatureList)
{
@ -301,7 +302,8 @@ namespace MediaBrowser.Dlna.Didl
streamInfo.IsTargetCabac,
streamInfo.TargetRefFrames,
streamInfo.TargetVideoStreamCount,
streamInfo.TargetAudioStreamCount);
streamInfo.TargetAudioStreamCount,
streamInfo.TargetVideoCodecTag);
var filename = url.Substring(0, url.IndexOf('?'));

3
MediaBrowser.Dlna/PlayTo/PlayToController.cs
View File

@ -525,7 +525,8 @@ namespace MediaBrowser.Dlna.PlayTo
streamInfo.IsTargetCabac,
streamInfo.TargetRefFrames,
streamInfo.TargetVideoStreamCount,
streamInfo.TargetAudioStreamCount);
streamInfo.TargetAudioStreamCount,
streamInfo.TargetVideoCodecTag);
return list.FirstOrDefault();
}

11
MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
View File

@ -368,6 +368,17 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
public string TargetVideoCodecTag
{
get
{
var stream = VideoStream;
return !Options.Static
? null
: stream == null ? null : stream.CodecTag;
}
}
public bool? IsTargetAnamorphic
{
get

3
MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
View File

@ -750,7 +750,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
state.IsTargetCabac,
state.TargetRefFrames,
state.TargetVideoStreamCount,
state.TargetAudioStreamCount);
state.TargetAudioStreamCount,
state.TargetVideoCodecTag);
if (mediaProfile != null)
{

1
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -130,6 +130,7 @@ namespace MediaBrowser.MediaEncoding.Probing
var stream = new MediaStream
{
Codec = streamInfo.codec_name,
CodecTag = streamInfo.codec_tag_string,
Profile = streamInfo.profile,
Level = streamInfo.level,
Index = streamInfo.index,

12
MediaBrowser.Model/Dlna/ConditionProcessor.cs
View File

@ -20,15 +20,11 @@ namespace MediaBrowser.Model.Dlna
bool? isCabac,
int? refFrames,
int? numVideoStreams,
int? numAudioStreams)
int? numAudioStreams,
string videoCodecTag)
{
switch (condition.Property)
{
case ProfileConditionValue.AudioProfile:
// TODO: Implement
return true;
case ProfileConditionValue.Has64BitOffsets:
return true;
case ProfileConditionValue.IsAnamorphic:
return IsConditionSatisfied(condition, isAnamorphic);
case ProfileConditionValue.IsCabac:
@ -39,6 +35,8 @@ namespace MediaBrowser.Model.Dlna
return IsConditionSatisfied(condition, videoLevel);
case ProfileConditionValue.VideoProfile:
return IsConditionSatisfied(condition, videoProfile);
case ProfileConditionValue.VideoCodecTag:
return IsConditionSatisfied(condition, videoCodecTag);
case ProfileConditionValue.PacketLength:
return IsConditionSatisfied(condition, packetLength);
case ProfileConditionValue.VideoBitDepth:
@ -58,7 +56,7 @@ namespace MediaBrowser.Model.Dlna
case ProfileConditionValue.VideoTimestamp:
return IsConditionSatisfied(condition, timestamp);
default:
throw new ArgumentException("Unexpected condition on video file: " + condition.Property);
return true;
}
}

6
MediaBrowser.Model/Dlna/ContentFeatureBuilder.cs
View File

@ -118,7 +118,8 @@ namespace MediaBrowser.Model.Dlna
bool? isCabac,
int? refFrames,
int? numVideoStreams,
int? numAudioStreams)
int? numAudioStreams,
string videoCodecTag)
{
// 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
string orgOp = ";DLNA.ORG_OP=" + DlnaMaps.GetOrgOpValue(runtimeTicks.HasValue, isDirectStream, transcodeSeekInfo);
@ -159,7 +160,8 @@ namespace MediaBrowser.Model.Dlna
isCabac,
refFrames,
numVideoStreams,
numAudioStreams);
numAudioStreams,
videoCodecTag);
List<string> orgPnValues = new List<string>();

5
MediaBrowser.Model/Dlna/DeviceProfile.cs
View File

@ -286,7 +286,8 @@ namespace MediaBrowser.Model.Dlna
bool? isCabac,
int? refFrames,
int? numVideoStreams,
int? numAudioStreams)
int? numAudioStreams,
string videoCodecTag)
{
container = StringHelper.TrimStart((container ?? string.Empty), '.');
@ -320,7 +321,7 @@ namespace MediaBrowser.Model.Dlna
var anyOff = false;
foreach (ProfileCondition c in i.Conditions)
{
if (!conditionProcessor.IsVideoConditionSatisfied(c, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams))
if (!conditionProcessor.IsVideoConditionSatisfied(c, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
{
anyOff = true;
break;

3
MediaBrowser.Model/Dlna/ProfileConditionValue.cs
View File

@ -20,6 +20,7 @@
IsCabac = 15,
NumAudioStreams = 16,
NumVideoStreams = 17,
IsSecondaryAudio
IsSecondaryAudio = 18,
VideoCodecTag = 19
}
}

7
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -571,6 +571,7 @@ namespace MediaBrowser.Model.Dlna
float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
bool? isCabac = videoStream == null ? null : videoStream.IsCabac;
string videoCodecTag = videoStream == null ? null : videoStream.CodecTag;
int? audioBitrate = audioStream == null ? null : audioStream.BitRate;
int? audioChannels = audioStream == null ? null : audioStream.Channels;
@ -586,7 +587,7 @@ namespace MediaBrowser.Model.Dlna
// Check container conditions
foreach (ProfileCondition i in conditions)
{
if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams))
if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
{
LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource);
@ -619,7 +620,7 @@ namespace MediaBrowser.Model.Dlna
foreach (ProfileCondition i in conditions)
{
if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams))
if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
{
LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource);
@ -966,8 +967,6 @@ namespace MediaBrowser.Model.Dlna
}
break;
}
default:
throw new ArgumentException("Unrecognized ProfileConditionValue");
}
}
}

15
MediaBrowser.Model/Dlna/StreamInfo.cs
View File

@ -489,6 +489,21 @@ namespace MediaBrowser.Model.Dlna
}
}
/// <summary>
/// Gets the target video codec tag.
/// </summary>
/// <value>The target video codec tag.</value>
public string TargetVideoCodecTag
{
get
{
MediaStream stream = TargetVideoStream;
return !IsDirectStream
? null
: stream == null ? null : stream.CodecTag;
}
}
/// <summary>
/// Predicts the audio bitrate that will be in the output stream
/// </summary>

6
MediaBrowser.Model/Entities/MediaStream.cs
View File

@ -18,6 +18,12 @@ namespace MediaBrowser.Model.Entities
/// <value>The codec.</value>
public string Codec { get; set; }
/// <summary>
/// Gets or sets the codec tag.
/// </summary>
/// <value>The codec tag.</value>
public string CodecTag { get; set; }
/// <summary>
/// Gets or sets the language.
/// </summary>