upload tizen1.0 source

diff --git a/debian/changelog b/debian/changelog
index b61ffae..1c81891 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+gstreamer0.10 (0.10.34-10slp2+15) unstable; urgency=low
+
+  * Fix spec file
+  * Git: pkgs/g/gstreamer0.10
+  * Tag: gstreamer0.10_0.10.34-10slp2+15
+
+ -- YeJin Cho <cho.yejin@samsung.com>  Fri, 06 Apr 2012 14:30:51 +0900
+
+gstreamer0.10 (0.10.34-10slp2+14) unstable; urgency=low
+
+  * Update queue2 for streaming
+  * Git: pkgs/g/gstreamer0.10
+  * Tag: gstreamer0.10_0.10.34-10slp2+14
+
+ -- YeJin Cho <cho.yejin@samsung.com>  Tue, 03 Apr 2012 12:08:51 +0900
+
 gstreamer0.10 (0.10.34-10slp2+13) unstable; urgency=low
 
   * Initial Release

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index 3412fd3..977659e 100644 (file)
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -55,29 +55,7 @@ with different major/minor versions of GStreamer.
 %build
 
 
-export CFLAGS+=" -Wall -g -fPIC                                
-               -DGST_EXT_COMPANSATE_EOS_HANDLING       \
-               -DGST_EXT_USE_TINY_REGISTRY             \
-               -DGST_EXT_TIME_ANALYSIS                 \
-               -DGST_EXT_TA_UNIT_MEXT                  \
-               -DGST_EXT_PAD_LINK_UNCHECKED            \
-               -DGST_EXT_REDUCE_PLUGIN_NUM             \
-               -DGST_EXT_USE_PDP_NETWORK               \
-               -DGST_EXT_VOLUME_WITHOUT_LIBOIL         \
-               -DGST_EXT_AUDIOSINK_MUTE                \
-               -DEXT_AUDIO_FILTER_EFFECT               \
-               -DGST_EXT_NONBLOCKDQUE                  \
-               -DGST_EXT_RENEGOTIATION                 \
-               -DGST_EXT_MOBILECAMERA                  \
-               -DGST_EXT_ASYNC_DEV                     \
-               -DGST_EXT_AV_RECORDING                  \
-               -DGST_EXT_SWITCH_CAMERA                 \
-               -DGST_EXT_OVERLAYSINK_SQVGA             \
-               -DGST_EXT_FFMUX_ADD_PROPERTY            \
-               -DGST_EXT_FFMUX_ENHANCEMENT             \
-               -DGST_EXT_I_LIKE_DSP                    \
-               -DGST_EXT_CAMCORDER_IPP                 \
-               -DGST_EXT_QUEUE_ENHANCEMENT"
+export CFLAGS+=" -Wall -g -fPIC        -DGST_EXT_COMPANSATE_EOS_HANDLING -DGST_EXT_USE_TINY_REGISTRY -DGST_EXT_TIME_ANALYSIS -DGST_EXT_TA_UNIT_MEXT -DGST_EXT_PAD_LINK_UNCHECKED -DGST_EXT_REDUCE_PLUGIN_NUM -DGST_EXT_USE_PDP_NETWORK -DGST_EXT_VOLUME_WITHOUT_LIBOIL -DGST_EXT_AUDIOSINK_MUTE -DEXT_AUDIO_FILTER_EFFECT -DGST_EXT_NONBLOCKDQUE -DGST_EXT_RENEGOTIATION -DGST_EXT_MOBILECAMERA -DGST_EXT_ASYNC_DEV -DGST_EXT_AV_RECORDING -DGST_EXT_SWITCH_CAMERA -DGST_EXT_OVERLAYSINK_SQVGA -DGST_EXT_FFMUX_ADD_PROPERTY -DGST_EXT_FFMUX_ENHANCEMENT -DGST_EXT_I_LIKE_DSP -DGST_EXT_CAMCORDER_IPP -DGST_EXT_QUEUE_ENHANCEMENT"
 
 %configure --prefix=/usr               \
                --disable-valgrind                      \
