patches/cheese-02-lack-uvc-framerate.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 13435 e04cfe1cd9c9
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13435
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     1
--- ./src/cheese-webcam.c.orig	2008-09-01 11:16:01.916287000 +0800
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     2
+++ ./src/cheese-webcam.c	2008-09-01 11:17:05.996507000 +0800
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     3
@@ -620,8 +620,13 @@
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     4
     }
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     5
   }
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     6
     
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     7
+#ifdef SOLARIS    
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     8
+  *numerator = 15;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
     9
+  *denominator = 2;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    10
+#else  
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    11
   *numerator = framerate_numerator;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    12
   *denominator = framerate_denominator;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    13
+#endif  
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    14
 }
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    15
 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    16
 static gboolean 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    17
@@ -956,7 +961,7 @@
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    18
     return FALSE;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    19
 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    20
   gst_bin_add_many (GST_BIN (priv->video_save_bin), priv->audio_source, audio_queue,
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    21
-                    audio_convert, audio_enc, video_save_csp, video_save_rate, video_save_scale, video_enc, 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    22
+                    audio_convert, audio_enc, video_save_csp, video_save_scale, video_enc, 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    23
                     mux, priv->video_file_sink, NULL);
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    24
 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    25
   /* add ghostpad */
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    26
@@ -968,7 +973,7 @@
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    27
   ok = gst_element_link_many (priv->audio_source, audio_queue, audio_convert, 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    28
                               audio_enc, mux, priv->video_file_sink, NULL);
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    29
 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    30
-  ok &= gst_element_link_many (video_save_csp, video_save_rate, video_save_scale, video_enc,
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    31
+  ok &= gst_element_link_many (video_save_csp, video_save_scale, video_enc,
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    32
                                NULL);
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    33
   ok &= gst_element_link (video_enc, mux);
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    34
 
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    35
--- ./src/cheese-gconf.c.orig	2008-08-19 02:32:53.000000000 +0800
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    36
+++ ./src/cheese-gconf.c	2008-09-01 11:17:05.997071000 +0800
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    37
@@ -103,14 +103,18 @@
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    38
       g_slist_free (tmp);
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    39
       break;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    40
     case GCONF_PROP_X_RESOLUTION:
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    41
+      gdk_threads_enter();
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    42
       g_value_set_int (value, gconf_client_get_int (priv->client,
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    43
                                                     CHEESE_GCONF_PREFIX "/x_resolution",
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    44
                                                     NULL));
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    45
+      gdk_threads_leave();                                              
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    46
       break;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    47
     case GCONF_PROP_Y_RESOLUTION:
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    48
+      gdk_threads_enter();
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    49
       g_value_set_int (value, gconf_client_get_int (priv->client,
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    50
                                                     CHEESE_GCONF_PREFIX "/y_resolution",
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    51
                                                     NULL));
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    52
+      gdk_threads_leave();                                              
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    53
       break;
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    54
     case GCONF_PROP_VIDEO_PATH:
e04cfe1cd9c9 Add new spec-file and patches, manpage, copyright.
elaine
parents:
diff changeset
    55
       g_value_set_string (value, gconf_client_get_string (priv->client,