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

removed use of libbluray

Browse Source
This commit is contained in:
Luke Pulverenti 2014-03-04 21:59:23 -05:00
parent c567b96e62
commit 040c36dbf2
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,7 +618,7 @@ namespace MediaBrowser.Api.Playback
// Don't re-encode ass/ssa to ass because ffmpeg ass encoder fails if there's more than one ass rectangle. Affect Anime mostly.
// See https://lists.ffmpeg.org/pipermail/ffmpeg-cvslog/2013-April/063616.html
bool isAssSubtitle = string.Equals(state.SubtitleStream.Codec, "ass", StringComparison.OrdinalIgnoreCase) || string.Equals(state.SubtitleStream.Codec, "ssa", StringComparison.OrdinalIgnoreCase);
var isAssSubtitle = string.Equals(state.SubtitleStream.Codec, "ass", StringComparison.OrdinalIgnoreCase) || string.Equals(state.SubtitleStream.Codec, "ssa", StringComparison.OrdinalIgnoreCase);
var task = MediaEncoder.ExtractTextSubtitle(inputPath, type, state.SubtitleStream.Index, isAssSubtitle, path, CancellationToken.None);

14
MediaBrowser.Controller/Entities/Video.cs
View File

@ -110,10 +110,13 @@ namespace MediaBrowser.Controller.Entities
return System.IO.Path.GetDirectoryName(Path);
}
if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd ||
VideoType == VideoType.HdDvd)
if (!IsPlaceHolder)
{
return Path;
if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd ||
VideoType == VideoType.HdDvd)
{
return Path;
}
}
return base.ContainingFolderPath;
@ -259,10 +262,7 @@ namespace MediaBrowser.Controller.Entities
{
if (!IsInMixedFolder)
{
if (VideoType == VideoType.VideoFile || VideoType == VideoType.Iso)
{
return new[] { System.IO.Path.GetDirectoryName(Path) };
}
return new[] { ContainingFolderPath };
}
return base.GetDeletePaths();

15
MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
View File

@ -34,6 +34,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{
case VideoType.BluRay:
type = InputType.Bluray;
inputPath = GetPlayableStreamFiles(inputPath[0], playableStreamFileNames).ToArray();
break;
case VideoType.Dvd:
type = InputType.Dvd;
@ -46,6 +47,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{
case IsoType.BluRay:
type = InputType.Bluray;
inputPath = GetPlayableStreamFiles(inputPath[0], playableStreamFileNames).ToArray();
break;
case IsoType.Dvd:
type = InputType.Dvd;
@ -118,15 +120,16 @@ namespace MediaBrowser.Controller.MediaEncoding
return type;
}
public static Model.Entities.MediaInfo GetMediaInfo(InternalMediaInfoResult data)
public static MediaInfo GetMediaInfo(InternalMediaInfoResult data)
{
var internalStreams = data.streams ?? new MediaStreamInfo[] { };
var info = new Model.Entities.MediaInfo();
info.MediaStreams = internalStreams.Select(s => GetMediaStream(s, data.format))
.Where(i => i != null)
.ToList();
var info = new MediaInfo
{
MediaStreams = internalStreams.Select(s => GetMediaStream(s, data.format))
.Where(i => i != null)
.ToList()
};
if (data.format != null)
{

4
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@ -125,13 +125,11 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
switch (type)
{
case InputType.Bluray:
case InputType.Dvd:
case InputType.File:
inputPath = GetConcatInputArgument(inputFiles);
break;
case InputType.Bluray:
inputPath = GetBlurayInputArgument(inputFiles[0]);
break;
case InputType.Url:
inputPath = GetHttpInputArgument(inputFiles);
break;