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

remove unused video condition params

Browse Source
This commit is contained in:
Luke Pulverenti 2015-04-30 10:07:24 -04:00
parent 2f57a96568
commit 213182dd97
9 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2033,8 +2033,6 @@ namespace MediaBrowser.Api.Playback
profile.GetVideoMediaProfile(state.OutputContainer, profile.GetVideoMediaProfile(state.OutputContainer,
audioCodec, audioCodec,
videoCodec, videoCodec,
state.OutputAudioBitrate,
state.OutputAudioChannels,
state.OutputWidth, state.OutputWidth,
state.OutputHeight, state.OutputHeight,
state.TargetVideoBitDepth, state.TargetVideoBitDepth,
@ -2121,8 +2119,6 @@ namespace MediaBrowser.Api.Playback
state.OutputHeight, state.OutputHeight,
state.TargetVideoBitDepth, state.TargetVideoBitDepth,
state.OutputVideoBitrate, state.OutputVideoBitrate,
state.OutputAudioBitrate,
state.OutputAudioChannels,
state.TargetTimestamp, state.TargetTimestamp,
isStaticallyStreamed, isStaticallyStreamed,
state.RunTimeTicks, state.RunTimeTicks,

1
MediaBrowser.Api/Subtitles/SubtitleService.cs
View File

@ -100,6 +100,7 @@ namespace MediaBrowser.Api.Subtitles
} }
[Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/subtitles.m3u8", "GET", Summary = "Gets an HLS subtitle playlist.")] [Route("/Videos/{Id}/{MediaSourceId}/Subtitles/{Index}/subtitles.m3u8", "GET", Summary = "Gets an HLS subtitle playlist.")]
[Authenticated]
public class GetSubtitlePlaylist public class GetSubtitlePlaylist
{ {
/// <summary> /// <summary>

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

@ -149,8 +149,6 @@ namespace MediaBrowser.Dlna.Didl
targetHeight, targetHeight,
streamInfo.TargetVideoBitDepth, streamInfo.TargetVideoBitDepth,
streamInfo.TargetVideoBitrate, streamInfo.TargetVideoBitrate,
streamInfo.TargetAudioChannels,
streamInfo.TargetAudioBitrate,
streamInfo.TargetTimestamp, streamInfo.TargetTimestamp,
streamInfo.IsDirectStream, streamInfo.IsDirectStream,
streamInfo.RunTimeTicks, streamInfo.RunTimeTicks,
@ -276,11 +274,9 @@ namespace MediaBrowser.Dlna.Didl
streamInfo.AudioCodec, streamInfo.AudioCodec,
streamInfo.VideoCodec, streamInfo.VideoCodec,
streamInfo.TargetAudioBitrate, streamInfo.TargetAudioBitrate,
targetChannels,
targetWidth, targetWidth,
targetHeight, targetHeight,
streamInfo.TargetVideoBitDepth, streamInfo.TargetVideoBitDepth,
streamInfo.TargetVideoBitrate,
streamInfo.TargetVideoProfile, streamInfo.TargetVideoProfile,
streamInfo.TargetVideoLevel, streamInfo.TargetVideoLevel,
streamInfo.TargetFramerate, streamInfo.TargetFramerate,

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

@ -509,8 +509,6 @@ namespace MediaBrowser.Dlna.PlayTo
streamInfo.TargetHeight, streamInfo.TargetHeight,
streamInfo.TargetVideoBitDepth, streamInfo.TargetVideoBitDepth,
streamInfo.TargetVideoBitrate, streamInfo.TargetVideoBitrate,
streamInfo.TargetAudioChannels,
streamInfo.TargetAudioBitrate,
streamInfo.TargetTimestamp, streamInfo.TargetTimestamp,
streamInfo.IsDirectStream, streamInfo.IsDirectStream,
streamInfo.RunTimeTicks, streamInfo.RunTimeTicks,

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

@ -716,8 +716,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
profile.GetVideoMediaProfile(outputContainer, profile.GetVideoMediaProfile(outputContainer,
audioCodec, audioCodec,
videoCodec, videoCodec,
state.OutputAudioBitrate,
state.OutputAudioChannels,
state.OutputWidth, state.OutputWidth,
state.OutputHeight, state.OutputHeight,
state.TargetVideoBitDepth, state.TargetVideoBitDepth,

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

@ -7,8 +7,6 @@ namespace MediaBrowser.Model.Dlna
public class ConditionProcessor public class ConditionProcessor
{ {
public bool IsVideoConditionSatisfied(ProfileCondition condition, public bool IsVideoConditionSatisfied(ProfileCondition condition,
int? audioBitrate,
int? audioChannels,
int? width, int? width,
int? height, int? height,
int? bitDepth, int? bitDepth,
@ -44,10 +42,6 @@ namespace MediaBrowser.Model.Dlna
return IsConditionSatisfied(condition, videoProfile); return IsConditionSatisfied(condition, videoProfile);
case ProfileConditionValue.PacketLength: case ProfileConditionValue.PacketLength:
return IsConditionSatisfied(condition, packetLength); return IsConditionSatisfied(condition, packetLength);
case ProfileConditionValue.AudioBitrate:
return IsConditionSatisfied(condition, audioBitrate);
case ProfileConditionValue.AudioChannels:
return IsConditionSatisfied(condition, audioChannels);
case ProfileConditionValue.VideoBitDepth: case ProfileConditionValue.VideoBitDepth:
return IsConditionSatisfied(condition, bitDepth); return IsConditionSatisfied(condition, bitDepth);
case ProfileConditionValue.VideoBitrate: case ProfileConditionValue.VideoBitrate:

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

@ -105,8 +105,6 @@ namespace MediaBrowser.Model.Dlna
int? height, int? height,
int? bitDepth, int? bitDepth,
int? videoBitrate, int? videoBitrate,
int? audioChannels,
int? audioBitrate,
TransportStreamTimestamp timestamp, TransportStreamTimestamp timestamp,
bool isDirectStream, bool isDirectStream,
long? runtimeTicks, long? runtimeTicks,
@ -147,8 +145,6 @@ namespace MediaBrowser.Model.Dlna
ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container, ResponseProfile mediaProfile = _profile.GetVideoMediaProfile(container,
audioCodec, audioCodec,
videoCodec, videoCodec,
audioBitrate,
audioChannels,
width, width,
height, height,
bitDepth, bitDepth,

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

@ -272,8 +272,6 @@ namespace MediaBrowser.Model.Dlna
public ResponseProfile GetVideoMediaProfile(string container, public ResponseProfile GetVideoMediaProfile(string container,
string audioCodec, string audioCodec,
string videoCodec, string videoCodec,
int? audioBitrate,
int? audioChannels,
int? width, int? width,
int? height, int? height,
int? bitDepth, int? bitDepth,
@ -321,7 +319,7 @@ namespace MediaBrowser.Model.Dlna
var anyOff = false; var anyOff = false;
foreach (ProfileCondition c in i.Conditions) foreach (ProfileCondition c in i.Conditions)
{ {
if (!conditionProcessor.IsVideoConditionSatisfied(c, audioBitrate, audioChannels, 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))
{ {
anyOff = true; anyOff = true;
break; break;

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

@ -578,7 +578,7 @@ namespace MediaBrowser.Model.Dlna
// Check container conditions // Check container conditions
foreach (ProfileCondition i in conditions) foreach (ProfileCondition i in conditions)
{ {
if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, 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))
{ {
LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource); LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource);
@ -611,7 +611,7 @@ namespace MediaBrowser.Model.Dlna
foreach (ProfileCondition i in conditions) foreach (ProfileCondition i in conditions)
{ {
if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, 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))
{ {
LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource); LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource);