From: David Testé <soonum@gnu.org>
Date: Thu, 17 Mar 2016 20:05:34 +0000 (+0100)
Subject: Merge branch 'stream_2016_dev'
X-Git-Url: https://vcs.fsf.org/?p=libre-streamer.git;a=commitdiff_plain;h=abe4938f9101d4a0b6a72d8887bd6811eadbf988;hp=-c

Merge branch 'stream_2016_dev'
---

abe4938f9101d4a0b6a72d8887bd6811eadbf988
diff --combined abyss.py
index 80df22f,e592403..e592403
--- a/abyss.py
+++ b/abyss.py
@@@ -99,7 -99,7 +99,7 @@@ class Streamgui(object)
          self.win.set_title("ABYSS")
          self.win.connect("delete_event",
                           lambda w,e: Gtk.main_quit())
-         self.win.fullscreen()
+ ##        self.win.fullscreen()
          vbox = Gtk.VBox(False, 0)
          vbox_labels = Gtk.VBox(False, 0)
          vbox_entries = Gtk.VBox(False, 0)
diff --combined gstconf.py
index 115c2d0,2212fb2..2212fb2
--- a/gstconf.py
+++ b/gstconf.py
@@@ -181,7 -181,8 +181,8 @@@ class New_user_pipeline()
          self.vp8enc.set_property('min_quantizer', 1)
          self.vp8enc.set_property('max_quantizer', 13)
          self.vp8enc.set_property('cpu-used', 5)
-         self.vp8enc.set_property('deadline', 42000)
+         self.vp8enc.set_property('deadline', 1)
+ ##        self.vp8enc.set_property('target-bitrate', 2000000)
          self.vp8enc.set_property('threads', 2)
          self.vp8enc.set_property('sharpness', 7)
  
@@@ -200,7 -201,8 +201,8 @@@
  
      def create_filtering_elements(self):
          self.scaling = Gst.ElementFactory.make('videoscale', 'scaling')
-         caps = Gst.caps_from_string('video/x-raw, width=(int)640, height=(int)360')
+         caps = Gst.caps_from_string(
+             'video/x-raw, width=(int)640, height=(int)360, framerate=(float)25/1')
          self.capsfilter = Gst.ElementFactory.make('capsfilter', 'capsfilter')
          self.capsfilter.set_property('caps', caps)
  
@@@ -414,7 -416,6 +416,6 @@@
                                   self.queuev_2,
                                   self.queuev_3,
                                   output_element_3=self.vp8enc)
- ##            self.capsfilter_backup.link(self.queuev_3)
                  print('BACKUP OK...', end='')
          if not cond:
              print('TEST OK...', end='')