@@ -96,8 +74,8 @@ export CFLAGS+=" -Wall -g -fPIC
                --disable-registry-update       \
                --disable-loadsave              \
                --with-html-dir=/tmp/dump       \
-               CFLAGS="$(CFLAGS)"      \
-               LDFLAGS="$(LDFLAGS)"
+               CFLAGS="$CFLAGS"        \
+               LDFLAGS="$LDFLAGS"
 
 make %{?jobs:-j%jobs}
 

diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c
index c18f014..4087968 100755 (executable)
--- a/plugins/elements/gstqueue2.c
+++ b/plugins/elements/gstqueue2.c
@@ -109,8 +109,13 @@ enum
 #define DEFAULT_MAX_SIZE_TIME      2 * GST_SECOND       /* 2 seconds */
 #define DEFAULT_USE_BUFFERING      FALSE
 #define DEFAULT_USE_RATE_ESTIMATE  TRUE
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+#define DEFAULT_LOW_PERCENT        10.0
+#define DEFAULT_HIGH_PERCENT       99.0
+#else
 #define DEFAULT_LOW_PERCENT        10
 #define DEFAULT_HIGH_PERCENT       99
+#endif
 #define DEFAULT_TEMP_REMOVE        TRUE
 #ifdef GST_EXT_QUEUE_ENHANCEMENT
 #define DEFAULT_TEMP_UNLINK TRUE
