Commit e8b350df authored by Ilkka Ollakka's avatar Ilkka Ollakka

qt4: add vp80/webm to profiles

VP8/webm profile defaults to 720p, which could be reasonable default imo.
Not sure if people want to it to default to same resolution as input is.
parent c5010ad3
...@@ -269,6 +269,7 @@ inline void VLCProfileEditor::registerCodecs() ...@@ -269,6 +269,7 @@ inline void VLCProfileEditor::registerCodecs()
ADD_VCODEC( "DIVX 3" , "DIV3" ) ADD_VCODEC( "DIVX 3" , "DIV3" )
ADD_VCODEC( "H-263", "H263" ) ADD_VCODEC( "H-263", "H263" )
ADD_VCODEC( "H-264", "h264" ) ADD_VCODEC( "H-264", "h264" )
ADD_VCODEC( "VP8", "VP80" )
ADD_VCODEC( "WMV1", "WMV1" ) ADD_VCODEC( "WMV1", "WMV1" )
ADD_VCODEC( "WMV2" , "WMV2" ) ADD_VCODEC( "WMV2" , "WMV2" )
ADD_VCODEC( "M-JPEG", "MJPG" ) ADD_VCODEC( "M-JPEG", "MJPG" )
...@@ -323,6 +324,7 @@ void VLCProfileEditor::fillProfile( const QString& qs ) ...@@ -323,6 +324,7 @@ void VLCProfileEditor::fillProfile( const QString& qs )
#define CHECKMUX( button, text) if( text == mux ) ui.button->setChecked( true ); else #define CHECKMUX( button, text) if( text == mux ) ui.button->setChecked( true ); else
CHECKMUX( PSMux, "ps" ) CHECKMUX( PSMux, "ps" )
CHECKMUX( TSMux, "ts" ) CHECKMUX( TSMux, "ts" )
CHECKMUX( WEBMux, "webm" )
CHECKMUX( MPEG1Mux, "mpeg1" ) CHECKMUX( MPEG1Mux, "mpeg1" )
CHECKMUX( OggMux, "ogg" ) CHECKMUX( OggMux, "ogg" )
CHECKMUX( ASFMux, "asf" ) CHECKMUX( ASFMux, "asf" )
...@@ -412,6 +414,7 @@ QString VLCProfileEditor::transcodeValue() ...@@ -412,6 +414,7 @@ QString VLCProfileEditor::transcodeValue()
#define SMUX( x, txt ) if( ui.x->isChecked() ) muxValue = txt; else #define SMUX( x, txt ) if( ui.x->isChecked() ) muxValue = txt; else
SMUX( PSMux, "ps" ) SMUX( PSMux, "ps" )
SMUX( TSMux, "ts" ) SMUX( TSMux, "ts" )
SMUX( WEBMux, "webm" )
SMUX( MPEG1Mux, "mpeg1" ) SMUX( MPEG1Mux, "mpeg1" )
SMUX( OggMux, "ogg" ) SMUX( OggMux, "ogg" )
SMUX( ASFMux, "asf" ) SMUX( ASFMux, "asf" )
......
#define NB_PROFILE \ #define NB_PROFILE \
(sizeof(video_profile_value_list)/sizeof(video_profile_value_list[0])) (sizeof(video_profile_value_list)/sizeof(video_profile_value_list[0]))
static const char video_profile_name_list[][32] = { static const char video_profile_name_list[][35] = {
"Video - H.264 + AAC (MP4)", "Video - H.264 + AAC (MP4)",
"Video - 720p VP80 + Vorbis (Webm)",
"Video - H.264 + AAC (TS)", "Video - H.264 + AAC (TS)",
"Video - Dirac + AAC (TS)", "Video - Dirac + AAC (TS)",
"Video - Theora + Vorbis (OGG)", "Video - Theora + Vorbis (OGG)",
...@@ -17,13 +18,14 @@ static const char video_profile_name_list[][32] = { ...@@ -17,13 +18,14 @@ static const char video_profile_name_list[][32] = {
"Audio - CD", "Audio - CD",
}; };
static const char video_profile_value_list[][48] = { static const char video_profile_value_list[][53] = {
/* Container(string), transcode video(bool), transcode audio(bool), */ /* Container(string), transcode video(bool), transcode audio(bool), */
/* use subtitles(bool), video codec(string), video bitrate(integer), */ /* use subtitles(bool), video codec(string), video bitrate(integer), */
/* scale(float), fps(float), width(integer, height(integer), */ /* scale(float), fps(float), width(integer, height(integer), */
/* audio codec(string), audio bitrate(integer), channels(integer), */ /* audio codec(string), audio bitrate(integer), channels(integer), */
/* samplerate(integer), subtitle codec(string), subtitle overlay(bool) */ /* samplerate(integer), subtitle codec(string), subtitle overlay(bool) */
"mp4;1;1;0;h264;0;0;0;0;0;mp4a;128;2;44100;0;0", "mp4;1;1;0;h264;0;0;0;0;0;mp4a;128;2;44100;0;1",
"webm;1;1;0;VP80;2000;0;0;720;0;vorb;128;2;44100;0;1",
"ts;1;1;0;h264;800;1;0;0;0;mp4a;128;2;44100;0;0", "ts;1;1;0;h264;800;1;0;0;0;mp4a;128;2;44100;0;0",
"ts;1;1;0;drac;800;1;0;0;0;mp4a;128;2;44100;0;0", "ts;1;1;0;drac;800;1;0;0;0;mp4a;128;2;44100;0;0",
"ogg;1;1;0;theo;800;1;0;0;0;vorb;128;2;44100;0;0", "ogg;1;1;0;theo;800;1;0;0;0;vorb;128;2;44100;0;0",
......
...@@ -136,7 +136,7 @@ QString FileDestBox::getMRL( const QString& mux ) ...@@ -136,7 +136,7 @@ QString FileDestBox::getMRL( const QString& mux )
void FileDestBox::fileBrowse() void FileDestBox::fileBrowse()
{ {
QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ), QString fileName = QFileDialog::getSaveFileName( this, qtr( "Save file..." ),
"", qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv)" ) ); "", qtr( "Containers (*.ps *.ts *.mpg *.ogg *.asf *.mp4 *.mov *.wav *.raw *.flv *.webm)" ) );
fileEdit->setText( toNativeSeparators( fileName ) ); fileEdit->setText( toNativeSeparators( fileName ) );
emit mrlUpdated(); emit mrlUpdated();
} }
......
...@@ -74,6 +74,13 @@ ...@@ -74,6 +74,13 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QRadioButton" name="WEBMux">
<property name="text">
<string>Webm</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QRadioButton" name="ASFMux"> <widget class="QRadioButton" name="ASFMux">
<property name="text"> <property name="text">
<string>ASF/WMV</string> <string>ASF/WMV</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment