/*****************************************************************************
* output.m: MacOS X Output Dialog
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
+ * Copyright (C) 2002-2007 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "output.h"
/*****************************************************************************
- * VLCOutput implementation
+ * VLCOutput implementation
*****************************************************************************/
@implementation VLCOutput
- (id)init
{
self = [super init];
- o_mrl = [[NSString alloc] init];
+ o_mrl = [[NSArray alloc] init];
o_transcode = [[NSString alloc] init];
return self;
}
[super dealloc];
}
-- (void)setMRL:(NSString *)o_mrl_string
+- (void)setMRL:(NSArray *)o_mrl_array
{
[o_mrl autorelease];
- o_mrl = [o_mrl_string copy];
+ o_mrl = [o_mrl_array copy];
}
-- (NSString *)getMRL
+- (NSArray *)mrl
{
return [o_mrl copy];
}
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
@"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];
+ @"DIV2", @"DIV3", @"h263", @"h264", @"WMV1", @"WMV2", @"MJPG", @"theo", nil];
- [o_output_ckbox setTitle: _NS("Advanced output:")];
+ [o_output_ckbox setTitle: _NS("Streaming/Saving:")];
[o_output_settings setTitle: _NS("Settings...")];
[o_btn_ok setTitle: _NS("OK")];
- [o_options_lbl setTitle: _NS("Output Options")];
- [o_display setTitle: _NS("Play locally")];
+ [o_options_lbl setTitle: _NS("Streaming and Transcoding Options")];
+ [o_display setTitle: _NS("Display the stream locally")];
[[o_method cellAtRow:0 column:0] setTitle: _NS("File")];
[[o_method cellAtRow:1 column:0] setTitle: _NS("Stream")];
[o_dump_chkbox setTitle: _NS("Dump raw input")];
- [o_btn_browse setTitle: _NS("Browse...")];
+ [o_btn_browse setTitle: _NS("Browse...")];
[o_stream_address_lbl setStringValue: _NS("Address")];
[o_stream_port_lbl setStringValue: _NS("Port")];
[o_stream_ttl_lbl setStringValue: @"TTL"];
[o_mux_selector removeAllItems];
[o_mux_selector addItemsWithTitles: o_muxers];
- [o_transcode_lbl setTitle: _NS("Transcode options")];
+ [o_transcode_lbl setTitle: _NS("Transcoding options")];
[o_transcode_video_chkbox setTitle: _NS("Video")];
[o_transcode_video_selector removeAllItems];
[o_transcode_video_selector addItemsWithTitles: o_v_codecs];
[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];
[o_misc_lbl setTitle: _NS("Stream Announcing")];
[o_sap_chkbox setTitle: _NS("SAP announce")];
- [o_slp_chkbox setTitle: _NS("SLP announce")];
[o_rtsp_chkbox setTitle: _NS("RTSP announce")];
[o_http_chkbox setTitle:_NS("HTTP announce")];
[o_file_chkbox setTitle:_NS("Export SDP as file")];
o_mode = [[o_method selectedCell] title];
[o_sap_chkbox setEnabled: NO];
- [o_slp_chkbox setEnabled: NO];
[o_http_chkbox setEnabled: NO];
[o_rtsp_chkbox setEnabled: NO];
[o_file_chkbox setEnabled: NO];
[[o_mux_selector itemAtIndex: 7] setEnabled: NO];
[[o_mux_selector itemAtIndex: 8] setEnabled: YES];
[o_sap_chkbox setEnabled: YES];
- [o_slp_chkbox setEnabled: YES];
[o_channel_name setEnabled: YES];
}
else if( [o_mode isEqualToString: @"RTP"] )
[[o_mux_selector itemAtIndex: 8] setEnabled: YES];
[o_mux_selector selectItemAtIndex: 8];
[o_sap_chkbox setEnabled: YES];
- [o_slp_chkbox setEnabled: NO];
[o_rtsp_chkbox setEnabled: YES];
[o_http_chkbox setEnabled: YES];
[o_file_chkbox setEnabled: YES];
NSString *o_mode, *o_mux, *o_mux_string;
NSMutableString *o_announce = [NSMutableString stringWithString:@""];
NSMutableString *o_mrl_string = [NSMutableString stringWithString:@":sout=#"];
+ NSArray *o_sout_options;
[o_mrl_string appendString: o_transcode];
if( [o_display state] == NSOnState )
{
if( [o_dump_chkbox state] == NSOnState )
{
- o_mrl_string = [NSMutableString stringWithFormat:
- @":demux=demuxdump :demuxdump-file=\"%@\"",
- [o_file_field stringValue]];
- [self setMRL:o_mrl_string];
+ NSMutableArray * o_sout_options;
+ o_sout_options = [NSArray arrayWithObjects:
+ [NSString stringWithString:
+ @":demux=dump"],
+ [NSString stringWithFormat:
+ @":demuxdump-file=%@",
+ [o_file_field stringValue]],
+ nil];
+ [self setMRL:o_sout_options];
return;
}
else
{
[o_mrl_string appendFormat:
- @"std{access=file,mux=%@,url=\"%@\"}",
+ @"std{access=file,mux=%@,dst=\"%@\"}",
o_mux_string, [o_file_field stringValue]];
}
}
else
[o_announce appendFormat:@",sap"];
}
- if( [o_slp_chkbox state] == NSOnState )
- {
- if ( ![[o_channel_name stringValue] isEqualToString: @""] )
- [o_announce appendFormat:@
- "slp,name=%@",[o_channel_name stringValue]];
- else
- [o_announce appendString: @",slp"];
- }
}
if ( ![o_mode isEqualToString: @"RTP"] )
{
-
+ /* split up the hostname and the following path to paste the
+ * port correctly. Not need, if there isn't any path following the
+ * hostname. */
+ NSArray * o_urlItems = [[o_stream_address stringValue] \
+ componentsSeparatedByString: @"/"];
+ NSMutableString * o_finalStreamAddress;
+ o_finalStreamAddress = [[NSMutableString alloc] init];
+
+ if ([o_urlItems count] == 1)
+ {
+ [o_finalStreamAddress appendFormat: @"\"%@:%@\"", \
+ [o_stream_address stringValue],[o_stream_port stringValue]];
+ }
+ else
+ {
+ [o_finalStreamAddress appendFormat: @"\"%@:%@", [o_urlItems \
+ objectAtIndex: 0], [o_stream_port stringValue]];
+ unsigned int x;
+ x = 1;
+ while (x != [o_urlItems count])
+ {
+ [o_finalStreamAddress appendFormat: @"/%@", [o_urlItems \
+ objectAtIndex: x]];
+ x = (x + 1);
+ }
+ [o_finalStreamAddress appendString: @"\""];
+ }
+
[o_mrl_string appendFormat:
- @"std{access=%@,mux=%@,url=\"%@:%@\"%@}",
- o_mode, o_mux_string, [o_stream_address stringValue],
- [o_stream_port stringValue], o_announce];
+ @"std{access=%@,mux=%@,dst=%@%@}",
+ o_mode, o_mux_string, o_finalStreamAddress, o_announce];
}
else
{
{
[o_mrl_string appendString: @"}"];
}
- [self setMRL:o_mrl_string];
+ o_sout_options = [NSArray arrayWithObjects: o_mrl_string,nil];
+ [self setMRL:o_sout_options];
}
- (void)TTLChanged:(NSNotification *)o_notification
{
[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 )
{
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: @","];
{
NSString *o_mode;
o_mode = [[o_stream_type selectedCell] title];
- [o_channel_name setEnabled: [o_sap_chkbox state] || [o_slp_chkbox state]
- || [o_mode isEqualToString: @"RTP"]];
+ [o_channel_name setEnabled: [o_sap_chkbox state] ||
+ [o_mode isEqualToString: @"RTP"]];
if ([o_mode isEqualToString: @"RTP"])
{
projects / vlc / blobdiff