@@ -330,6 +335,18 @@ gst_queue2_class_init (GstQueue2Class * klass)
           "Estimate the bitrate of the stream to calculate time level",
           DEFAULT_USE_RATE_ESTIMATE,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+  g_object_class_install_property (gobject_class, PROP_LOW_PERCENT,
+      g_param_spec_double ("low-percent", "Low percent",
+          "Low threshold for buffering to start. Only used if use-buffering is True",
+          0.0, 100.0, DEFAULT_LOW_PERCENT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_HIGH_PERCENT,
+      g_param_spec_double ("high-percent", "High percent",
+          "High threshold for buffering to finish. Only used if use-buffering is True",
+          0.0, 100.0, DEFAULT_HIGH_PERCENT,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+#else
   g_object_class_install_property (gobject_class, PROP_LOW_PERCENT,
       g_param_spec_int ("low-percent", "Low percent",
           "Low threshold for buffering to start. Only used if use-buffering is True",
@@ -340,7 +357,7 @@ gst_queue2_class_init (GstQueue2Class * klass)
           "High threshold for buffering to finish. Only used if use-buffering is True",
           0, 100, DEFAULT_HIGH_PERCENT,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
+#endif
   g_object_class_install_property (gobject_class, PROP_TEMP_TEMPLATE,
       g_param_spec_string ("temp-template", "Temporary File Template",
           "File template to store temporary files in, should contain directory "
@@ -778,6 +795,10 @@ apply_segment (GstQueue2 * queue, GstEvent * event, GstSegment * segment,
 
   /* segment can update the time level of the queue */
   update_time_level (queue);
+
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+  GST_QUEUE2_SIGNAL_ADD(queue);
+#endif
 }
 
 /* take a buffer and update segment, updating the time level of the queue. */
@@ -816,7 +837,11 @@ apply_buffer (GstQueue2 * queue, GstBuffer * buffer, GstSegment * segment,
 static void
 update_buffering (GstQueue2 * queue)
 {
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
   gint64 percent;
+#else
+  gdouble percent;
+#endif
   gboolean post = FALSE;
 
   if (queue->high_percent <= 0)
@@ -1049,8 +1074,16 @@ perform_seek_to_offset (GstQueue2 * queue, guint64 offset)
   res = gst_pad_push_event (queue->sinkpad, event);
   GST_QUEUE2_MUTEX_LOCK (queue);
 
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+  if (res) {
+    if (queue->upstream_size > 0 && offset >= queue->upstream_size)
+      queue->current = add_range (queue, offset);
+  }
+#else
   if (res)
     queue->current = add_range (queue, offset);
+#endif
+
 
   return res;
 }
@@ -2186,10 +2219,6 @@ gst_queue2_chain (GstPad * pad, GstBuffer * buffer)
       GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer)),
       GST_TIME_ARGS (GST_BUFFER_DURATION (buffer)));
 
-  GST_LOG_OBJECT (queue,
-      "received buffer %p of size %d"
-      GST_TIME_FORMAT, buffer, GST_BUFFER_SIZE (buffer));
-
   /* we have to lock the queue since we span threads */
   GST_QUEUE2_MUTEX_LOCK_CHECK (queue, queue->sinkresult, out_flushing);
   /* when we received EOS, we refuse more data */
@@ -2206,10 +2235,6 @@ gst_queue2_chain (GstPad * pad, GstBuffer * buffer)
   gst_queue2_locked_enqueue (queue, buffer, TRUE);
   GST_QUEUE2_MUTEX_UNLOCK (queue);
 
-  GST_LOG_OBJECT (queue,
-      "write buffer %p of size %d"
-      GST_TIME_FORMAT, buffer, GST_BUFFER_SIZE (buffer));
-
   return GST_FLOW_OK;
 
   /* special conditions */
@@ -3052,20 +3077,21 @@ gst_queue2_set_property (GObject * object,
     case PROP_USE_RATE_ESTIMATE:
       queue->use_rate_estimate = g_value_get_boolean (value);
       break;
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+    case PROP_LOW_PERCENT:
+      queue->low_percent = g_value_get_double (value);
+      break;
+    case PROP_HIGH_PERCENT:
+      queue->high_percent = g_value_get_double (value);
+      break;
+#else
     case PROP_LOW_PERCENT:
       queue->low_percent = g_value_get_int (value);
-#ifdef GST_EXT_QUEUE_ENHANCEMENT
-      if (queue->use_buffering)
-        update_buffering (queue);
-#endif
       break;
     case PROP_HIGH_PERCENT:
       queue->high_percent = g_value_get_int (value);
-#ifdef GST_EXT_QUEUE_ENHANCEMENT
-      if (queue->use_buffering)
-        update_buffering (queue);
-#endif
       break;
+#endif
     case PROP_TEMP_TEMPLATE:
       gst_queue2_set_temp_template (queue, g_value_get_string (value));
       break;
@@ -3128,12 +3154,21 @@ gst_queue2_get_property (GObject * object,
     case PROP_USE_RATE_ESTIMATE:
       g_value_set_boolean (value, queue->use_rate_estimate);
       break;
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+    case PROP_LOW_PERCENT:
+      g_value_set_double (value, queue->low_percent);
+      break;
+    case PROP_HIGH_PERCENT:
+      g_value_set_double (value, queue->high_percent);
+      break;
+#else
     case PROP_LOW_PERCENT:
       g_value_set_int (value, queue->low_percent);
       break;
     case PROP_HIGH_PERCENT:
       g_value_set_int (value, queue->high_percent);
       break;
+#endif
     case PROP_TEMP_TEMPLATE:
       g_value_set_string (value, queue->temp_template);
       break;

diff --git a/plugins/elements/gstqueue2.h b/plugins/elements/gstqueue2.h
index 02d99d6..a2a75a9 100755 (executable)
--- a/plugins/elements/gstqueue2.h
+++ b/plugins/elements/gstqueue2.h
@@ -102,8 +102,13 @@ struct _GstQueue2
   gboolean use_buffering;
   gboolean use_rate_estimate;
   GstClockTime buffering_interval;
+#ifdef GST_EXT_QUEUE_ENHANCEMENT
+  gdouble low_percent;             /* low/high watermarks for buffering */
+  gdouble high_percent;
+#else
   gint low_percent;             /* low/high watermarks for buffering */
   gint high_percent;
+#endif
 
   /* current buffering state */
   gboolean is_buffering;