summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.mm70
-rw-r--r--macosx/English.lproj/PictureSettings.xib72
-rw-r--r--macosx/PictureController.h4
-rw-r--r--macosx/PictureController.mm24
4 files changed, 34 insertions, 136 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 268cf9b78..0e43904a3 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -1849,8 +1849,7 @@ fWorkingCount = 0;
/* Picture Filters */
[queueFileJob setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
[queueFileJob setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
- [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
+ [queueFileJob setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
[queueFileJob setObject:[NSString stringWithFormat:@"%d",[fPictureController deblock]] forKey:@"PictureDeblock"];
[queueFileJob setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
@@ -2386,8 +2385,7 @@ fWorkingCount = 0;
/* Filters */
/* Deinterlace */
[fPictureController setDeinterlace:[[queueToApply objectForKey:@"PictureDeinterlace"] intValue]];
- /* VFR */
- [fPictureController setVFR:[[queueToApply objectForKey:@"VFR"] intValue]];
+
/* Detelecine */
[fPictureController setDetelecine:[[queueToApply objectForKey:@"PictureDetelecine"] intValue]];
/* Denoise */
@@ -2680,11 +2678,17 @@ fWorkingCount = 0;
job->crop[2] = [[queueToApply objectForKey:@"PictureLeftCrop"] intValue];
job->crop[3] = [[queueToApply objectForKey:@"PictureRightCrop"] intValue];
+ /* Video settings */
[self writeToActivityLog: "prepareJob reached Frame Rate"];
+ /* Framerate */
- /* Video settings */
+ /* Set vfr to 0 as it's only on if using same as source in the framerate popup
+ * and detelecine is on, so we handle that in the logic below
+ */
+ job->vfr = 0;
if( [[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue] > 0 )
{
+ /* a specific framerate has been chosen */
job->vrate = 27000000;
job->vrate_base = hb_video_rates[[[queueToApply objectForKey:@"JobIndexVideoFramerate"] intValue]-1].rate;
/* We are not same as source so we set job->cfr to 1
@@ -2694,11 +2698,19 @@ fWorkingCount = 0;
}
else
{
+ /* We are same as source (variable) */
job->vrate = [[queueToApply objectForKey:@"JobVrate"] intValue];
job->vrate_base = [[queueToApply objectForKey:@"JobVrateBase"] intValue];
/* We are same as source so we set job->cfr to 0
* to enable true same as source framerate */
job->cfr = 0;
+ /* If we are same as source and we have detelecine on, we need to turn on
+ * job->vfr
+ */
+ if ([[queueToApply objectForKey:@"PictureDetelecine"] intValue] == 1)
+ {
+ job->vfr = 1;
+ }
}
[self writeToActivityLog: "prepareJob reached Bitrate Video Quality"];
if ( [[queueToApply objectForKey:@"VideoQualityType"] intValue] == 0 )
@@ -2802,17 +2814,7 @@ fWorkingCount = 0;
free(audio);
}
- /* set vfr according to the Picture Window */
- if ([[queueToApply objectForKey:@"VFR"] intValue] == 1)
- {
- job->vfr = 1;
- }
- else
- {
- job->vfr = 0;
- }
-
- [self writeToActivityLog: "prepareJob reached Filters"];
+ [self writeToActivityLog: "prepareJob reached Filters"];
/* Filters */
job->filters = hb_list_init();
@@ -3736,20 +3738,7 @@ the user is using "Custom" settings by determining the sender*/
}
/* VFR (Variable Frame Rate) */
- if ([fPictureController vfr]) {
- /* We change the string of the fps popup to warn that vfr is on Framerate (FPS): */
- [fVidRateField setStringValue: @"Framerate (VFR On):"];
- /* for VFR we select same as source (or title framerate) and disable the popup.
- * We know its index 0 as that is determined in titlePopUpChanged */
- [fVidRatePopUp selectItemAtIndex: 0];
- [fVidRatePopUp setEnabled: NO];
-
- }
- else {
- /* make sure the label for framerate is set to its default */
- [fVidRateField setStringValue: @"Framerate (FPS):"];
- [fVidRatePopUp setEnabled: YES];
- }
+
/* Deinterlace */
if ([fPictureController deinterlace] == 0)
@@ -5484,12 +5473,11 @@ if (item == nil)
/* VFR */
if ([[chosenPreset objectForKey:@"VFR"] intValue] == 1)
{
- [fPictureController setVFR:[[chosenPreset objectForKey:@"VFR"] intValue]];
- }
- else
- {
- [fPictureController setVFR:0];
+ // We make sure that framerate is set to Same as source variable
+ // detelecine will take care of itself right below
+ //[fPictureController setVFR:[[chosenPreset objectForKey:@"VFR"] intValue]];
}
+
/* Detelecine */
if ([[chosenPreset objectForKey:@"PictureDetelecine"] intValue] == 1)
{
@@ -5551,15 +5539,7 @@ if (item == nil)
{
[fPictureController setDeinterlace:0];
}
- /* VFR */
- if ([[chosenPreset objectForKey:@"VFR"] intValue] == 1)
- {
- [fPictureController setVFR:[[chosenPreset objectForKey:@"VFR"] intValue]];
- }
- else
- {
- [fPictureController setVFR:0];
- }
+
/* Detelecine */
if ([[chosenPreset objectForKey:@"PictureDetelecine"] intValue] == 1)
{
@@ -5783,7 +5763,7 @@ if (item == nil)
/* Picture Filters */
[preset setObject:[NSNumber numberWithInt:[fPictureController deinterlace]] forKey:@"PictureDeinterlace"];
[preset setObject:[NSNumber numberWithInt:[fPictureController detelecine]] forKey:@"PictureDetelecine"];
- [preset setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
+ //[preset setObject:[NSNumber numberWithInt:[fPictureController vfr]] forKey:@"VFR"];
[preset setObject:[NSNumber numberWithInt:[fPictureController denoise]] forKey:@"PictureDenoise"];
[preset setObject:[NSNumber numberWithInt:[fPictureController deblock]] forKey:@"PictureDeblock"];
[preset setObject:[NSNumber numberWithInt:[fPictureController decomb]] forKey:@"PictureDecomb"];
diff --git a/macosx/English.lproj/PictureSettings.xib b/macosx/English.lproj/PictureSettings.xib
index 9a75d857c..fc02c604b 100644
--- a/macosx/English.lproj/PictureSettings.xib
+++ b/macosx/English.lproj/PictureSettings.xib
@@ -785,7 +785,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSPopUpButton" id="346912008">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{84, 79}, {99, 15}}</string>
+ <string key="NSFrame">{{73, 79}, {110, 15}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1034367716">
@@ -859,7 +859,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="905607845">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{16, 77}, {68, 17}}</string>
+ <string key="NSFrame">{{2, 77}, {68, 17}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="522867811">
@@ -875,7 +875,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSButton" id="407610327">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{20, 100}, {82, 18}}</string>
+ <string key="NSFrame">{{6, 100}, {82, 18}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="832714893">
@@ -896,7 +896,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSPopUpButton" id="243795165">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{84, 54}, {99, 15}}</string>
+ <string key="NSFrame">{{74, 54}, {109, 15}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="708528272">
@@ -966,7 +966,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="94419441">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{33, 53}, {51, 17}}</string>
+ <string key="NSFrame">{{19, 53}, {51, 17}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="741873280">
@@ -1011,31 +1011,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="NSTextColor" ref="1053668690"/>
</object>
</object>
- <object class="NSButton" id="451292586">
- <reference key="NSNextResponder" ref="628081139"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{133, 100}, {46, 18}}</string>
- <reference key="NSSuperview" ref="628081139"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="321670634">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">67239936</int>
- <string key="NSContents">VFR:</string>
- <reference key="NSSupport" ref="26"/>
- <reference key="NSControlView" ref="451292586"/>
- <int key="NSButtonFlags">1210864127</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSAlternateImage" ref="931738615"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSPopUpButton" id="878291110">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{84, 9}, {99, 15}}</string>
+ <string key="NSFrame">{{75, 9}, {110, 15}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="162356603">
@@ -1105,7 +1084,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSTextField" id="742513844">
<reference key="NSNextResponder" ref="628081139"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{32, 7}, {52, 17}}</string>
+ <string key="NSFrame">{{18, 7}, {52, 17}}</string>
<reference key="NSSuperview" ref="628081139"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="604349861">
@@ -1511,22 +1490,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">fVFRCheck</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="451292586"/>
- </object>
- <int key="connectionID">100</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">SettingsChanged:</string>
- <reference key="source" ref="355312334"/>
- <reference key="destination" ref="451292586"/>
- </object>
- <int key="connectionID">101</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">fAnamorphicPopUp</string>
<reference key="source" ref="355312334"/>
<reference key="destination" ref="147098438"/>
@@ -1704,7 +1667,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="407610327"/>
- <reference ref="451292586"/>
<reference ref="243795165"/>
<reference ref="346912008"/>
<reference ref="905607845"/>
@@ -2067,20 +2029,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference key="parent" ref="94419441"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">99</int>
- <reference key="object" ref="451292586"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="321670634"/>
- </object>
- <reference key="parent" ref="309105014"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">164</int>
- <reference key="object" ref="321670634"/>
- <reference key="parent" ref="451292586"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="513894170"/>
<object class="NSMutableArray" key="children">
@@ -2486,8 +2434,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>9.ImportedFromIB2</string>
<string>92.IBPluginDependency</string>
<string>92.ImportedFromIB2</string>
- <string>99.IBPluginDependency</string>
- <string>99.ImportedFromIB2</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2621,8 +2567,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -2724,7 +2668,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>fPictureViewArea</string>
<string>fPrevButton</string>
<string>fRatioCheck</string>
- <string>fVFRCheck</string>
<string>fWidthField</string>
<string>fWidthStepper</string>
</object>
@@ -2756,7 +2699,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA</bytes>
<string>NSBox</string>
<string>NSButton</string>
<string>NSButton</string>
- <string>NSButton</string>
<string>NSTextField</string>
<string>NSStepper</string>
</object>
diff --git a/macosx/PictureController.h b/macosx/PictureController.h
index 7a3ba5929..24631c386 100644
--- a/macosx/PictureController.h
+++ b/macosx/PictureController.h
@@ -37,7 +37,6 @@
IBOutlet NSPopUpButton * fDeinterlacePopUp;
IBOutlet NSPopUpButton * fDecombPopUp;
IBOutlet NSButton * fDetelecineCheck;
- IBOutlet NSButton * fVFRCheck;
IBOutlet NSButton * fDeblockCheck;
IBOutlet NSTextField * fDeblockField;
IBOutlet NSSlider * fDeblockSlider;
@@ -61,7 +60,6 @@
struct {
int detelecine;
- int vfr;
int deinterlace;
int decomb;
int denoise;
@@ -90,8 +88,6 @@
- (IBAction) deblockSliderChanged: (id) sender;
- (int) detelecine;
- (void) setDetelecine: (int) setting;
-- (int) vfr;
-- (void) setVFR: (int) setting;
- (int) deinterlace;
- (void) setDeinterlace: (int) setting;
- (int) decomb;
diff --git a/macosx/PictureController.mm b/macosx/PictureController.mm
index 34d034d63..743bda368 100644
--- a/macosx/PictureController.mm
+++ b/macosx/PictureController.mm
@@ -113,8 +113,7 @@
}
/* Set filters widgets according to the filters struct */
- [fVFRCheck setState:fPictureFilterSettings.vfr];
- [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
+ [fDetelecineCheck setState:fPictureFilterSettings.detelecine];
[fDeinterlacePopUp selectItemAtIndex: fPictureFilterSettings.deinterlace];
[fDenoisePopUp selectItemAtIndex: fPictureFilterSettings.denoise];
[fDeblockCheck setState: fPictureFilterSettings.deblock];
@@ -335,16 +334,7 @@ are maintained across different sources */
job->deinterlace = 0;
}
fPictureFilterSettings.denoise = [fDenoisePopUp indexOfSelectedItem];
- fPictureFilterSettings.vfr = [fVFRCheck state];
- if (fPictureFilterSettings.vfr > 0)
- {
- [fDetelecineCheck setState:NSOnState];
- [fDetelecineCheck setEnabled: NO];
- }
- else
- {
- [fDetelecineCheck setEnabled: YES];
- }
+
fPictureFilterSettings.detelecine = [fDetelecineCheck state];
if ([fDeblockField stringValue] == @"Off")
@@ -474,16 +464,6 @@ are maintained across different sources */
fPictureFilterSettings.detelecine = setting;
}
-- (int) vfr
-{
- return fPictureFilterSettings.vfr;
-}
-
-- (void) setVFR: (int) setting
-{
- fPictureFilterSettings.vfr = setting;
-}
-
- (int) deinterlace
{
return fPictureFilterSettings.deinterlace;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 10:08:36 +0000