From: Michał Budzyński <m.budzynski@samsung.com>
Date: Thu, 16 Nov 2017 11:38:39 +0000 (+0100)
Subject: Add separate def for extra size time
X-Git-Tag: submit/tizen/20171117.072805^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F159546%2F2;p=platform%2Fupstream%2Fgstreamer.git

Add separate def for extra size time

Change introduced in https://review.tizen.org/gerrit/gitweb?p=platform/upstream/gstreamer.git;a=commit;h=0f6f5b6bb99c366708bd05e33bc13fe40b25d955
makes buffering of video noticeably longer on our developed device. Proposed solution will make us able to turn this modification off
for profile specific to our device without forking gstreamer.

Change-Id: Ia03cab1e090d5fdbd15e2af53a29a3fd57b6cfcc
Signed-off-by: Krystian Kisielak <k.kisielak@samsung.com>
---

diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec
index 8329a00956..e1e5dd7606 100644
--- 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 8eb013886b..904458ace3 100644
--- a/plugins/elements/gstmultiqueue.c
+++ b/plugins/elements/gstmultiqueue.c
@@ -268,7 +268,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
@@ -2658,7 +2658,7 @@ compute_high_time (GstMultiQueue * mq)
 #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
@@ -2795,7 +2795,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, time, sq->cur_time) || IS_FILLED (sq, bytes, bytes);