* Adds the scale video option

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 7f5028f8d8a9adc7564424aee6082ae519f1cd5c..0ac4be64ac6fa9693f5c9fb2d7602f92bc47e7b6 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -352,6 +352,8 @@
                 "o_transcode_video_bitrate" = id; 
                 "o_transcode_video_bitrate_lbl" = id; 
                 "o_transcode_video_chkbox" = id; 
+                "o_transcode_video_scale" = id; 
+                "o_transcode_video_scale_lbl" = id; 
                 "o_transcode_video_selector" = id; 
             }; 
             SUPERCLASS = NSObject; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 5b65e137bba41f8de2eb60e5f6b989a47e4d08eb..a4fe610049b9917b25f24917a49594fc15c867fc 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -22,9 +22,8 @@
        <key>IBOpenObjects</key>
        <array>
                <integer>21</integer>
-               <integer>1617</integer>
                <integer>29</integer>
-               <integer>1411</integer>
+               <integer>1617</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7H63</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 874ee3f70d508885d04e8a021c77a900d6b58d8d..bc393c1341dddd2ba08eea1d3953d02b6e4817c5 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/output.h b/modules/gui/macosx/output.h
index fb914a00361f56783cdf74612a84df4bd0249770..888693ecb4e4c042d7007bf4952d972c86bf739c 100644 (file)
--- a/modules/gui/macosx/output.h
+++ b/modules/gui/macosx/output.h
@@ -33,7 +33,7 @@
     IBOutlet id o_output_settings;
     IBOutlet id o_output_sheet;
     IBOutlet id o_btn_ok;
-        
+
     IBOutlet id o_options_lbl;
     IBOutlet id o_display;
     IBOutlet id o_method;
@@ -50,10 +50,10 @@
     IBOutlet id o_stream_ttl_lbl;
     IBOutlet id o_stream_type;
     IBOutlet id o_stream_type_lbl;
-    
+
     IBOutlet id o_mux_lbl;
     IBOutlet id o_mux_selector;
-    
+
     IBOutlet id o_transcode_audio_bitrate;
     IBOutlet id o_transcode_audio_bitrate_lbl;
     IBOutlet id o_transcode_audio_channels;
@@ -63,21 +63,23 @@
     IBOutlet id o_transcode_lbl;
     IBOutlet id o_transcode_video_bitrate;
     IBOutlet id o_transcode_video_bitrate_lbl;
+    IBOutlet id o_transcode_video_scale;
+    IBOutlet id o_transcode_video_scale_lbl;
     IBOutlet id o_transcode_video_chkbox;
     IBOutlet id o_transcode_video_selector;
-    
+
     IBOutlet id o_misc_lbl;
     IBOutlet id o_sap_chkbox;
     IBOutlet id o_slp_chkbox;
     IBOutlet id o_channel_name;
     IBOutlet id o_channel_name_lbl;
-    
+
     IBOutlet id o_sdp_url;
     IBOutlet id o_sdp_url_lbl;
     IBOutlet id o_rtsp_chkbox;
     IBOutlet id o_http_chkbox;
     IBOutlet id o_file_chkbox;
-    
+
     NSString *o_mrl;
     NSString *o_transcode;
 }

diff --git a/modules/gui/macosx/output.m b/modules/gui/macosx/output.m
index e5363f36794567d4a8c4a14a15052eb241dfda97..80f467a25637da821a9883332587b5da1eeb0024 100644 (file)
--- a/modules/gui/macosx/output.m
+++ b/modules/gui/macosx/output.m
@@ -94,6 +94,10 @@
         selector: @selector(transcodeInfoChanged:)
         name: NSControlTextDidChangeNotification
         object: o_transcode_video_bitrate];
+    [[NSNotificationCenter defaultCenter] addObserver: self
+        selector: @selector(transcodeInfoChanged:)
+        name: NSControlTextDidChangeNotification
+        object: o_transcode_video_scale];
     [[NSNotificationCenter defaultCenter] addObserver: self
         selector: @selector(transcodeInfoChanged:)
         name: NSControlTextDidChangeNotification
@@ -124,6 +128,7 @@
         @"128", @"192", @"256", @"512", nil];
     NSArray *o_v_bitrates = [NSArray arrayWithObjects: @"16", @"32", @"64", @"96",
         @"128", @"192", @"256", @"384", @"512", @"768", @"1024", @"2048", @"3072", nil];
+    NSArray *o_v_scales = [NSArray arrayWithObjects: @"0.25",@"0.5",@"0.75",@"1",@"1.25",@"1.5",@"1.75",@"2",nil];
     NSArray *o_a_codecs = [NSArray arrayWithObjects: @"mpga", @"mp3 ", @"mp4a", @"a52 ", @"vorb", @"flac", @"spx ", nil];
     NSArray *o_v_codecs = [NSArray arrayWithObjects: @"mp1v", @"mp2v", @"mp4v", @"DIV1",
         @"DIV2", @"DIV3", @"H263", @"I263", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
@@ -158,6 +163,10 @@
     [o_transcode_video_bitrate_lbl setStringValue: _NS("Bitrate (kb/s)")];
     [o_transcode_video_bitrate removeAllItems];
     [o_transcode_video_bitrate addItemsWithObjectValues: o_v_bitrates];
+    [o_transcode_video_scale_lbl setStringValue: _NS("Scale")];
+    [o_transcode_video_scale removeAllItems];
+    [o_transcode_video_scale addItemsWithObjectValues: o_v_scales];
+    [o_transcode_video_scale selectItemWithObjectValue: @"1"];
     [o_transcode_audio_chkbox setTitle: _NS("Audio")];
     [o_transcode_audio_selector removeAllItems];
     [o_transcode_audio_selector addItemsWithTitles: o_a_codecs];
@@ -522,11 +531,13 @@
     {
         [o_transcode_video_selector setEnabled: YES];
         [o_transcode_video_bitrate setEnabled: YES];
+        [o_transcode_video_scale setEnabled: YES];
     }
     else
     {
         [o_transcode_video_selector setEnabled: NO];
         [o_transcode_video_bitrate setEnabled: NO];
+        [o_transcode_video_scale setEnabled: NO];
     }
     if( [o_transcode_audio_chkbox state] == NSOnState )
     {
@@ -554,9 +565,11 @@
         o_transcode_string = [NSMutableString stringWithString:@"transcode{"];
         if ( [o_transcode_video_chkbox state] == NSOnState )
         {
-            [o_transcode_string appendFormat: @"vcodec=\"%@\",vb=\"%@\"",
+            [o_transcode_string appendFormat: @"vcodec=\"%@\",vb=\"%@\""
+                                                            ",scale=\"%@\"",
                 [o_transcode_video_selector titleOfSelectedItem],
-                [o_transcode_video_bitrate stringValue]];
+                [o_transcode_video_bitrate stringValue],
+                [o_transcode_video_scale stringValue]];
             if ( [o_transcode_audio_chkbox state] == NSOnState )
             {
                 [o_transcode_string appendString: @","];