|
@@ -541,6 +541,7 @@ namespace MediaBrowser.Model.Dlna
|
|
|
float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
|
|
|
bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
|
|
|
string videoCodecTag = videoStream == null ? null : videoStream.CodecTag;
|
|
|
+ bool? isAvc = videoStream == null ? null : videoStream.IsAVC;
|
|
|
|
|
|
TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : item.Timestamp;
|
|
|
int? packetLength = videoStream == null ? null : videoStream.PacketLength;
|
|
@@ -549,7 +550,7 @@ namespace MediaBrowser.Model.Dlna
|
|
|
int? numAudioStreams = item.GetStreamCount(MediaStreamType.Audio);
|
|
|
int? numVideoStreams = item.GetStreamCount(MediaStreamType.Video);
|
|
|
|
|
|
- if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
|
|
|
+ if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
|
|
|
{
|
|
|
LogConditionFailure(options.Profile, "VideoCodecProfile", applyCondition, item);
|
|
|
applyConditions = false;
|
|
@@ -718,6 +719,7 @@ namespace MediaBrowser.Model.Dlna
|
|
|
float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
|
|
|
bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
|
|
|
string videoCodecTag = videoStream == null ? null : videoStream.CodecTag;
|
|
|
+ bool? isAvc = videoStream == null ? null : videoStream.IsAVC;
|
|
|
|
|
|
int? audioBitrate = audioStream == null ? null : audioStream.BitRate;
|
|
|
int? audioChannels = audioStream == null ? null : audioStream.Channels;
|
|
@@ -733,7 +735,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, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
|
|
|
+ if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
|
|
|
{
|
|
|
LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource);
|
|
|
|
|
@@ -760,7 +762,7 @@ namespace MediaBrowser.Model.Dlna
|
|
|
bool applyConditions = true;
|
|
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
|
|
{
|
|
|
- if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
|
|
|
+ if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
|
|
|
{
|
|
|
LogConditionFailure(profile, "VideoCodecProfile", applyCondition, mediaSource);
|
|
|
applyConditions = false;
|
|
@@ -780,7 +782,7 @@ namespace MediaBrowser.Model.Dlna
|
|
|
|
|
|
foreach (ProfileCondition i in conditions)
|
|
|
{
|
|
|
- if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
|
|
|
+ if (!conditionProcessor.IsVideoConditionSatisfied(i, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag, isAvc))
|
|
|
{
|
|
|
LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource);
|
|
|
|