Merge missing tizen patch

Change-Id: I2150392da9b09461d38365b2d6ecf7f8e9dadd16

diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c
index e0429b2..0d765ec 100644 (file)
--- a/libs/gst/base/gstbaseparse.c
+++ b/libs/gst/base/gstbaseparse.c
@@ -878,9 +878,6 @@ gst_base_parse_reset (GstBaseParse * parse)
   g_list_free (parse->priv->detect_buffers);
   parse->priv->detect_buffers = NULL;
   parse->priv->detect_buffers_size = 0;
-#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION
-  parse->priv->accurate_index_seek = TRUE;
-#endif
   GST_OBJECT_UNLOCK (parse);
 }
 

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index 7a56073..21533fd 100644 (file)
--- a/packaging/gstreamer.spec
+++ b/packaging/gstreamer.spec
@@ -69,6 +69,7 @@ export CFLAGS="%{optflags} \
        -DTIZEN_FEATURE_QUEUE2_MODIFICATION\
        -DTIZEN_FEATURE_FILESINK_MODIFICATION\
        -DTIZEN_FEATURE_MQ_MODIFICATION\
+       -DTIZEN_FEATURE_MQ_MODIFICATION_EXTRA_SIZE_TIME\
        -DTIZEN_FEATURE_BASEPARSE_MODIFICATION\
        -DTIZEN_FEATURE_QUEUE_MODIFICATION\
 %if "%{TIZEN_PRODUCT_TV}" == "1"

diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c
index 5446c27..32ec52a 100644 (file)
--- a/plugins/elements/gstmultiqueue.c
+++ b/plugins/elements/gstmultiqueue.c
@@ -269,7 +269,7 @@ enum
  * aditional extra size. */
 #define DEFAULT_EXTRA_SIZE_BYTES 10 * 1024 * 1024       /* 10 MB */
 #define DEFAULT_EXTRA_SIZE_BUFFERS 5
-#ifdef TIZEN_FEATURE_MQ_MODIFICATION
+#ifdef TIZEN_FEATURE_MQ_MODIFICATION_EXTRA_SIZE_TIME
 #define DEFAULT_EXTRA_SIZE_TIME 10 * GST_SECOND
 #else
 #define DEFAULT_EXTRA_SIZE_TIME 3 * GST_SECOND
@@ -3192,7 +3192,7 @@ compute_high_time (GstMultiQueue * mq, guint groupid)
 #define IS_FILLED(q, format, value) (((q)->max_size.format) != 0 && \
      ((q)->max_size.format) <= (value))
 
-#ifdef TIZEN_FEATURE_MQ_MODIFICATION
+#ifdef TIZEN_FEATURE_MQ_MODIFICATION_EXTRA_SIZE_TIME
 #define IS_FILLED_EXTRA(q, format, value) ((((q)->extra_size.format) != 0) && (((q)->max_size.format) != 0) && \
      (((q)->extra_size.format)+((q)->max_size.format)) <= (value))
 #endif
@@ -3330,7 +3330,7 @@ single_queue_check_full (GstDataQueue * dataq, guint visible, guint bytes,
     return TRUE;
 
   /* check time or bytes */
-#ifdef TIZEN_FEATURE_MQ_MODIFICATION
+#ifdef TIZEN_FEATURE_MQ_MODIFICATION_EXTRA_SIZE_TIME
   res = IS_FILLED_EXTRA (sq, time, sq->cur_time) || IS_FILLED (sq, bytes, bytes);
 #else
   res = IS_FILLED (sq, bytes, bytes);