/* Misc */
bool b_sap; /*< send SAP announcement */
bool b_all_es;/*< send all elementary streams from source stream */
+ bool b_sout_keep;
char *psz_group; /*< SAP Group name */
char *psz_name; /*< SAP name */
int32_t i_ttl; /*< Time To Live (TTL) for network traversal */
struct streaming_account_t sa_icecast; /*< Icecast account information */
};
+class SoutMrl
+{
+public:
+ SoutMrl( const QString head = "")
+ {
+ mrl = head;
+ b_first = true;
+ b_has_bracket = false;
+ }
+
+ QString getMrl()
+ {
+ return mrl;
+ }
+
+ void begin( QString module )
+ {
+ if( !b_first )
+ mrl += ":";
+ b_first = false;
+
+ mrl += module;
+ b_has_bracket = false;
+ }
+ void end()
+ {
+ if( b_has_bracket )
+ mrl += "}";
+ }
+ void option( const QString option, const QString value = "" )
+ {
+ if( !b_has_bracket )
+ mrl += "{";
+ else
+ mrl += ",";
+ b_has_bracket = true;
+
+ mrl += option;
+
+ if( !value.isEmpty() )
+ {
+ char *psz = config_StringEscape( qta(value) );
+ if( psz )
+ {
+ QString v = QString( psz );
+
+ mrl += "=\"" + v + "\"";
+
+ free( psz );
+ }
+ }
+ }
+ void option( const QString name, const int i_value, const int i_precision = 10 )
+ {
+ option( name, QString::number( i_value, i_precision ) );
+ }
+ void option( const QString name, const double f_value )
+ {
+ option( name, QString::number( f_value ) );
+ }
+
+ void option( const QString name, const QString base, const int i_value, const int i_precision = 10 )
+ {
+ option( name, base + ":" + QString::number( i_value, i_precision ) );
+ }
+
+private:
+ QString mrl;
+ bool b_has_bracket;
+ bool b_first;
+};
+
SoutDialog* SoutDialog::instance = NULL;
SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
/* ADD HERE for new profiles */
#define ADD_PROFILE( name, shortname ) ui.profileBox->addItem( qtr( name ), QVariant( QString( shortname ) ) );
ADD_PROFILE( "Custom" , "Custom" )
+ ADD_PROFILE( "Ogg / Theora", "theora" )
+ ADD_PROFILE( "Ogg / Vorbis", "vorbis" )
+ ADD_PROFILE( "MPEG-2", "mpeg2" )
+ ADD_PROFILE( "MP3", "mp3" )
+ ADD_PROFILE( "MPEG-4 audio AAC", "aac" )
+ ADD_PROFILE( "MPEG-4 / DivX", "mp4" )
+ ADD_PROFILE( "H264", "h264" )
ADD_PROFILE( "IPod (mp4/aac)", "IPod" )
ADD_PROFILE( "XBox", "XBox" )
ADD_PROFILE( "Windows (wmv/asf)", "Windows" )
ADD_PROFILE( "PSP", "PSP")
- ADD_PROFILE( "GSM", "GSM" )
#define ADD_VCODEC( name, fourcc ) ui.vCodecBox->addItem( name, QVariant( fourcc ) );
ADD_VCODEC( "MPEG-1", "mp1v" )
ADD_ACODEC( "WMA", "wma" )
#define ADD_SCALING( factor ) ui.vScaleBox->addItem( factor );
+ ADD_SCALING( "1" )
ADD_SCALING( "0.25" )
ADD_SCALING( "0.5" )
ADD_SCALING( "0.75" )
- ADD_SCALING( "1" )
ADD_SCALING( "1.25" )
ADD_SCALING( "1.5" )
ADD_SCALING( "1.75" )
ui.mrlEdit->setToolTip ( qtr( "Stream output string.\n"
"This is automatically generated "
"when you change the above settings,\n"
- "but you can update it manually." ) ) ;
+ "but you can change it manually." ) ) ;
// /* Connect everything to the updateMRL function */
#define CB( x ) CONNECT( ui.x, toggled( bool ), this, updateMRL() );
CB( PSMux ); CB( TSMux ); CB( MPEG1Mux ); CB( OggMux ); CB( ASFMux );
CB( MP4Mux ); CB( MOVMux ); CB( WAVMux ); CB( RAWMux ); CB( FLVMux );
/* Misc */
- CB( soutAll ); CS( ttl ); CT( sapName ); CT( sapGroup );
+ CB( soutAll ); CB( soutKeep ); CS( ttl ); CT( sapName ); CT( sapGroup );
CONNECT( ui.profileBox, activated( const QString & ), this, setOptions() );
CONNECT( ui.fileSelectButton, clicked() , this, fileBrowse() );
void SoutDialog::fileBrowse()
{
- QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file" ), "",
- qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)" ) );
- ui.fileEdit->setText( fileName );
+ QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ),
+ "", qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)" ) );
+ ui.fileEdit->setText( toNativeSeparators( fileName ) );
updateMRL();
}
ui.muxName ##Mux->setChecked( true ); \
\
ui.transcodeAudio->setChecked( hasAudio ); \
- index = ui.aCodecBox->findText( vCodecName ); \
+ index = ui.aCodecBox->findData( aCodecName ); \
if( index >= 0 ) ui.aCodecBox->setCurrentIndex( index ); \
\
ui.transcodeVideo->setChecked( hasVideo ); \
- index = ui.aCodecBox->findText( vCodecName ); \
+ index = ui.vCodecBox->findData( vCodecName ); \
if( index >=0 ) ui.vCodecBox->setCurrentIndex( index ); \
}
/* ADD HERE the profiles you want and need */
- /* FIXME */
- if( profileString == "IPod" ) setProfile( MP4, true, "mp4a", true, "mp4v" )
- else if( profileString == "XBox" ) setProfile( ASF, true, "wma", true, "WMV2" )
+ if( profileString == "IPod" ) setProfile( MP4, true, "mp4v", true, "mp4a" )
+ else if( profileString == "theora" ) setProfile( Ogg, true, "theo", true, "vorb" )
+ else if( profileString == "vorbis" ) setProfile( Ogg, false, "", true, "vorb" )
+ else if( profileString == "mpeg2" ) setProfile( TS, true, "mp2v", true, "mpga" )
+ else if( profileString == "mp3" ) setProfile( RAW, false, "", true, "mp3" )
+ else if( profileString == "aac" ) setProfile( MP4, false, "", true, "mp4a" )
+ else if( profileString == "mp4" ) setProfile( MP4, true, "mp4v", true, "mp4a" )
+ else if( profileString == "h264" ) setProfile( TS, true, "h264", true, "mp4a" )
+ else if( profileString == "XBox" ) setProfile( ASF, true, "WMV2", true, "wma" )
+ else if( profileString == "Windows" ) setProfile( ASF, true, "WMV2", true, "wma" )
+ else if( profileString == "PSP" ) setProfile( Ogg, true, "DIV3", true, "vorb" )
/* If the profile is not a custom one, then disable the tabWidget */
if ( profileString == "Custom" )
HIDEORSHOW( ui.sap ); HIDEORSHOW( ui.sapName );
HIDEORSHOW( ui.sapGroup ); HIDEORSHOW( ui.sapGroupLabel );
HIDEORSHOW( ui.ttlLabel ); HIDEORSHOW( ui.ttl );
+ HIDEORSHOW( ui.soutKeep );
HIDEORSHOW( ui.IcecastOutput ); HIDEORSHOW( ui.IcecastEdit );
HIDEORSHOW( ui.IcecastNamePassEdit ); HIDEORSHOW( ui.IcecastMountpointEdit );
ui.RTPLabel->setEnabled( b_en );
ui.RTPEdit->setEnabled( b_en );
ui.UDPOutput->setEnabled( b_en );
+ ui.UDPRTPLabel->setEnabled( b_en );
+ ui.UDPEdit->setEnabled( b_en );
ui.UDPPort->setEnabled( b_en );
ui.UDPPortLabel->setEnabled( b_en );
ui.RTPPort2->setEnabled( b_en );
sout.b_dump = ui.rawInput->isChecked();
sout.b_sap = ui.sap->isChecked();
sout.b_all_es = ui.soutAll->isChecked();
+ sout.b_sout_keep = ui.soutKeep->isChecked();
sout.psz_vcodec = strdup( qtu( ui.vCodecBox->itemData( ui.vCodecBox->currentIndex() ).toString() ) );
sout.psz_acodec = strdup( qtu( ui.aCodecBox->itemData( ui.aCodecBox->currentIndex() ).toString() ) );
sout.psz_scodec = strdup( qtu( ui.subsCodecBox->itemData( ui.subsCodecBox->currentIndex() ).toString() ) );
bool trans = false;
bool more = false;
+ SoutMrl smrl( ":sout=#" );
+
if ( ui.transcodeVideo->isChecked() || ui.transcodeAudio->isChecked()
&& !ui.rawInput->isChecked() /*demuxdump speciality*/ )
{
+ smrl.begin( "transcode" );
+
if ( ui.transcodeVideo->isChecked() )
{
- mrl = ":sout=#transcode{";
- mrl.append( "vcodec=" );
- mrl.append( sout.psz_vcodec );
- mrl.append( "," );
- mrl.append( "vb=" );
- mrl.append( QString::number( sout.i_vb,10 ) );
- mrl.append( "," );
- mrl.append( "scale=" );
- mrl.append( QString::number( sout.f_scale ) );
+ smrl.option( "vcodec", sout.psz_vcodec );
+ smrl.option( "vb", sout.i_vb );
+ smrl.option( "scale", sout.f_scale );
trans = true;
}
if ( ui.transcodeAudio->isChecked() )
{
- if ( trans )
- {
- mrl.append( "," );
- }
- else
- {
- mrl = ":sout=#transcode{";
- }
- mrl.append( "acodec=" );
- mrl.append( sout.psz_acodec );
- mrl.append( "," );
- mrl.append( "ab=" );
- mrl.append( QString::number( sout.i_ab,10 ) );
- mrl.append( "," );
- mrl.append( "channels=" );
- mrl.append( QString::number( sout.i_channels,10 ) );
+ smrl.option( "acodec", sout.psz_acodec );
+ smrl.option( "ab", sout.i_ab );
+ smrl.option( "channels", sout.i_channels );
trans = true;
}
- mrl.append( "}" );
+
+ smrl.end();
+
+ mrl = smrl.getMrl();
}
/* Special case for demuxdump */
if ( sout.b_local || sout.b_file || sout.b_http ||
sout.b_mms || sout.b_rtp || sout.b_udp || sout.b_icecast )
{
+ if( counter > 1 )
+ smrl.begin( "duplicate" );
-#define ISMORE() if ( more ) mrl.append( "," )
-#define ATLEASTONE() if ( counter ) mrl.append( "dst=" )
-
-#define CHECKMUX() \
- if( sout.psz_mux ) \
- { \
- mrl.append( ",mux=");\
- mrl.append( sout.psz_mux ); \
- }
-
- if ( trans )
- mrl.append( ":" );
- else
- mrl = ":sout=#";
-
- if ( counter )
- mrl.append( "duplicate{" );
+#define ADD(m) do { if( counter > 1 ) { \
+ smrl.option( "dst", m.getMrl() ); \
+ } else { \
+ smrl.begin( m.getMrl() ); \
+ smrl.end(); \
+ } } while(0)
if ( sout.b_local )
{
- ISMORE();
- ATLEASTONE();
- mrl.append( "display" );
+ SoutMrl m;
+ m.begin( "display" );
+ m.end();
+
+ ADD( m );
more = true;
}
if ( sout.b_file )
{
- ISMORE();
- ATLEASTONE();
- mrl.append( "std{access=file" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_file );
- mrl.append( "}" );
+ SoutMrl m;
+
+ m.begin( "std" );
+ m.option( "access", "file" );
+ if( sout.psz_mux )
+ m.option( "mux", sout.psz_mux );
+ m.option( "dst", sout.psz_file );
+ m.end();
+
+ ADD( m );
more = true;
}
if ( sout.b_http )
{
- ISMORE();
- ATLEASTONE();
- mrl.append( "std{access=http" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_http );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_http,10 ) );
- mrl.append( "}" );
+ SoutMrl m;
+
+ m.begin( "std" );
+ m.option( "access", "http" );
+ if( sout.psz_mux )
+ m.option( "mux", sout.psz_mux );
+ m.option( "dst", sout.psz_http, sout.i_http );
+ m.end();
+
+ ADD( m );
more = true;
}
if ( sout.b_mms )
{
- ISMORE();
- ATLEASTONE();
- mrl.append( "std{access=mmsh" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_mms );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_mms,10 ) );
- mrl.append( "}" );
+ SoutMrl m;
+
+ m.begin( "std" );
+ m.option( "access", "mmsh" );
+ m.option( "mux", "asfh" );
+ m.option( "dst", sout.psz_mms, sout.i_mms );
+ m.end();
+
+ ADD( m );
more = true;
}
if ( sout.b_rtp )
{
- ISMORE();
- ATLEASTONE();
+ SoutMrl m;
if ( sout.b_udp )
{
- mrl.append( "std{access=udp" );
- CHECKMUX();
- mrl.append( ",dst=" );
- mrl.append( sout.psz_udp );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_udp,10 ) );
+ m.begin( "std" );
+ m.option( "access", "udp" );
+ if( sout.psz_mux )
+ m.option( "mux", sout.psz_mux );
+ m.option( "dst", sout.psz_udp, sout.i_udp );
}
else
{
- mrl.append( "rtp{" );
- mrl.append( "dst=" );
- mrl.append( sout.psz_rtp );
- CHECKMUX();
- mrl.append( ",port=" );
- mrl.append( QString::number( sout.i_rtp,10 ) );
+ m.begin( "rtp" );
+
+ if( sout.psz_rtp && *sout.psz_rtp )
+ m.option( "dst", sout.psz_rtp );
+ if( sout.psz_mux )
+ m.option( "mux", sout.psz_mux );
+
+ m.option( "port", sout.i_rtp );
if( !sout.psz_mux || strncmp( sout.psz_mux, "ts", 2 ) )
{
- mrl.append( ",port-audio=" );
- mrl.append( QString::number( sout.i_rtp_audio, 10 ) );
- mrl.append( ",port-video=" );
- mrl.append( QString::number( sout.i_rtp_video, 10 ) );
+ m.option( "port-audio", sout.i_rtp_audio );
+ m.option( "port-video", sout.i_rtp_video );
}
}
/* SAP */
if ( sout.b_sap )
{
- mrl.append( ",sap," );
- mrl.append( "group=\"" );
- mrl.append( sout.psz_group );
- mrl.append( "\"," );
- mrl.append( "name=\"" );
- mrl.append( sout.psz_name );
- mrl.append( "\"" );
+ m.option( "sap" );
+ m.option( "group", sout.psz_group );
+ m.option( "name", sout.psz_name );
}
- mrl.append( "}" );
+ m.end();
+ ADD( m );
more = true;
}
if( sout.b_icecast )
{
- ISMORE();
- ATLEASTONE();
- mrl.append( "std{access=shout,mux=ogg" );
- mrl.append( ",dst=" );
- mrl.append( sout.sa_icecast.psz_username );
- mrl.append( "@" );
- mrl.append( sout.psz_icecast );
- mrl.append( ":" );
- mrl.append( QString::number( sout.i_icecast, 10 ) );
- mrl.append( "/" );
- mrl.append( sout.psz_icecast_mountpoint );
- mrl.append( "}" );
+ SoutMrl m;
+ QString url;
+
+ url = QString(sout.sa_icecast.psz_username) + "@" + sout.psz_icecast + ":" +
+ QString::number( sout.i_icecast, 10 ) + "/" + sout.psz_icecast_mountpoint;
+
+ m.begin( "std" );
+ m.option( "access", "shout" );
+ m.option( "mux", "ogg" );
+ m.option( "dst", url );
+ m.end();
+
+ ADD( m );
more = true;
}
if ( counter )
- {
- mrl.append( "}" );
- }
- }
+ smrl.end();
-#undef CHECKMUX
+ mrl = smrl.getMrl();
+ }
if ( sout.b_all_es )
- mrl.append( ":sout-all" );
+ mrl.append( " :sout-all" );
+
+ if ( sout.b_sout_keep )
+ mrl.append( " :sout-keep" );
ui.mrlEdit->setText( mrl );
free( sout.psz_acodec ); free( sout.psz_vcodec ); free( sout.psz_scodec );
projects / vlc / blobdiff