{\r
using System;\r
using System.Diagnostics;\r
+ using System.Linq;\r
\r
using HandBrake.ApplicationServices.Model;\r
using HandBrake.ApplicationServices.Services.Encode.Interfaces;\r
+ using HandBrake.ApplicationServices.Services.Scan;\r
+ using HandBrake.ApplicationServices.Services.Scan.Model;\r
using HandBrake.ApplicationServices.Utilities;\r
using HandBrake.Interop;\r
using HandBrake.Interop.EventArgs;\r
using HandBrake.Interop.Interfaces;\r
using HandBrake.Interop.Model;\r
\r
- using EncodeCompletedEventArgs = HandBrake.ApplicationServices.Services.Encode.EventArgs.EncodeCompletedEventArgs;\r
- using EncodeProgressEventArgs = HandBrake.ApplicationServices.Services.Encode.EventArgs.EncodeProgressEventArgs;\r
-\r
/// <summary>\r
/// LibHB Implementation of IEncode\r
/// </summary>\r
/// </summary>\r
private QueueTask currentTask;\r
\r
+ private Source scannedSource;\r
+\r
#endregion\r
\r
/// <summary>\r
{\r
try\r
{\r
- this.SetupLogging(job);\r
+ this.SetupLogging(job, true);\r
}\r
catch (Exception)\r
{\r
\r
this.instance.ScanCompleted += delegate\r
{\r
+ // Process into internal structures.\r
+ this.scannedSource = new Source { Titles = LibScan.ConvertTitles(this.instance.Titles, this.instance.FeatureTitle) }; // TODO work around the bad Internal API.\r
this.ScanCompleted(job, this.instance);\r
};\r
}\r
catch (Exception exc)\r
{\r
- this.InvokeEncodeCompleted(new EncodeCompletedEventArgs(false, exc, "An Error has occured.", this.currentTask.Task.Destination));\r
+ this.InvokeEncodeCompleted(new EventArgs.EncodeCompletedEventArgs(false, exc, "An Error has occured.", this.currentTask.Task.Destination));\r
}\r
}\r
\r
EncodeJob encodeJob = InteropModelCreator.GetEncodeJob(job);\r
\r
// Start the Encode\r
- instance.StartEncode(encodeJob, job.Configuration.PreviewScanCount);\r
+ Title title = this.scannedSource.Titles.FirstOrDefault(t => t.TitleNumber == job.Task.Title);\r
+ if (title == null)\r
+ {\r
+ throw new Exception("Unable to get title for encoding. Encode Failed.");\r
+ }\r
+\r
+ Interop.Model.Scan.Title scannedTitle = new Interop.Model.Scan.Title { Resolution = new Size(title.Resolution.Width, title.Resolution.Height), ParVal = new Size(title.ParVal.Width, title.ParVal.Height) };\r
+ \r
+ // TODO fix this tempory hack to pass in the required title information into the factory.\r
+ instance.StartEncode(encodeJob, scannedTitle, job.Configuration.PreviewScanCount);\r
\r
// Fire the Encode Started Event\r
this.InvokeEncodeStarted(System.EventArgs.Empty);\r
}\r
\r
#region HandBrakeInstance Event Handlers.\r
+\r
/// <summary>\r
/// Log a message\r
/// </summary>\r
/// <param name="e">\r
/// The Interop.EncodeProgressEventArgs.\r
/// </param>\r
- private void InstanceEncodeProgress(object sender, Interop.EventArgs.EncodeProgressEventArgs e)\r
+ private void InstanceEncodeProgress(object sender, EncodeProgressEventArgs e)\r
{\r
- EncodeProgressEventArgs args = new EncodeProgressEventArgs\r
+ EventArgs.EncodeProgressEventArgs args = new EventArgs.EncodeProgressEventArgs\r
{\r
- AverageFrameRate = e.AverageFrameRate,\r
- CurrentFrameRate = e.CurrentFrameRate,\r
- EstimatedTimeLeft = e.EstimatedTimeLeft,\r
- PercentComplete = e.FractionComplete * 100,\r
- Task = e.Pass,\r
- ElapsedTime = DateTime.Now - this.startTime,\r
+ AverageFrameRate = e.AverageFrameRate, \r
+ CurrentFrameRate = e.CurrentFrameRate, \r
+ EstimatedTimeLeft = e.EstimatedTimeLeft, \r
+ PercentComplete = e.FractionComplete * 100, \r
+ Task = e.Pass, \r
+ ElapsedTime = DateTime.Now - this.startTime, \r
};\r
\r
this.InvokeEncodeStatusChanged(args);\r
/// <param name="e">\r
/// The e.\r
/// </param>\r
- private void InstanceEncodeCompleted(object sender, Interop.EventArgs.EncodeCompletedEventArgs e)\r
+ private void InstanceEncodeCompleted(object sender, EncodeCompletedEventArgs e)\r
{\r
this.IsEncoding = false;\r
\r
this.InvokeEncodeCompleted(\r
e.Error\r
- ? new EncodeCompletedEventArgs(false, null, string.Empty, this.currentTask.Task.Destination)\r
- : new EncodeCompletedEventArgs(true, null, string.Empty, this.currentTask.Task.Destination));\r
+ ? new EventArgs.EncodeCompletedEventArgs(false, null, string.Empty, this.currentTask.Task.Destination)\r
+ : new EventArgs.EncodeCompletedEventArgs(true, null, string.Empty, this.currentTask.Task.Destination));\r
\r
this.ShutdownFileWriter();\r
}\r
/// <param name="jobToStart">\r
/// The job to start.\r
/// </param>\r
+ /// <param name="title">\r
+ /// The title.\r
+ /// </param>\r
/// <param name="scanPreviewCount">\r
/// The scan Preview Count.\r
/// </param>\r
- public void StartEncode(EncodeJob jobToStart, int scanPreviewCount)\r
+ public void StartEncode(EncodeJob jobToStart, Title title, int scanPreviewCount)\r
{\r
- this.StartEncode(jobToStart, false, 0, 0, 0, scanPreviewCount);\r
+ this.StartEncode(jobToStart, title, false, 0, 0, 0, scanPreviewCount);\r
}\r
\r
/// <summary>\r
/// Starts an encode with the given job.\r
/// </summary>\r
- /// <param name="job">The job to start.</param>\r
- /// <param name="preview">The scan Preview Count.</param>\r
- /// <param name="previewNumber">Preview Feature: Preview to encode</param>\r
- /// <param name="previewSeconds">Number of seconds to encode for the preview</param>\r
- /// <param name="overallSelectedLengthSeconds"></param>\r
- /// <param name="scanPreviewCount">Number of previews</param>\r
- public void StartEncode(EncodeJob job, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds, int scanPreviewCount)\r
+ /// <param name="job">\r
+ /// The job to start.\r
+ /// </param>\r
+ /// <param name="title">\r
+ /// The title.\r
+ /// </param>\r
+ /// <param name="preview">\r
+ /// The scan Preview Count.\r
+ /// </param>\r
+ /// <param name="previewNumber">\r
+ /// Preview Feature: Preview to encode\r
+ /// </param>\r
+ /// <param name="previewSeconds">\r
+ /// Number of seconds to encode for the preview\r
+ /// </param>\r
+ /// <param name="overallSelectedLengthSeconds">\r
+ /// The overall Selected Length Seconds.\r
+ /// </param>\r
+ /// <param name="scanPreviewCount">\r
+ /// Number of previews\r
+ /// </param>\r
+ public void StartEncode(EncodeJob job, Title title, bool preview, int previewNumber, int previewSeconds, double overallSelectedLengthSeconds, int scanPreviewCount)\r
{\r
this.previewCount = scanPreviewCount;\r
\r
- JsonEncodeObject encodeObject = EncodeFactory.Create(job, lastScan);\r
+ JsonEncodeObject encodeObject = EncodeFactory.Create(job, title);\r
\r
JsonSerializerSettings settings = new JsonSerializerSettings\r
{\r
using HandBrake.Interop.Helpers;\r
using HandBrake.Interop.Json.Anamorphic;\r
using HandBrake.Interop.Json.Encode;\r
- using HandBrake.Interop.Json.Scan;\r
using HandBrake.Interop.Model;\r
using HandBrake.Interop.Model.Encoding;\r
+ using HandBrake.Interop.Model.Scan;\r
\r
- using Newtonsoft.Json;\r
-\r
- using AudioList = HandBrake.Interop.Json.Encode.AudioList;\r
- using ChapterList = HandBrake.Interop.Json.Encode.ChapterList;\r
- using MetaData = HandBrake.Interop.Json.Encode.MetaData;\r
- using PAR = HandBrake.Interop.Json.Anamorphic.PAR;\r
- using SubtitleList = HandBrake.Interop.Json.Encode.SubtitleList;\r
+ using Subtitle = HandBrake.Interop.Json.Encode.Subtitle;\r
\r
/// <summary>\r
/// This factory takes the internal EncodeJob object and turns it into a set of JSON models\r
/// </summary>\r
internal class EncodeFactory\r
{\r
-\r
- /*\r
- * <j45> maxWidth and maxHeight are frontend issues. You pass those into hb_set_anamorphic_size when calculating geometry settings. width and height are given to the CROP_SCALE filter. No need for the frontend to set it in the job. The job will get the final dimensions from the filter settings anyway.\r
- * <j45> for example, both crop_scale and rotate filters modify job width and height settings\r
- *\r
- */\r
-\r
/// <summary>\r
/// The create.\r
/// </summary>\r
/// <param name="job">\r
/// The encode job.\r
/// </param>\r
+ /// <param name="title">\r
+ /// The title.\r
+ /// </param>\r
/// <returns>\r
/// The <see cref="JsonEncodeObject"/>.\r
/// </returns>\r
- internal static JsonEncodeObject Create(EncodeJob job, JsonScanObject scannedSource)\r
+ internal static JsonEncodeObject Create(EncodeJob job, Title title)\r
{\r
JsonEncodeObject encode = new JsonEncodeObject\r
{\r
- SequenceID = 0,\r
- Audio = CreateAudio(job),\r
- Destination = CreateDestination(job),\r
- Filter = CreateFilter(job),\r
- PAR = CreatePAR(job),\r
- MetaData = CreateMetaData(job),\r
- Source = CreateSource(job),\r
- Subtitle = CreateSubtitle(job),\r
+ SequenceID = 0, \r
+ Audio = CreateAudio(job), \r
+ Destination = CreateDestination(job), \r
+ Filter = CreateFilter(job, title), \r
+ PAR = CreatePAR(job), \r
+ MetaData = CreateMetaData(job), \r
+ Source = CreateSource(job), \r
+ Subtitle = CreateSubtitle(job), \r
Video = CreateVideo(job)\r
};\r
\r
{\r
Source source = new Source\r
{\r
- Title = job.Title,\r
+ Title = job.Title, \r
Range =\r
new Range\r
{\r
- ChapterEnd = job.ChapterEnd,\r
- ChapterStart = job.ChapterStart,\r
- FrameToStart = job.FramesStart,\r
- FrameToStop = job.FramesEnd,\r
- PtsToStart = (int)(job.SecondsStart * 90000),\r
- PtsToStop = (int)((job.SecondsEnd - job.SecondsStart) * 90000),\r
- },\r
+ ChapterEnd = job.ChapterEnd, \r
+ ChapterStart = job.ChapterStart, \r
+ FrameToStart = job.FramesStart, \r
+ FrameToStop = job.FramesEnd, \r
+ PtsToStart = (int)(job.SecondsStart * 90000), \r
+ PtsToStop = (int)((job.SecondsEnd - job.SecondsStart) * 90000), \r
+ }, \r
Angle = job.Angle\r
};\r
return source;\r
{\r
Destination destination = new Destination\r
{\r
- File = job.OutputPath,\r
- Mp4Options =\r
- new Mp4Options\r
- {\r
- IpodAtom = job.EncodingProfile.IPod5GSupport,\r
- // LargeFileSize = job.EncodingProfile.LargeFile,\r
- Mp4Optimize = job.EncodingProfile.Optimize\r
- },\r
- ChapterMarkers = job.EncodingProfile.IncludeChapterMarkers,\r
- Mux = HBFunctions.hb_container_get_from_name(job.EncodingProfile.ContainerName),\r
+ File = job.OutputPath, \r
+ Mp4Options = new Mp4Options\r
+ {\r
+ IpodAtom = job.EncodingProfile.IPod5GSupport, \r
+ Mp4Optimize = job.EncodingProfile.Optimize\r
+ }, \r
+ ChapterMarkers = job.EncodingProfile.IncludeChapterMarkers, \r
+ Mux = HBFunctions.hb_container_get_from_name(job.EncodingProfile.ContainerName), \r
ChapterList = new List<ChapterList>()\r
};\r
\r
- foreach (string item in job.CustomChapterNames)\r
+ if (!job.UseDefaultChapterNames)\r
{\r
- ChapterList chapter = new ChapterList { Name = item };\r
- destination.ChapterList.Add(chapter);\r
+ foreach (string item in job.CustomChapterNames)\r
+ {\r
+ ChapterList chapter = new ChapterList { Name = item };\r
+ destination.ChapterList.Add(chapter);\r
+ }\r
}\r
\r
return destination;\r
/// <summary>\r
/// Create the PAR object\r
/// </summary>\r
- /// <param name="job">The Job</param>\r
- /// <returns>The produced PAR object.</returns>\r
+ /// <param name="job">\r
+ /// The Job\r
+ /// </param>\r
+ /// <returns>\r
+ /// The produced PAR object.\r
+ /// </returns>\r
private static PAR CreatePAR(EncodeJob job)\r
{\r
- return new PAR {Num = job.EncodingProfile.PixelAspectX, Den = job.EncodingProfile.PixelAspectY} ;\r
+ return new PAR { Num = job.EncodingProfile.PixelAspectX, Den = job.EncodingProfile.PixelAspectY };\r
}\r
\r
/// <summary>\r
/// The job.\r
/// </param>\r
/// <returns>\r
- /// The <see cref="Subtitle"/>.\r
+ /// The <see cref="Encode.Subtitle"/>.\r
/// </returns>\r
private static Subtitle CreateSubtitle(EncodeJob job)\r
{\r
Search =\r
new Search\r
{\r
- Enable = false,\r
- Default = false,\r
- Burn = false,\r
+ Enable = false, \r
+ Default = false, \r
+ Burn = false, \r
Forced = false\r
- },\r
+ }, \r
SubtitleList = new List<SubtitleList>()\r
};\r
\r
{\r
SubtitleList track = new SubtitleList\r
{\r
- Burn = item.BurnedIn,\r
- Default = item.Default,\r
- Force = item.Forced,\r
- ID = item.TrackNumber,\r
+ Burn = item.BurnedIn, \r
+ Default = item.Default, \r
+ Force = item.Forced, \r
+ ID = item.TrackNumber, \r
Track = item.TrackNumber\r
};\r
\r
{\r
SubtitleList track = new SubtitleList\r
{\r
- Default = item.Default,\r
- Offset = item.Offset,\r
+ Default = item.Default, \r
+ Offset = item.Offset, \r
SRT =\r
new SRT\r
{\r
- Filename = item.FileName,\r
- Codeset = item.CharacterCode,\r
+ Filename = item.FileName, \r
+ Codeset = item.CharacterCode, \r
Language = item.LanguageCode\r
}\r
};\r
\r
AudioList audioTrack = new AudioList\r
{\r
- Track = numTracks++,\r
- Bitrate = item.Bitrate,\r
- CompressionLevel = item.Compression,\r
- DRC = item.Drc,\r
- Encoder = encoder.Id,\r
- Gain = item.Gain,\r
- Mixdown = mixdown.Id,\r
- NormalizeMixLevel = false,\r
- Quality = item.Quality,\r
+ Track = numTracks++, \r
+ Bitrate = item.Bitrate, \r
+ CompressionLevel = item.Compression, \r
+ DRC = item.Drc, \r
+ Encoder = encoder.Id, \r
+ Gain = item.Gain, \r
+ Mixdown = mixdown.Id, \r
+ NormalizeMixLevel = false, \r
+ Quality = item.Quality, \r
Samplerate = item.SampleRateRaw\r
};\r
\r
}\r
\r
/// <summary>\r
- /// The create filter. TODO\r
+ /// The create filter.\r
/// </summary>\r
/// <param name="job">\r
/// The job.\r
/// </param>\r
+ /// <param name="title">\r
+ /// The title.\r
+ /// </param>\r
/// <returns>\r
/// The <see cref="Filter"/>.\r
/// </returns>\r
- private static Filter CreateFilter(EncodeJob job)\r
+ private static Filter CreateFilter(EncodeJob job, Title title)\r
{\r
Filter filter = new Filter\r
{\r
- FilterList = new List<FilterList>(),\r
+ FilterList = new List<FilterList>(), \r
Grayscale = job.EncodingProfile.Grayscale\r
};\r
\r
// Decomb\r
if (job.EncodingProfile.Decomb != Decomb.Off)\r
{\r
- string options = "";\r
+ string options;\r
if (job.EncodingProfile.Decomb == Decomb.Fast)\r
{\r
options = "7:2:6:9:1:80";\r
// Deinterlace\r
if (job.EncodingProfile.Deinterlace != Deinterlace.Off)\r
{\r
- string options = string.Empty;\r
+ string options;\r
if (job.EncodingProfile.Deinterlace == Deinterlace.Fast)\r
{\r
options = "0";\r
filter.FilterList.Add(filterItem);\r
}\r
\r
- // VFR / CFR TODO\r
+ // VFR / CFR TODO Setup the framerate shaper.\r
FilterList framerateShaper = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_VFR, Settings = string.Empty };\r
filter.FilterList.Add(framerateShaper);\r
\r
// Deblock\r
- if (job.EncodingProfile.Deblock < 5)\r
+ if (job.EncodingProfile.Deblock >= 5)\r
{\r
FilterList filterItem = new FilterList { ID = (int)hb_filter_ids.HB_FILTER_DEBLOCK, Settings = job.EncodingProfile.Deblock.ToString() };\r
filter.FilterList.Add(filterItem);\r
}\r
\r
// CropScale Filter\r
+ // TODO handle anamorphic.\r
+ Geometry resultGeometry = AnamorphicFactory.CreateGeometry(job, title, AnamorphicFactory.KeepSetting.HB_KEEP_WIDTH);\r
FilterList cropScale = new FilterList\r
{\r
- ID = (int)hb_filter_ids.HB_FILTER_CROP_SCALE,\r
+ ID = (int)hb_filter_ids.HB_FILTER_CROP_SCALE, \r
Settings =\r
string.Format(\r
- "{0}:{1}:{2}:{3}:{4}:{5}",\r
- job.EncodingProfile.Width,\r
- job.EncodingProfile.Height,\r
- job.EncodingProfile.Cropping.Top,\r
- job.EncodingProfile.Cropping.Bottom,\r
- job.EncodingProfile.Cropping.Left,\r
+ "{0}:{1}:{2}:{3}:{4}:{5}", \r
+ resultGeometry.Width, \r
+ resultGeometry.Height, \r
+ job.EncodingProfile.Cropping.Top, \r
+ job.EncodingProfile.Cropping.Bottom, \r
+ job.EncodingProfile.Cropping.Left, \r
job.EncodingProfile.Cropping.Right)\r
};\r
filter.FilterList.Add(cropScale);\r
private static MetaData CreateMetaData(EncodeJob job)\r
{\r
MetaData metaData = new MetaData();\r
+\r
+ /* TODO NOT SUPPORTED YET. */\r
return metaData;\r
}\r
}\r
projects / handbrake / commitdiff