Merge lp:~gaschler/kazam/kazam into lp:kazam/unstable

[Andre Gaschler]

This patch adds an additional combobox to modify the h264 encoder quality in the preferences menu.
I needed this feature to record screencasts at high quality and high frame rate, without generating overly large files from lossless compression.

Unmerged revisions

472. By Andre Gaschler on 2015-07-27

combobox for h264 video quality

471. By Andre Gaschler on 2015-07-27

add combobox for video quality in preferences

=== modified file 'data/ui/preferences.ui'
--- data/ui/preferences.ui	2015-04-05 06:12:50 +0000
+++ data/ui/preferences.ui	2015-07-27 13:57:16 +0000
@@ -362,6 +362,33 @@
                     <property name="height">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="label_quality">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">H264 Quality:</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkComboBox" id="combobox_quality">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <signal name="changed" handler="cb_codec_quality_changed" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>

=== modified file 'kazam/backend/config.py'
--- kazam/backend/config.py	2015-04-04 14:25:19 +0000
+++ kazam/backend/config.py	2015-07-27 13:57:16 +0000
@@ -38,6 +38,7 @@
                          "audio2_source":          "0",
                          "audio2_volume":          "0",
                          "codec":                  "0",
+                         "codec_quality":          "1",
                          "counter":                "5",
                          "capture_cursor":         "True",
                          "capture_speakers":       "False",

=== modified file 'kazam/backend/gstreamer.py'
--- kazam/backend/gstreamer.py	2015-04-04 14:25:19 +0000
+++ kazam/backend/gstreamer.py	2015-07-27 13:57:16 +0000
@@ -242,10 +242,13 @@
             self.video_convert_caps = Gst.caps_from_string("video/x-raw, format=(string)I420")
             self.f_video_convert_caps = Gst.ElementFactory.make("capsfilter", "vid_convert_caps")
             self.f_video_convert_caps.set_property("caps", self.video_convert_caps)
-
-            self.video_bitrate = 5800
             self.video_enc = Gst.ElementFactory.make(CODEC_LIST[CODEC_H264][1], "video_encoder")
-            self.video_enc.set_property("bitrate", self.video_bitrate)
+            if prefs.codec_quality == 0:
+                self.video_enc.set_property("quantizer", 35)
+            elif prefs.codec_quality == 0:
+                self.video_enc.set_property("quantizer", 15)
+            else:
+                self.video_enc.set_property("quantizer", 5)
             self.video_enc.set_property("key-int-max", 30)
             self.video_enc.set_property("bframes", 0)
             self.video_enc.set_property("byte-stream", False)
@@ -284,7 +287,12 @@
             elif prefs.codec == CODEC_H264:
                 self.video_enc.set_property("speed-preset", "ultrafast")
                 self.video_enc.set_property("pass", 4)
-                self.video_enc.set_property("quantizer", 15)
+                if prefs.codec_quality == 0:
+                    self.video_enc.set_property("quantizer", 35)
+                elif prefs.codec_quality == 0:
+                    self.video_enc.set_property("quantizer", 15)
+                else:
+                    self.video_enc.set_property("quantizer", 5)
                 #
                 # x264enc supports maximum of four cores
                 #

=== modified file 'kazam/backend/prefs.py'
--- kazam/backend/prefs.py	2015-04-04 14:25:19 +0000
+++ kazam/backend/prefs.py	2015-07-27 13:57:16 +0000
@@ -87,6 +87,7 @@
         # Capture related stuff
         #
         self.codec = None
+        self.codec_quality = 1
         self.pa_q = None
         self.framerate = 15
         self.autosave_video = False
@@ -305,6 +306,8 @@
                 self.logger.debug("Setting RAW as default codec.")
         else:
             self.codec = int(self.config.get("main", "codec"))
+        
+        self.codec_quality = int(self.config.get("main", "codec_quality"))
 
     def save_config(self):
         self.config.set("main", "capture_cursor", self.capture_cursor)
