MacGui: moved the queue code from HBController to HBQueueController, reworked the way the queue synchronise itself between multiple instances to be more resilient (hopefully). Modified HBCore to take callback blocks instead of notifications.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6770 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 406 insertions, 0 deletions

diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m
index 432478a42..1f941e5df 100644
--- a/macosx/HBJob+UIAdditions.m
+++ b/macosx/HBJob+UIAdditions.m
@@ -5,8 +5,24 @@
  It may be used under the terms of the GNU General Public License. */
 
 #import "HBJob+UIAdditions.h"
+
+#import "HBAttributedStringAdditions.h"
+#import "HBJob.h"
+#import "HBAudioTrack.h"
+#import "HBAudioDefaults.h"
+
+#import "HBPicture+UIAdditions.h"
+#import "HBFilters+UIAdditions.h"
+
 #include "hb.h"
 
+// Text Styles
+static NSMutableParagraphStyle *ps;
+static NSDictionary            *detailAttr;
+static NSDictionary            *detailBoldAttr;
+static NSDictionary            *titleAttr;
+static NSDictionary            *shortHeightAttr;
+
 @implementation HBJob (UIAdditions)
 
 - (BOOL)mp4OptionsEnabled
@@ -56,6 +72,396 @@
     return [[containers copy] autorelease];
 }
 
