[vlc-commits] commit: qt4: add vp80/webm to profiles (Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sat Jun  5 14:18:44 2010 +0300| [2f03a064a9fae87283305c1363238455e18de716] | committer: 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.
(cherry picked from commit e8b350df4f1985fab19f797f0fb926c21bff18b8)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=2f03a064a9fae87283305c1363238455e18de716
---

 .../gui/qt4/components/sout/profile_selector.cpp   |    3 +++
 modules/gui/qt4/components/sout/profiles.hpp       |    8 +++++---
 modules/gui/qt4/components/sout/sout_widgets.cpp   |    2 +-
 modules/gui/qt4/ui/profiles.ui                     |    7 +++++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/sout/profile_selector.cpp b/modules/gui/qt4/components/sout/profile_selector.cpp
index ef8d1d3..e279c6b 100644
--- a/modules/gui/qt4/components/sout/profile_selector.cpp
+++ b/modules/gui/qt4/components/sout/profile_selector.cpp
@@ -269,6 +269,7 @@ inline void VLCProfileEditor::registerCodecs()
     ADD_VCODEC( "DIVX 3" , "DIV3" )
     ADD_VCODEC( "H-263", "H263" )
     ADD_VCODEC( "H-264", "h264" )
+    ADD_VCODEC( "VP8", "VP80" )
     ADD_VCODEC( "WMV1", "WMV1" )
     ADD_VCODEC( "WMV2" , "WMV2" )
     ADD_VCODEC( "M-JPEG", "MJPG" )
@@ -323,6 +324,7 @@ void VLCProfileEditor::fillProfile( const QString& qs )
 #define CHECKMUX( button, text) if( text == mux ) ui.button->setChecked( true ); else
     CHECKMUX( PSMux, "ps" )
     CHECKMUX( TSMux, "ts" )
+    CHECKMUX( WEBMux, "webm" )
     CHECKMUX( MPEG1Mux, "mpeg1" )
     CHECKMUX( OggMux, "ogg" )
     CHECKMUX( ASFMux, "asf" )
@@ -412,6 +414,7 @@ QString VLCProfileEditor::transcodeValue()
 #define SMUX( x, txt ) if( ui.x->isChecked() ) muxValue =  txt; else
     SMUX( PSMux, "ps" )
     SMUX( TSMux, "ts" )
+    SMUX( WEBMux, "webm" )
     SMUX( MPEG1Mux, "mpeg1" )
     SMUX( OggMux, "ogg" )
     SMUX( ASFMux, "asf" )
diff --git a/modules/gui/qt4/components/sout/profiles.hpp b/modules/gui/qt4/components/sout/profiles.hpp
index 9c4386d..9302900 100644
--- a/modules/gui/qt4/components/sout/profiles.hpp
+++ b/modules/gui/qt4/components/sout/profiles.hpp
@@ -1,8 +1,9 @@
 #define NB_PROFILE \
     (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 - 720p VP80 + Vorbis (Webm)",
     "Video - H.264 + AAC (TS)",
     "Video - Dirac + AAC (TS)",
     "Video - Theora + Vorbis (OGG)",
@@ -17,13 +18,14 @@ static const char video_profile_name_list[][32] = {
     "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), */
     /* use subtitles(bool), video codec(string), video bitrate(integer), */
     /* scale(float), fps(float), width(integer, height(integer), */
     /* audio codec(string), audio bitrate(integer), channels(integer), */
     /* 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;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",
diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 497ea6e..e28ae3e 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -136,7 +136,7 @@ QString FileDestBox::getMRL( const QString& mux )
 void FileDestBox::fileBrowse()
 {
     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 ) );
     emit mrlUpdated();
 }
diff --git a/modules/gui/qt4/ui/profiles.ui b/modules/gui/qt4/ui/profiles.ui
index 72ea182..c386e8e 100644
--- a/modules/gui/qt4/ui/profiles.ui
+++ b/modules/gui/qt4/ui/profiles.ui
@@ -74,6 +74,13 @@
         </widget>
        </item>
        <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">
          <property name="text">
           <string>ASF/WMV</string>