@@ -335,6 +338,7 @@
         self.config.set("main", "countdown_splash", self.countdown_splash)
         self.config.set("main", "counter", self.countdown_timer)
         self.config.set("main", "codec", self.codec)
+        self.config.set("main", "codec_quality", self.codec_quality)
         self.config.set("main", "framerate", self.framerate)
         self.config.set("main", "autosave_video", self.autosave_video)
         self.config.set("main", "autosave_video_dir", self.autosave_video_dir)

=== modified file 'kazam/frontend/preferences.py'
--- kazam/frontend/preferences.py	2015-04-05 06:12:50 +0000
+++ kazam/frontend/preferences.py	2015-07-27 13:57:16 +0000
@@ -61,6 +61,7 @@
                 logger.debug("Unable to get name for '%s'" % w)
 
         codec_renderer = Gtk.CellRendererText()
+        codec_quality_renderer = Gtk.CellRendererText()
 
         audio_renderer = Gtk.CellRendererText()
         audio_renderer.props.ellipsize = Pango.EllipsizeMode.END
@@ -70,6 +71,9 @@
 
         self.combobox_codec.pack_start(codec_renderer, True)
         self.combobox_codec.add_attribute(codec_renderer, "text", 1)
+        
+        self.combobox_quality.pack_start(codec_quality_renderer, True)
+        self.combobox_quality.add_attribute(codec_quality_renderer, "text", 1)
 
         self.combobox_audio.pack_start(audio_renderer, True)
         self.combobox_audio.add_attribute(audio_renderer, "text", 0)
@@ -83,6 +87,13 @@
         self.filechooser_video.set_current_folder(prefs.video_dest)
 
         self.populate_codecs()
+        self.populate_codec_qualities()
+        if prefs.codec == CODEC_H264:
+            self.combobox_quality.set_sensitive(True)
+            self.label_quality.set_sensitive(True)
+        else:
+            self.combobox_quality.set_sensitive(False)
+            self.label_quality.set_sensitive(False)
         if prefs.sound:
             self.populate_audio_sources()
         self.populate_shutter_sounds()
@@ -128,6 +139,16 @@
         self.combobox_codec.set_model(codec_model)
         self.combobox_codec.set_row_separator_func(self.is_separator, None)
 
+    def populate_codec_qualities(self):
+        #old_model = self.quality_codec.get_model()
+        #old_model = None
+        quality_model = Gtk.ListStore(int, str)
+        quality_model.append([0, "low (minimum file size)"])
+        quality_model.append([1, "normal"])
+        quality_model.append([2, "high"])
+        self.combobox_quality.set_model(quality_model)
+        self.combobox_quality.set_row_separator_func(self.is_separator, None)
+	
     def populate_audio_sources(self):
         speaker_source_model = Gtk.ListStore(str, int)
         mic_source_model = Gtk.ListStore(str, int)
@@ -250,6 +271,8 @@
         codec_iter = codec_model.get_iter(cnt)
         self.combobox_codec.set_active_iter(codec_iter)
         prefs.codec = codec_model.get_value(codec_iter, 0)
+        
+        self.combobox_quality.set_active(prefs.codec_quality)
 
     #
     # General callbacks
@@ -345,7 +368,20 @@
         model = widget.get_model()
         c_iter = model.get_iter(i)
         prefs.codec = model.get_value(c_iter, 0)
+        if prefs.codec == CODEC_H264:
+            self.combobox_quality.set_sensitive(True)
+            self.label_quality.set_sensitive(True)
+        else:
+            self.combobox_quality.set_sensitive(False)
+            self.label_quality.set_sensitive(False)
         logger.debug('Codec selected: {0} - {1}'.format(get_codec(prefs.codec)[2], prefs.codec))
+    
+    def cb_codec_quality_changed(self, widget):
+        i = widget.get_active()
+        model = widget.get_model()
+        c_iter = model.get_iter(i)
+        prefs.codec_quality = model.get_value(c_iter, 0)
+        logger.debug('Quality selected: {0}'.format(prefs.codec_quality))
 
     def cb_switch_autosave_video(self, widget, user_data):
         prefs.autosave_video = widget.get_active()