+- (void)initStyles
+{
+    if (!ps)
+    {
+        // Attributes
+        ps = [[[NSParagraphStyle defaultParagraphStyle] mutableCopy] retain];
+        [ps setHeadIndent: 40.0];
+        [ps setParagraphSpacing: 1.0];
+        [ps setTabStops:@[]];    // clear all tabs
+        [ps addTabStop: [[[NSTextTab alloc] initWithType: NSLeftTabStopType location: 20.0] autorelease]];
+
+        detailAttr = [@{NSFontAttributeName: [NSFont systemFontOfSize:10.0],
+                        NSParagraphStyleAttributeName: ps} retain];
+
+        detailBoldAttr = [@{NSFontAttributeName: [NSFont boldSystemFontOfSize:10.0],
+                            NSParagraphStyleAttributeName: ps} retain];
+
+        titleAttr = [@{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont systemFontSize]],
+                       NSParagraphStyleAttributeName: ps} retain];
+
+        shortHeightAttr = [@{NSFontAttributeName: [NSFont systemFontOfSize:2.0]} retain];
+    }
+}
+
+- (NSAttributedString *)attributedDescription
+{
+    // Below should be put into a separate method but I am way too f'ing lazy right now
+    NSMutableAttributedString *finalString = [[NSMutableAttributedString alloc] initWithString: @""];
+
+    [self initStyles];
+
+    @autoreleasepool
+    {
+        // First line, we should strip the destination path and just show the file name and add the title num and chapters (if any)
+        NSString *summaryInfo;
+
+        NSString *titleString = [NSString stringWithFormat:@"Title %d", self.titleIdx];
+
+        NSString *startStopString = @"";
+        if (self.range.type == HBRangeTypeChapters)
+        {
+            // Start Stop is chapters
+            startStopString = (self.range.chapterStart == self.range.chapterStop) ?
+            [NSString stringWithFormat:@"Chapter %d", self.range.chapterStart] :
+            [NSString stringWithFormat:@"Chapters %d through %d", self.range.chapterStart, self.range.chapterStop];
+        }
+        else if (self.range.type == HBRangeTypeSeconds)
+        {
+            // Start Stop is seconds
+            startStopString = [NSString stringWithFormat:@"Seconds %d through %d", self.range.secondsStart, self.range.secondsStop];
+        }
+        else if (self.range.type == HBRangeTypeFrames)
+        {
+            // Start Stop is Frames
+            startStopString = [NSString stringWithFormat:@"Frames %d through %d", self.range.frameStart, self.range.frameStop];
+        }
+        NSString *passesString = @"";
+        // check to see if our first subtitle track is Foreign Language Search, in which case there is an in depth scan
+        if (self.subtitles.tracks.count && [self.subtitles.tracks[0][@"keySubTrackIndex"] intValue] == -1)
+        {
+            passesString = [passesString stringByAppendingString:@"1 Foreign Language Search Pass - "];
+        }
+        if (self.video.qualityType == 1 || self.video.twoPass == NO)
+        {
+            passesString = [passesString stringByAppendingString:@"1 Video Pass"];
+        }
+        else
+        {
+            if (self.video.turboTwoPass == YES)
+            {
+                passesString = [passesString stringByAppendingString:@"2 Video Passes First Turbo"];
+            }
+            else
+            {
+                passesString = [passesString stringByAppendingString:@"2 Video Passes"];
+            }
+        }
+
+        [finalString appendString:[NSString stringWithFormat:@"%@", self.fileURL.path.lastPathComponent] withAttributes:titleAttr];
+
+        // lets add the output file name to the title string here
+        NSString *outputFilenameString = self.destURL.lastPathComponent;
+
+        summaryInfo = [NSString stringWithFormat: @" (%@, %@, %@) -> %@", titleString, startStopString, passesString, outputFilenameString];
+
+        [finalString appendString:[NSString stringWithFormat:@"%@\n", summaryInfo] withAttributes:detailAttr];
+
+        // Insert a short-in-height line to put some white space after the title
+        [finalString appendString:@"\n" withAttributes:shortHeightAttr];
+        // End of Title Stuff
+
+        // Second Line  (Preset Name)
+        [finalString appendString: @"Preset: " withAttributes:detailBoldAttr];
+        [finalString appendString:[NSString stringWithFormat:@"%@\n", self.presetName] withAttributes:detailAttr];
+
+        // Third Line  (Format Summary)
+        NSString *audioCodecSummary = @"";	//	This seems to be set by the last track we have available...
+        // Lets also get our audio track detail since we are going through the logic for use later
+
+        NSMutableArray *audioDetails = [NSMutableArray array];
+        BOOL autoPassthruPresent = NO;
+
+        for (HBAudioTrack *audioTrack in self.audio.tracks)
+        {
+            if (audioTrack.enabled)
+            {
+                audioCodecSummary = [NSString stringWithFormat: @"%@", audioTrack.codec[keyAudioCodecName]];
+                NSNumber *drc = audioTrack.drc;
+                NSNumber *gain = audioTrack.gain;
+                NSString *detailString = [NSString stringWithFormat: @"%@ Encoder: %@ Mixdown: %@ SampleRate: %@(khz) Bitrate: %@(kbps), DRC: %@, Gain: %@",
+                                          audioTrack.track[keyAudioTrackName],
+                                          audioTrack.codec[keyAudioCodecName],
+                                          audioTrack.mixdown[keyAudioMixdownName],
+                                          audioTrack.sampleRate[keyAudioSampleRateName],
+                                          audioTrack.bitRate[keyAudioBitrateName],
+                                          (0.0 < [drc floatValue]) ? (NSObject *)drc : (NSObject *)@"Off",
+                                          (0.0 != [gain floatValue]) ? (NSObject *)gain : (NSObject *)@"Off"
+                                          ];
+                [audioDetails addObject: detailString];
+                // check if we have an Auto Passthru output track
+                if ([audioTrack.codec[keyAudioCodecName] isEqualToString: @"Auto Passthru"])
+                {
+                    autoPassthruPresent = YES;
+                }
+            }
+        }
+
+        NSString *jobFormatInfo;
+        if (self.chaptersEnabled)
+            jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video  %@ Audio, Chapter Markers\n",
+                             @(hb_container_get_name(self.container)), @(hb_video_encoder_get_name(self.video.encoder)), audioCodecSummary];
+        else
+            jobFormatInfo = [NSString stringWithFormat:@"%@ Container, %@ Video  %@ Audio\n",
+                             @(hb_container_get_name(self.container)), @(hb_video_encoder_get_name(self.video.encoder)), audioCodecSummary];
+
+        [finalString appendString: @"Format: " withAttributes:detailBoldAttr];
+        [finalString appendString: jobFormatInfo withAttributes:detailAttr];
+
+        // Optional String for muxer options
+        NSMutableString *containerOptions = [NSMutableString stringWithString:@""];
+        if ((self.container & HB_MUX_MASK_MP4) && self.mp4HttpOptimize)
+        {
+            [containerOptions appendString:@" - Web optimized"];
+        }
+        if ((self.container & HB_MUX_MASK_MP4)  && self.mp4iPodCompatible)
+        {
+            [containerOptions appendString:@" - iPod 5G support"];
+        }
+        if ([containerOptions hasPrefix:@" - "])
+        {
+            [containerOptions deleteCharactersInRange:NSMakeRange(0, 3)];
+        }
+        if (containerOptions.length)
+        {
+            [finalString appendString:@"Container Options: " withAttributes:detailBoldAttr];
+            [finalString appendString:containerOptions       withAttributes:detailAttr];
+            [finalString appendString:@"\n"                  withAttributes:detailAttr];
+        }
+
+        // Fourth Line (Destination Path)
+        [finalString appendString: @"Destination: " withAttributes:detailBoldAttr];
+        [finalString appendString: self.destURL.path withAttributes:detailAttr];
+        [finalString appendString:@"\n" withAttributes:detailAttr];
+
+
+        // Fifth Line Picture Details
+        NSString *pictureInfo = [NSString stringWithFormat:@"%@", self.picture.summary];
+        if (self.picture.keepDisplayAspect)
+        {
+            pictureInfo = [pictureInfo stringByAppendingString:@" Keep Aspect Ratio"];
+        }
+        [finalString appendString:@"Picture: " withAttributes:detailBoldAttr];
+        [finalString appendString:pictureInfo  withAttributes:detailAttr];
+        [finalString appendString:@"\n"        withAttributes:detailAttr];
+
+        /* Optional String for Picture Filters */
+        if (self.filters.summary.length)
+        {
+            NSString *pictureFilters = [NSString stringWithFormat:@"%@", self.filters.summary];
+            [finalString appendString:@"Filters: "   withAttributes:detailBoldAttr];
+            [finalString appendString:pictureFilters withAttributes:detailAttr];
+            [finalString appendString:@"\n"          withAttributes:detailAttr];
+        }
+
+        // Sixth Line Video Details
+        NSString * videoInfo = [NSString stringWithFormat:@"Encoder: %@", @(hb_video_encoder_get_name(self.video.encoder))];
+
+        // for framerate look to see if we are using vfr detelecine
+        if (self.video.frameRate == 0)
+        {
+            if (self.video.frameRateMode == 0)
+            {
+                // we are using same as source with vfr detelecine
+                videoInfo = [NSString stringWithFormat:@"%@ Framerate: Same as source (Variable Frame Rate)", videoInfo];
+            }
+            else
+            {
+                // we are using a variable framerate without dropping frames
+                videoInfo = [NSString stringWithFormat:@"%@ Framerate: Same as source (Constant Frame Rate)", videoInfo];
+            }
+        }
+        else
+        {
+            // we have a specified, constant framerate
+            if (self.video.frameRateMode == 0)
+            {
+                videoInfo = [NSString stringWithFormat:@"%@ Framerate: %@ (Peak Frame Rate)", videoInfo, @(hb_video_framerate_get_name(self.video.frameRate))];
+            }
+            else
+            {
+                videoInfo = [NSString stringWithFormat:@"%@ Framerate: %@ (Constant Frame Rate)", videoInfo, @(hb_video_framerate_get_name(self.video.frameRate))];
+            }
+        }
+
+
+        if (self.video.qualityType == 0) // ABR
+        {
+            videoInfo = [NSString stringWithFormat:@"%@ Bitrate: %d(kbps)", videoInfo, self.video.avgBitrate];
+        }
+        else // CRF
+        {
+            videoInfo = [NSString stringWithFormat:@"%@ Constant Quality: %.2f", videoInfo ,self.video.quality];
+        }
+
+        [finalString appendString: @"Video: " withAttributes:detailBoldAttr];
+        [finalString appendString: videoInfo withAttributes:detailAttr];
+        [finalString appendString:@"\n" withAttributes:detailAttr];
+
+
+        if (self.video.encoder == HB_VCODEC_X264 || self.video.encoder == HB_VCODEC_X265)
+        {
+            // we are using x264/x265
+            NSString *encoderPresetInfo = @"";
+            if (self.video.advancedOptions)
+            {
+                // we are using the old advanced panel
+                if (self.video.videoOptionExtra.length)
+                {
+                    encoderPresetInfo = [encoderPresetInfo stringByAppendingString:self.video.videoOptionExtra];
+                }
+                else
+                {
+                    encoderPresetInfo = [encoderPresetInfo stringByAppendingString:@"default settings"];
+                }
+            }
+            else
+            {
+                // we are using the x264 system
+                encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@"Preset: %@", self.video.preset]];
+                if (self.video.tune.length)
+                {
+                    encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Tune: %@", self.video.tune]];
+                }
+                if (self.video.videoOptionExtra.length)
+                {
+                    encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Options: %@", self.video.videoOptionExtra]];
+                }
+                if (self.video.profile.length)
+                {
+                    encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Profile: %@", self.video.profile]];
+                }
+                if (self.video.level.length)
+                {
+                    encoderPresetInfo = [encoderPresetInfo stringByAppendingString: [NSString stringWithFormat:@" - Level: %@", self.video.level]];
+                }
+            }
+            [finalString appendString: @"Encoder Options: " withAttributes:detailBoldAttr];
+            [finalString appendString: encoderPresetInfo withAttributes:detailAttr];
+            [finalString appendString:@"\n" withAttributes:detailAttr];
+        }
+        else
+        {
+            // we are using libavcodec
+            NSString *lavcInfo = @"";
+            if (self.video.videoOptionExtra.length)
+            {
+                lavcInfo = [lavcInfo stringByAppendingString:self.video.videoOptionExtra];
+            }
+            else
+            {
+                lavcInfo = [lavcInfo stringByAppendingString: @"default settings"];
+            }
+            [finalString appendString: @"Encoder Options: " withAttributes:detailBoldAttr];
+            [finalString appendString: lavcInfo withAttributes:detailAttr];
+            [finalString appendString:@"\n" withAttributes:detailAttr];
+        }
+
+
+        // Seventh Line Audio Details
+        int audioDetailCount = 0;
+        for (NSString *anAudioDetail in audioDetails) {
+            audioDetailCount++;
+            if (anAudioDetail.length) {
+                [finalString appendString: [NSString stringWithFormat: @"Audio Track %d ", audioDetailCount] withAttributes: detailBoldAttr];
+                [finalString appendString: anAudioDetail withAttributes: detailAttr];
+                [finalString appendString: @"\n" withAttributes: detailAttr];
+            }
+        }
+
+        // Eigth Line Auto Passthru Details
+        // only print Auto Passthru settings if we have an Auro Passthru output track
+        if (autoPassthruPresent == YES)
+        {
+            NSString *autoPassthruFallback = @"", *autoPassthruCodecs = @"";
+            HBAudioDefaults *audioDefaults = self.audio.defaults;
+            autoPassthruFallback = [autoPassthruFallback stringByAppendingString:@(hb_audio_encoder_get_name(audioDefaults.encoderFallback))];
+            if (audioDefaults.allowAACPassthru)
+            {
+                autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@"AAC"];
+            }
+            if (audioDefaults.allowAC3Passthru)
+            {
+                if (autoPassthruCodecs.length)
+                {
+                    autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@", "];
+                }
+                autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@"AC3"];
+            }
+            if (audioDefaults.allowDTSHDPassthru)
+            {
+                if (autoPassthruCodecs.length)
+                {
+                    autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@", "];
+                }
+                autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@"DTS-HD"];
+            }
+            if (audioDefaults.allowDTSPassthru)
+            {
+                if (autoPassthruCodecs.length)
+                {
+                    autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@", "];
+                }
+                autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@"DTS"];
+            }
+            if (audioDefaults.allowMP3Passthru)
+            {
+                if (autoPassthruCodecs.length)
+                {
+                    autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@", "];
+                }
+                autoPassthruCodecs = [autoPassthruCodecs stringByAppendingString:@"MP3"];
+            }
+            [finalString appendString: @"Auto Passthru Codecs: " withAttributes: detailBoldAttr];
+            if (autoPassthruCodecs.length)
+            {
+                [finalString appendString: autoPassthruCodecs withAttributes: detailAttr];
+            }
+            else
+            {
+                [finalString appendString: @"None" withAttributes: detailAttr];
+            }
+            [finalString appendString: @"\n" withAttributes: detailAttr];
+            [finalString appendString: @"Auto Passthru Fallback: " withAttributes: detailBoldAttr];
+            [finalString appendString: autoPassthruFallback withAttributes: detailAttr];
+            [finalString appendString: @"\n" withAttributes: detailAttr];
+        }
+        
+        // Ninth Line Subtitle Details
+        int i = 0;
+        for (NSDictionary *track in self.subtitles.tracks)
+        {
+            // Ignore the none track.
+            if (i == self.subtitles.tracks.count - 1)
+            {
+                continue;
+            }
+            
+            /* remember that index 0 of Subtitles can contain "Foreign Audio Search*/
+            [finalString appendString: @"Subtitle: " withAttributes:detailBoldAttr];
+            [finalString appendString: track[@"keySubTrackName"] withAttributes:detailAttr];
+            if ([track[@"keySubTrackForced"] intValue] == 1)
+            {
+                [finalString appendString: @" - Forced Only" withAttributes:detailAttr];
+            }
+            if ([track[@"keySubTrackBurned"] intValue] == 1)
+            {
+                [finalString appendString: @" - Burned In" withAttributes:detailAttr];
+            }
+            if ([track[@"keySubTrackDefault"] intValue] == 1)
+            {
+                [finalString appendString: @" - Default" withAttributes:detailAttr];
+            }
+            [finalString appendString:@"\n" withAttributes:detailAttr];
+            i++;
+        }
+    }
+    
+    return [finalString autorelease];
+}
+
 @end
 
 @implementation HBContainerTransformer