Complete rewrite of the video4linux capture to use MLT, in progress.

[kdenlive] / src / kdenlivesettings.kcfg

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 9800a93f4df1ae6712eb48395f9653420a7b3db6..a365044383791e86811e2f25fc11bddf207aec69 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -92,9 +92,34 @@
       <default>false</default>
     </entry>
     
+    <entry name="generateproxy" type="Bool">
+      <label>Auto generate proxy for new clips.</label>
+      <default>false</default>
+    </entry>
+    
+    <entry name="generateimageproxy" type="Bool">
+      <label>Auto generate proxy for new image clips.</label>
+      <default>false</default>
+    </entry>
+    
+    <entry name="proxyminsize" type="Int">
+      <label>Minimum source size for proxy creation.</label>
+      <default>1000</default>
+    </entry>
+    
+    <entry name="proxyimageminsize" type="Int">
+      <label>Minimum source size for proxy creation.</label>
+      <default>2000</default>
+    </entry>
+    
+    <entry name="proxyextension" type="String">
+      <label>File extension for proxy clips.</label>
+      <default>ts</default>
+    </entry>
+    
     <entry name="proxyparams" type="String">
       <label>Proxy clips transcoding parameters.</label>
-      <default>-f avi -acodec libmp3lame -ac 2 -ab 92k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -b 150k</default>
+      <default>-f mpegts -acodec libmp3lame -ac 2 -ab 92k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -b 150k</default>
     </entry>
 
   </group>
@@ -191,7 +216,7 @@
       <label>Use Blackmagic device for video out.</label>
       <default>false</default>
     </entry>
-    <entry name="blackmagic_output_device" type="UInt">
+    <entry name="blackmagic_output_device" type="Int">
       <label>Blackmagic video output device.</label>
       <default>0</default>
     </entry>
@@ -213,6 +238,16 @@
       <default></default>
     </entry>
 
+    <entry name="mltthreads" type="Int">
+      <label>Mlt processing thread count.</label>
+      <default>1</default>
+    </entry>
+
+    <entry name="encodethreads" type="Int">
+      <label>FFmpeg encoding thread count.</label>
+      <default>1</default>
+    </entry>
+
     <entry name="currenttmpfolder" type="Path">
       <label>Default folder for tmp files.</label>
       <default>/tmp/</default>
@@ -277,64 +312,39 @@
       <default>0</default>
     </entry>
 
-    <entry name="video4vformat" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>video4linux2</default>
-    </entry>
-
     <entry name="video4vdevice" type="String">
       <label>Default video4linux capture format.</label>
       <default>/dev/video0</default>
     </entry>
 
-    <entry name="video4vcodec" type="String">
-      <label>Default video4linux video codec.</label>
-      <default>mjpeg</default>
+    <entry name="v4l_alsadevice" type="UInt">
+      <label>Audio device for v4l capture.</label>
+      <default></default>
     </entry>
 
-    <entry name="video4acodec" type="String">
-      <label>Default video4linux audio codec.</label>
-      <default>mp2</default>
+    <entry name="v4l_alsadevicename" type="String">
+      <label>Audio device for v4l capture.</label>
+      <default>hw:0,0</default>
     </entry>
 
-    <entry name="video4container" type="String">
+    <entry name="v4l_parameters" type="String">
       <label>Default video4linux format.</label>
-      <default>avi</default>
+      <default>f=mpeg acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 b=4000k bf=2 b_strategy=1 trellis=1</default>
     </entry>
 
-    <entry name="video4extension" type="String">
+    <entry name="v4l_extension" type="String">
       <label>Default video4linux file extension.</label>
-      <default>avi</default>
-    </entry>
-
-    <entry name="video4aformat" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>oss</default>
-    </entry>
-
-    <entry name="video4adevice" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>/dev/dsp</default>
+      <default>mpeg</default>
     </entry>
 
-    <entry name="video4size" type="String">
-      <label>Default video4linux capture format.</label>
-      <default>320x240</default>
-    </entry>
-
-    <entry name="video4rate" type="Int">
-      <label>Default video4linux capture format.</label>
-      <default>15</default>
-    </entry>
-
-    <entry name="video4capture" type="String">
-      <label>ffmpeg arguments for video capture.</label>
-      <default></default>
+    <entry name="v4l_format" type="UInt">
+      <label>Selected capture format.</label>
+      <default>0</default>
     </entry>
 
-    <entry name="video4encoding" type="String">
-      <label>ffmpeg encoding arguments.</label>
-      <default>-qscale 1 -ab 224k</default>
+    <entry name="v4l_captureaudio" type="Bool">
+      <label>Should we also capture audio.</label>
+      <default>false</default>
     </entry>
 
     <entry name="rmd_capture_audio" type="Bool">