From eebac00465057a80c0df6f0fb8365ff1bfd655e0 Mon Sep 17 00:00:00 2001 From: Eunhae Choi Date: Tue, 6 Sep 2016 19:11:56 +0900 Subject: [PATCH] apply tizen build option rule Change-Id: I5982cf1d738ef37a0e92707febc74f7b94e95fbb --- gst/gstbin.c | 2 +- gst/gstelement.c | 2 +- gst/gstobject.c | 14 +++++----- gst/gstobject.h | 4 +-- gst/gstquark.c | 4 +-- gst/gstquark.h | 4 +-- gst/gstquery.c | 6 ++--- gst/gstquery.h | 4 +-- gst/gsttaglist.c | 2 +- gst/gsttaglist.h | 2 +- gst/gstutils.c | 4 +-- gst/gstutils.h | 8 +++--- libs/gst/base/gstbaseparse.c | 30 +++++++++++----------- libs/gst/base/gstbaseparse.h | 2 +- libs/gst/base/gstbasesrc.c | 10 ++++---- libs/gst/base/gstbasesrc.h | 4 +-- packaging/gstreamer.spec | 15 +++++------ plugins/elements/gstfilesink.c | 8 +++--- plugins/elements/gstmultiqueue.c | 10 ++++---- plugins/elements/gstqueue.c | 24 +++++++++--------- plugins/elements/gstqueue.h | 4 +-- plugins/elements/gstqueue2.c | 48 +++++++++++++++++------------------ plugins/elements/gstqueue2.h | 2 +- plugins/elements/gsttypefindelement.c | 2 +- 24 files changed, 107 insertions(+), 108 deletions(-) diff --git a/gst/gstbin.c b/gst/gstbin.c index 9c9b689..b2c98fc 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -1297,7 +1297,7 @@ gst_bin_add (GstBin * bin, GstElement * element) if (G_UNLIKELY (bclass->add_element == NULL)) goto no_function; -#ifndef GST_TIZEN_TV +#ifndef TIZEN_PROFILE_TV GST_CAT_DEBUG (GST_CAT_PARENTAGE, "adding element %s to bin %s", GST_STR_NULL (GST_ELEMENT_NAME (element)), GST_STR_NULL (GST_ELEMENT_NAME (bin))); diff --git a/gst/gstelement.c b/gst/gstelement.c index d731cfc..073cfe5 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -639,7 +639,7 @@ gst_element_add_pad (GstElement * element, GstPad * pad) g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE); -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV g_object_set (G_OBJECT (pad), "family-id", (int) (GST_OBJECT_CAST (element)->family_id), NULL); #endif diff --git a/gst/gstobject.c b/gst/gstobject.c index a1ea06c..0763b96 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -120,7 +120,7 @@ enum PROP_0, PROP_NAME, PROP_PARENT, -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV PROP_FAMILY_ID, #endif PROP_LAST @@ -185,7 +185,7 @@ gst_object_class_init (GstObjectClass * klass) properties[PROP_PARENT] = g_param_spec_object ("parent", "Parent", "The parent of the object", GST_TYPE_OBJECT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV properties[PROP_FAMILY_ID] = g_param_spec_int ("family-id", "Family Id", "The family id of this object group, usually inherit from parent.", @@ -233,7 +233,7 @@ gst_object_init (GstObject * object) #endif object->flags = 0; -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV object->family_id = 0; #endif object->control_rate = 100 * GST_MSECOND; @@ -935,7 +935,7 @@ gst_object_set_property (GObject * object, guint prop_id, case PROP_PARENT: gst_object_set_parent (gstobject, g_value_get_object (value)); break; -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV case PROP_FAMILY_ID: g_atomic_int_set (&gstobject->family_id, g_value_get_int (value)); break; @@ -961,7 +961,7 @@ gst_object_get_property (GObject * object, guint prop_id, case PROP_PARENT: g_value_take_object (value, gst_object_get_parent (gstobject)); break; -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV case PROP_FAMILY_ID: g_value_set_int (value, g_atomic_int_get (&gstobject->family_id)); break; @@ -1311,7 +1311,7 @@ gst_object_get_control_binding (GstObject * object, const gchar * property_name) * @binding: the binding * * Removes the corresponding #GstControlBinding. If it was the - * last ref of the binding, it will be disposed. + * last ref of the binding, it will be disposed. * * Returns: %TRUE if the binding could be removed. */ @@ -1385,7 +1385,7 @@ gst_object_get_value (GstObject * object, const gchar * property_name, * This function is useful if one wants to e.g. draw a graph of the control * curve or apply a control curve sample by sample. * - * The values are unboxed and ready to be used. The similar function + * The values are unboxed and ready to be used. The similar function * gst_object_get_g_value_array() returns the array as #GValues and is * better suites for bindings. * diff --git a/gst/gstobject.h b/gst/gstobject.h index 0b91ae5..9d77149 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -169,8 +169,8 @@ struct _GstObject { gchar *name; /* object name */ GstObject *parent; /* this object's parent, weak ref */ guint32 flags; -#ifdef GST_TIZEN_TV - gint family_id; /* inherit the parent's id */ +#ifdef TIZEN_PROFILE_TV + gint family_id; /* inherit the parent's id */ #endif /*< private >*/ diff --git a/gst/gstquark.c b/gst/gstquark.c index 73a4af1..60d5bd8 100644 --- a/gst/gstquark.c +++ b/gst/gstquark.c @@ -1,7 +1,7 @@ /* GStreamer * Copyright (C) 2006 Jan Schmidt * - * gstquark.c: Registered quarks for the _priv_gst_quark_table, private to + * gstquark.c: Registered quarks for the _priv_gst_quark_table, private to * GStreamer * * This library is free software; you can redistribute it and/or @@ -71,7 +71,7 @@ static const gchar *_quark_strings[] = { "GstMessageStreamStart", "group-id", "uri-redirection", "GstMessageDeviceAdded", "GstMessageDeviceRemoved", "device", "uri-redirection-permanent" -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV ,"GstQuarkQueryResource" #endif }; diff --git a/gst/gstquark.h b/gst/gstquark.h index ba44fd0..75f6fa3 100644 --- a/gst/gstquark.h +++ b/gst/gstquark.h @@ -1,7 +1,7 @@ /* GStreamer * Copyright (C) 2006 Jan Schmidt * - * gstquark.h: Private header for storing quark info + * gstquark.h: Private header for storing quark info * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -202,7 +202,7 @@ typedef enum _GstQuarkId GST_QUARK_MESSAGE_DEVICE_REMOVED = 171, GST_QUARK_DEVICE = 172, GST_QUARK_URI_REDIRECTION_PERMANENT = 173, -#ifndef GST_TIZEN_TV +#ifndef TIZEN_PROFILE_TV GST_QUARK_MAX = 174 #else GST_QUARK_QUERY_RESOURCE = 174, diff --git a/gst/gstquery.c b/gst/gstquery.c index 53143ba..a0b2388 100644 --- a/gst/gstquery.c +++ b/gst/gstquery.c @@ -61,7 +61,7 @@ #include "gstquark.h" #include "gsturi.h" #include "gstbufferpool.h" -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV #include #endif @@ -107,7 +107,7 @@ static GstQueryQuarks query_quarks[] = { {GST_QUERY_CAPS, "caps", 0}, {GST_QUERY_DRAIN, "drain", 0}, {GST_QUERY_CONTEXT, "context", 0}, -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV {GST_QUERY_RESOURCE, "resource", 0}, #endif {0, NULL, 0} @@ -583,7 +583,7 @@ gst_query_new_segment (GstFormat format) return query; } -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV /** * gst_query_new_resource: * @resources: pointer to store the resources diff --git a/gst/gstquery.h b/gst/gstquery.h index 3902f71..f3b61ee 100644 --- a/gst/gstquery.h +++ b/gst/gstquery.h @@ -129,7 +129,7 @@ typedef enum { GST_QUERY_CAPS = GST_QUERY_MAKE_TYPE (170, FLAG(BOTH)), GST_QUERY_DRAIN = GST_QUERY_MAKE_TYPE (180, FLAG(DOWNSTREAM) | FLAG(SERIALIZED)), GST_QUERY_CONTEXT = GST_QUERY_MAKE_TYPE (190, FLAG(BOTH)) -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV ,GST_QUERY_RESOURCE = GST_QUERY_MAKE_TYPE (200, FLAG (BOTH)) #endif } GstQueryType; @@ -319,7 +319,7 @@ GstQuery* gst_query_new_duration (GstFormat format) G_GNUC_MALLOC void gst_query_set_duration (GstQuery *query, GstFormat format, gint64 duration); void gst_query_parse_duration (GstQuery *query, GstFormat *format, gint64 *duration); -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV /* resrource query */ GstQuery* gst_query_new_resource (gchar * resources) G_GNUC_MALLOC; void gst_query_add_resource (GstQuery * query, gint resource_id); diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c index 75ca5ee..42e9219 100644 --- a/gst/gsttaglist.c +++ b/gst/gsttaglist.c @@ -277,7 +277,7 @@ _priv_gst_tag_initialize (void) _("freeform name of the language this stream is in"), NULL); gst_tag_register_static (GST_TAG_IMAGE, GST_TAG_FLAG_META, GST_TYPE_SAMPLE, _("image"), _("image related to this stream"), gst_tag_merge_use_first); -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV gst_tag_register_static (GST_TAG_AUDIO_DUALMONO, GST_TAG_FLAG_DECODED, G_TYPE_UINT, _("dualmono audio"), _("dual/mono related to this audio stream"), NULL); #endif diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h index e167fe5..1fe8b6b 100644 --- a/gst/gsttaglist.h +++ b/gst/gsttaglist.h @@ -722,7 +722,7 @@ gst_tag_list_copy (const GstTagList * taglist) * container format the data is stored in (string) */ #define GST_TAG_CONTAINER_FORMAT "container-format" -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV /** * GST_TAG_AUDIO_DUALMONO: * diff --git a/gst/gstutils.c b/gst/gstutils.c index e8695a7..59e65e2 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -40,7 +40,7 @@ #include "gst-i18n-lib.h" #include "glib-compat-private.h" #include -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV #include "gstchildproxy.h" #endif @@ -3955,7 +3955,7 @@ gst_util_group_id_next (void) return g_atomic_int_add (&counter, 1); } -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV /** * gst_element_query_resource * @element: (in) a #GstElement to invoke the resource query on. diff --git a/gst/gstutils.h b/gst/gstutils.h index 1af6e68..808c173 100644 --- a/gst/gstutils.h +++ b/gst/gstutils.h @@ -948,8 +948,8 @@ gboolean gst_element_query_position (GstElement *element, Gs gboolean gst_element_query_duration (GstElement *element, GstFormat format, gint64 *duration); gboolean gst_element_query_convert (GstElement *element, GstFormat src_format, gint64 src_val, GstFormat dest_format, gint64 *dest_val); -#ifdef GST_TIZEN_TV -gboolean gst_element_query_resource (GstElement *element, GList **resource_list); +#ifdef TIZEN_PROFILE_TV +gboolean gst_element_query_resource (GstElement *element, GList **resource_list); #endif @@ -1034,8 +1034,8 @@ gboolean gst_util_fraction_add (gint a_n, gint a_d, gint b_n, g gint *res_n, gint *res_d); gint gst_util_fraction_compare (gint a_n, gint a_d, gint b_n, gint b_d); -#ifdef GST_TIZEN_TV -void gst_set_family_id_to_child (GstElement* child, int id); +#ifdef TIZEN_PROFILE_TV +void gst_set_family_id_to_child (GstElement* child, int id); #endif G_END_DECLS diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c index 2dfcbbe..6ddebfd 100644 --- a/libs/gst/base/gstbaseparse.c +++ b/libs/gst/base/gstbaseparse.c @@ -366,7 +366,7 @@ struct _GstBaseParsePrivate GstTagList *parser_tags; GstTagMergeMode parser_tags_merge_mode; gboolean tags_changed; -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION /* to get pad mode early */ GstPadMode expected_pad_mode; /* check first frame in base parser */ @@ -651,7 +651,7 @@ gst_base_parse_init (GstBaseParse * parse, GstBaseParseClass * bclass) parse->priv->pad_mode = GST_PAD_MODE_NONE; -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION parse->priv->expected_pad_mode = GST_PAD_MODE_NONE; #endif @@ -869,7 +869,7 @@ gst_base_parse_reset (GstBaseParse * parse) parse->priv->skip = 0; -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION parse->priv->first_frame = TRUE; parse->priv->remove_from_total = 0; parse->priv->accurate_index_seek = TRUE; @@ -908,7 +908,7 @@ 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 GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION parse->priv->accurate_index_seek = TRUE; #endif GST_OBJECT_UNLOCK (parse); @@ -1613,7 +1613,7 @@ gst_base_parse_convert_default (GstBaseParse * parse, if (!parse->priv->framecount) goto no_framecount; -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION duration = parse->priv->acc_duration / GST_USECOND; #else duration = parse->priv->acc_duration / GST_MSECOND; @@ -1627,11 +1627,11 @@ gst_base_parse_convert_default (GstBaseParse * parse, if (dest_format == GST_FORMAT_TIME) { /* BYTES -> TIME conversion */ GST_DEBUG_OBJECT (parse, "converting bytes -> time"); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION src_value = src_value - parse->priv->remove_from_total; #endif *dest_value = gst_util_uint64_scale (src_value, duration, bytes); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION *dest_value /= GST_USECOND; #endif *dest_value *= GST_MSECOND; @@ -1644,7 +1644,7 @@ gst_base_parse_convert_default (GstBaseParse * parse, } else if (src_format == GST_FORMAT_TIME) { if (dest_format == GST_FORMAT_BYTES) { GST_DEBUG_OBJECT (parse, "converting time -> bytes"); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION *dest_value = gst_util_uint64_scale (src_value / GST_USECOND, bytes, duration); #else @@ -2075,7 +2075,7 @@ gst_base_parse_handle_buffer (GstBaseParse * parse, GstBuffer * buffer, gst_adapter_push (parse->priv->adapter, buffer); } -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION /* some one-time start-up */ if (G_UNLIKELY (parse->priv->framecount == 0)) { gst_base_parse_check_seekability (parse); @@ -2237,7 +2237,7 @@ gst_base_parse_handle_and_push_frame (GstBaseParse * parse, * we may have new information on frame properties */ gst_base_parse_parse_frame (parse, frame); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION if (parse->priv->first_frame) { parse->priv->remove_from_total = GST_BUFFER_OFFSET (buffer); GST_DEBUG_OBJECT (parse, "first frame has offset %" G_GINT64_FORMAT ". remove from total", @@ -2312,7 +2312,7 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) buffer = frame->buffer; -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV if (!GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (buffer))) { GST_LOG_OBJECT (parse, "invalid pts, set with dts"); GST_BUFFER_PTS (buffer) = GST_BUFFER_DTS (buffer); @@ -2339,7 +2339,7 @@ gst_base_parse_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) if (parse->priv->update_interval < 0) parse->priv->update_interval = 50; else if (parse->priv->update_interval > 0 && -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION ((parse->priv->framecount - 1) % parse->priv->update_interval) == 0) #else (parse->priv->framecount % parse->priv->update_interval) == 0) @@ -3624,7 +3624,7 @@ gst_base_parse_sink_activate_mode (GstPad * pad, GstObject * parent, GST_DEBUG_OBJECT (parse, "sink %sactivate in %s mode", (active) ? "" : "de", gst_pad_mode_get_name (mode)); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION /* to know early what is the mode */ parse->priv->expected_pad_mode = active ? mode : GST_PAD_MODE_NONE; #endif @@ -4449,7 +4449,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) /* maybe we can be accurate for (almost) free */ gst_base_parse_find_offset (parse, seeksegment.position, TRUE, &start_ts); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION if (parse->priv->accurate_index_seek) { if (seeksegment.position <= start_ts + TARGET_DIFFERENCE) { GST_DEBUG_OBJECT (parse, "accurate seek possible"); @@ -4871,7 +4871,7 @@ gst_base_parse_merge_tags (GstBaseParse * parse, GstTagList * tags, GST_OBJECT_UNLOCK (parse); } -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION void gst_base_parse_get_upstream_size (GstBaseParse * parse, gint64 * upstream_size) diff --git a/libs/gst/base/gstbaseparse.h b/libs/gst/base/gstbaseparse.h index 1febe97..559d88a 100644 --- a/libs/gst/base/gstbaseparse.h +++ b/libs/gst/base/gstbaseparse.h @@ -348,7 +348,7 @@ void gst_base_parse_set_ts_at_offset (GstBaseParse *parse, void gst_base_parse_merge_tags (GstBaseParse * parse, GstTagList * tags, GstTagMergeMode mode); -#ifdef GST_BASEPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_BASEPARSE_MODIFICATION void gst_base_parse_get_upstream_size (GstBaseParse * parse, gint64 * upstream_size); diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index 3846cb7..31ac75e 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -204,7 +204,7 @@ enum #define DEFAULT_NUM_BUFFERS -1 #define DEFAULT_TYPEFIND FALSE #define DEFAULT_DO_TIMESTAMP FALSE -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV #define DEFAULT_SEGMENT_TIME -1 #endif @@ -215,7 +215,7 @@ enum PROP_NUM_BUFFERS, PROP_TYPEFIND, PROP_DO_TIMESTAMP -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV ,PROP_UPDATE_SEGMENT #endif }; @@ -401,7 +401,7 @@ gst_base_src_class_init (GstBaseSrcClass * klass) g_param_spec_boolean ("do-timestamp", "Do timestamp", "Apply current stream time to buffers", DEFAULT_DO_TIMESTAMP, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV g_object_class_install_property (gobject_class, PROP_UPDATE_SEGMENT, g_param_spec_int64 ("update-segment", "Update Segment", "Timestamp that application want to set (-1 unlimited)", @@ -811,7 +811,7 @@ gst_base_src_set_do_timestamp (GstBaseSrc * src, gboolean timestamp) GST_OBJECT_UNLOCK (src); } -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV /** *gst_base_src_update_segment: *@src: the source @@ -2115,7 +2115,7 @@ gst_base_src_set_property (GObject * object, guint prop_id, case PROP_DO_TIMESTAMP: gst_base_src_set_do_timestamp (src, g_value_get_boolean (value)); break; -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV case PROP_UPDATE_SEGMENT: gst_base_src_update_segment (src, g_value_get_int64 (value)); break; diff --git a/libs/gst/base/gstbasesrc.h b/libs/gst/base/gstbasesrc.h index f5ecb09..1167cd3 100644 --- a/libs/gst/base/gstbasesrc.h +++ b/libs/gst/base/gstbasesrc.h @@ -271,8 +271,8 @@ void gst_base_src_get_allocator (GstBaseSrc *src, GstAllocator **allocator, GstAllocationParams *params); -#ifdef GST_TIZEN_TV -void gst_base_src_update_segment (GstBaseSrc * src, gint64 timestamp); +#ifdef TIZEN_PROFILE_TV +void gst_base_src_update_segment (GstBaseSrc * src, gint64 timestamp); #endif G_END_DECLS diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index cbd3772..2b2afd3 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -2,7 +2,7 @@ Name: gstreamer Version: 1.6.1 -Release: 4 +Release: 5 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework @@ -66,14 +66,13 @@ to develop applications that require these. export V=1 NOCONFIGURE=1 ./autogen.sh export CFLAGS="%{optflags} \ - -DGST_QUEUE2_MODIFICATION\ - -DGST_EXT_CURRENT_BYTES\ - -DGST_TIZEN_MODIFICATION\ - -DGST_BASEPARSE_MODIFICATION\ - -DGST_QUEUE_MODIFICATION\ - -DGST_MQ_MODIFICATION\ + -DTIZEN_FEATURE_QUEUE2_MODIFICATION\ + -DTIZEN_FEATURE_FILESINK_MODIFICATION\ + -DTIZEN_FEATURE_MQ_MODIFICATION\ + -DTIZEN_FEATURE_BASEPARSE_MODIFICATION\ + -DTIZEN_FEATURE_QUEUE_MODIFICATION\ %if "%{?profile}" == "tv" - -DGST_TIZEN_TV\ + -DTIZEN_PROFILE_TV\ %endif -fno-strict-aliasing" diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c index 6b6db98..bd36866 100644 --- a/plugins/elements/gstfilesink.c +++ b/plugins/elements/gstfilesink.c @@ -113,7 +113,7 @@ enum PROP_BUFFER_MODE, PROP_BUFFER_SIZE, PROP_APPEND, -#ifdef GST_EXT_CURRENT_BYTES +#ifdef TIZEN_FEATURE_FILESINK_MODIFICATION PROP_CURRENT_BYTES, #endif PROP_LAST @@ -219,7 +219,7 @@ gst_file_sink_class_init (GstFileSinkClass * klass) "Size of buffer in number of bytes for line or full buffer-mode", 0, G_MAXUINT, DEFAULT_BUFFER_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -#ifdef GST_EXT_CURRENT_BYTES +#ifdef TIZEN_FEATURE_FILESINK_MODIFICATION g_object_class_install_property (gobject_class, PROP_CURRENT_BYTES, g_param_spec_uint64 ("current-bytes", "Current bytes", "downloaded bytes so far", 0, @@ -229,7 +229,7 @@ gst_file_sink_class_init (GstFileSinkClass * klass) /** * GstFileSink:append - * + * * Append to an already existing file. */ g_object_class_install_property (gobject_class, PROP_APPEND, @@ -367,7 +367,7 @@ gst_file_sink_get_property (GObject * object, guint prop_id, GValue * value, case PROP_APPEND: g_value_set_boolean (value, sink->append); break; -#ifdef GST_EXT_CURRENT_BYTES +#ifdef TIZEN_FEATURE_FILESINK_MODIFICATION case PROP_CURRENT_BYTES: g_value_set_uint64(value, sink->current_pos); break; diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 83115bd..84e87b5 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -258,7 +258,7 @@ enum PROP_MAX_SIZE_BYTES, PROP_MAX_SIZE_BUFFERS, PROP_MAX_SIZE_TIME, -#ifdef GST_MQ_MODIFICATION +#ifdef TIZEN_FEATURE_MQ_MODIFICATION PROP_CURR_SIZE_BYTES, #endif PROP_USE_BUFFERING, @@ -366,7 +366,7 @@ gst_multi_queue_class_init (GstMultiQueueClass * klass) "Max. amount of data in the queue (in ns, 0=disable)", 0, G_MAXUINT64, DEFAULT_MAX_SIZE_TIME, G_PARAM_READWRITE | GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS)); -#ifdef GST_MQ_MODIFICATION +#ifdef TIZEN_FEATURE_MQ_MODIFICATION g_object_class_install_property (gobject_class, PROP_CURR_SIZE_BYTES, g_param_spec_uint ("curr-size-bytes", "Current buffered size (kB)", "buffered amount of data in the queue (bytes)", 0, G_MAXUINT, @@ -612,7 +612,7 @@ gst_multi_queue_set_property (GObject * object, guint prop_id, case PROP_HIGH_PERCENT: mq->high_percent = g_value_get_int (value); -#ifdef GST_TIZEN_MODIFICATION +#ifdef TIZEN_FEATURE_MQ_MODIFICATION if (mq->buffering) { mq->percent_changed = TRUE; gst_multi_queue_post_buffering (mq); @@ -628,7 +628,7 @@ gst_multi_queue_set_property (GObject * object, guint prop_id, } } -#ifdef GST_MQ_MODIFICATION +#ifdef TIZEN_FEATURE_MQ_MODIFICATION static guint get_current_size_bytes (GstMultiQueue * mq) { @@ -684,7 +684,7 @@ gst_multi_queue_get_property (GObject * object, guint prop_id, case PROP_MAX_SIZE_TIME: g_value_set_uint64 (value, mq->max_size.time); break; -#ifdef GST_MQ_MODIFICATION +#ifdef TIZEN_FEATURE_MQ_MODIFICATION case PROP_CURR_SIZE_BYTES: g_value_set_uint (value, get_current_size_bytes(mq)); break; diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index c01b5dc..b103a02 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -120,9 +120,9 @@ enum PROP_MIN_THRESHOLD_TIME, PROP_LEAKY, PROP_SILENT, -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION PROP_EMPTY_BUFFERS, -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ PROP_FLUSH_ON_EOS }; @@ -384,12 +384,12 @@ gst_queue_class_init (GstQueueClass * klass) G_PARAM_READWRITE | GST_PARAM_MUTABLE_PLAYING | G_PARAM_STATIC_STRINGS)); -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION g_object_class_install_property (gobject_class, PROP_EMPTY_BUFFERS, g_param_spec_boolean ("empty-buffers", "empty_buffers", "Drop all the incomming buffers and flush buffers in queue", FALSE, G_PARAM_READWRITE)); -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ /** * GstQueue:flush-on-eos @@ -485,9 +485,9 @@ gst_queue_init (GstQueue * queue) queue->newseg_applied_to_src = FALSE; -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION queue->empty_buffers = FALSE; -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ GST_DEBUG_OBJECT (queue, "initialized queue's not_empty & not_full conditions"); @@ -1156,7 +1156,7 @@ gst_queue_chain_buffer_or_list (GstPad * pad, GstObject * parent, if (queue->unexpected) goto out_unexpected; -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION /* Added to not enqueue buffers in the queue while paused */ if (queue->empty_buffers) { GST_CAT_LOG_OBJECT(queue_dataflow, queue, "drop buffer %p", obj); @@ -1164,7 +1164,7 @@ gst_queue_chain_buffer_or_list (GstPad * pad, GstObject * parent, GST_QUEUE_MUTEX_UNLOCK(queue); return GST_FLOW_OK; } -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ if (!is_list) { GstClockTime duration, timestamp; @@ -1805,7 +1805,7 @@ gst_queue_set_property (GObject * object, case PROP_SILENT: queue->silent = g_value_get_boolean (value); break; -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION case PROP_EMPTY_BUFFERS: queue->empty_buffers = g_value_get_boolean (value); GST_INFO_OBJECT(queue, "set empty buffer : %d", queue->empty_buffers); @@ -1814,7 +1814,7 @@ gst_queue_set_property (GObject * object, } GST_INFO_OBJECT(queue, "done"); break; -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ case PROP_FLUSH_ON_EOS: queue->flush_on_eos = g_value_get_boolean (value); break; @@ -1868,11 +1868,11 @@ gst_queue_get_property (GObject * object, case PROP_SILENT: g_value_set_boolean (value, queue->silent); break; -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION case PROP_EMPTY_BUFFERS: g_value_set_boolean(value, queue->empty_buffers); break; -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ case PROP_FLUSH_ON_EOS: g_value_set_boolean (value, queue->flush_on_eos); break; diff --git a/plugins/elements/gstqueue.h b/plugins/elements/gstqueue.h index 33c8b4b..501949f 100644 --- a/plugins/elements/gstqueue.h +++ b/plugins/elements/gstqueue.h @@ -107,10 +107,10 @@ struct _GstQueue { gboolean unexpected; gboolean eos; -#ifdef GST_QUEUE_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE_MODIFICATION /* drop incomming buffers and flush buffers in queue */ gboolean empty_buffers; -#endif /* GST_QUEUE_MODIFICATION */ +#endif /* TIZEN_FEATURE_QUEUE_MODIFICATION */ /* the queue of data we're keeping our grubby hands on */ GstQueueArray *queue; diff --git a/plugins/elements/gstqueue2.c b/plugins/elements/gstqueue2.c index fbbf107..2d12238 100644 --- a/plugins/elements/gstqueue2.c +++ b/plugins/elements/gstqueue2.c @@ -265,7 +265,7 @@ static gboolean gst_queue2_is_filled (GstQueue2 * queue); static void update_cur_level (GstQueue2 * queue, GstQueue2Range * range); static void update_in_rates (GstQueue2 * queue); static void gst_queue2_post_buffering (GstQueue2 * queue); -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION static gboolean change_current_range(GstQueue2 * queue, GstQueue2Range *req_range, guint64 offset, guint length); #endif @@ -539,7 +539,7 @@ clean_ranges (GstQueue2 * queue) g_slice_free_chain (GstQueue2Range, queue->ranges, next); queue->ranges = NULL; queue->current = NULL; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->read = NULL; #endif } @@ -652,7 +652,7 @@ init_ranges (GstQueue2 * queue) /* get rid of all the current ranges */ clean_ranges (queue); /* make a range for offset 0 */ -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->current = queue->read = add_range (queue, 0, TRUE); #else queue->current = add_range (queue, 0, TRUE); @@ -700,7 +700,7 @@ apply_segment (GstQueue2 * queue, GstEvent * event, GstSegment * segment, if (segment->format == GST_FORMAT_BYTES) { if (!QUEUE_IS_USING_QUEUE (queue) && is_sink) { /* start is where we'll be getting from and as such writing next */ -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->current = queue->read = add_range (queue, segment->start, TRUE); #else queue->current = add_range (queue, segment->start, TRUE); @@ -956,7 +956,7 @@ static void update_buffering (GstQueue2 * queue) { gint percent; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION GstQueue2Range *range; if (queue->read) @@ -966,7 +966,7 @@ update_buffering (GstQueue2 * queue) #endif /* Ensure the variables used to calculate buffering state are up-to-date. */ -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION if (range) update_cur_level (queue, range); #else @@ -1155,7 +1155,7 @@ perform_seek_to_offset (GstQueue2 * queue, guint64 offset) * cause data to be written to the wrong offset in the file or ring buffer. * We still do the add_range call to switch the current range to the * requested range, or create one if one doesn't exist yet. */ -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->current = queue->read = add_range (queue, offset, FALSE); #else queue->current = add_range (queue, offset, FALSE); @@ -1181,7 +1181,7 @@ get_seek_threshold (GstQueue2 * queue) return threshold; } -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION /* check the buffered data size, not to change range repeatedly. * changing range cause the new http connection and it makes buffering state frequently. */ static gboolean @@ -1221,19 +1221,19 @@ static gboolean gst_queue2_have_data (GstQueue2 * queue, guint64 offset, guint length) { GstQueue2Range *range; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION gboolean need_to_seek = TRUE; #endif GST_DEBUG_OBJECT (queue, "looking for offset %" G_GUINT64_FORMAT ", len %u", offset, length); if ((range = find_range (queue, offset))) { -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->read = range; #endif if (queue->current != range) { GST_DEBUG_OBJECT (queue, "switching ranges, do seek to range position"); -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION if (QUEUE_IS_USING_TEMP_FILE(queue) && !QUEUE_IS_USING_RING_BUFFER(queue)) need_to_seek = change_current_range(queue, range, offset, length); @@ -1266,7 +1266,7 @@ gst_queue2_have_data (GstQueue2 * queue, guint64 offset, guint length) GST_INFO_OBJECT (queue, "not found in any range off %" G_GUINT64_FORMAT " len %u", offset, length); -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->read = queue->current; #endif @@ -1392,7 +1392,7 @@ gst_queue2_create_read (GstQueue2 * queue, guint64 offset, guint length, guint64 level; /* calculate how far away the offset is */ -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION if (queue->read->writing_pos > rpos) level = queue->read->writing_pos - rpos; #else @@ -1405,7 +1405,7 @@ gst_queue2_create_read (GstQueue2 * queue, guint64 offset, guint length, GST_DEBUG_OBJECT (queue, "reading %" G_GUINT64_FORMAT ", writing %" G_GUINT64_FORMAT ", level %" G_GUINT64_FORMAT ", max %" G_GUINT64_FORMAT, -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION rpos, queue->read->writing_pos, level, max_size); #else rpos, queue->current->writing_pos, level, max_size); @@ -1434,7 +1434,7 @@ gst_queue2_create_read (GstQueue2 * queue, guint64 offset, guint length, if (read_length == 0) { if (QUEUE_IS_USING_RING_BUFFER (queue)) { -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION GST_DEBUG_OBJECT (queue, "update current position [%" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT "]", rpos, queue->read->max_reading_pos); @@ -1461,7 +1461,7 @@ gst_queue2_create_read (GstQueue2 * queue, guint64 offset, guint length, } /* set range reading_pos to actual reading position for this read */ -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION queue->read->reading_pos = rpos; #else queue->current->reading_pos = rpos; @@ -1470,7 +1470,7 @@ gst_queue2_create_read (GstQueue2 * queue, guint64 offset, guint length, /* configure how much and from where to read */ if (QUEUE_IS_USING_RING_BUFFER (queue)) { file_offset = -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION (queue->read->rb_offset + (rpos - queue->read->offset)) % rb_size; #else @@ -1506,7 +1506,7 @@ gst_queue2_create_read (GstQueue2 * queue, guint64 offset, guint length, block_length = read_length; remaining -= read_return; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION rpos = (queue->read->reading_pos += read_return); update_cur_pos (queue, queue->read, queue->read->reading_pos); #else @@ -1572,7 +1572,7 @@ gst_queue2_read_item_from_file (GstQueue2 * queue) GstBuffer *buffer = NULL; guint64 reading_pos; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION reading_pos = queue->read->reading_pos; #else reading_pos = queue->current->reading_pos; @@ -2028,7 +2028,7 @@ gst_queue2_create_write (GstQueue2 * queue, GstBuffer * buffer) queue->current->rb_writing_pos = writing_pos = new_writing_pos; } else { queue->current->writing_pos = writing_pos = new_writing_pos; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION if (do_seek) { if (queue->upstream_size == 0 || new_writing_pos < queue->upstream_size) perform_seek_to_offset (queue, new_writing_pos); @@ -2038,7 +2038,7 @@ gst_queue2_create_write (GstQueue2 * queue, GstBuffer * buffer) #endif } -#ifndef GST_QUEUE2_MODIFICATION +#ifndef TIZEN_FEATURE_QUEUE2_MODIFICATION if (do_seek) perform_seek_to_offset (queue, new_writing_pos); #endif @@ -3171,7 +3171,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query) range_stop = 0; break; } -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION range_start = gst_util_uint64_scale (GST_FORMAT_PERCENT_MAX, queued_ranges->reading_pos, duration); @@ -3185,7 +3185,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query) queued_ranges->writing_pos, duration); break; case GST_FORMAT_BYTES: -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION range_start = queued_ranges->reading_pos; #else range_start = queued_ranges->offset; @@ -3214,7 +3214,7 @@ gst_queue2_handle_src_query (GstPad * pad, GstObject * parent, GstQuery * query) { gboolean pull_mode; GstSchedulingFlags flags = 0; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION if ((!QUEUE_IS_USING_QUEUE (queue)) && !gst_pad_peer_query (queue->sinkpad, query)) #else if (!gst_pad_peer_query (queue->sinkpad, query)) diff --git a/plugins/elements/gstqueue2.h b/plugins/elements/gstqueue2.h index 1f6653a..e823fbc 100644 --- a/plugins/elements/gstqueue2.h +++ b/plugins/elements/gstqueue2.h @@ -141,7 +141,7 @@ struct _GstQueue2 /* list of downloaded areas and the current area */ GstQueue2Range *ranges; GstQueue2Range *current; -#ifdef GST_QUEUE2_MODIFICATION +#ifdef TIZEN_FEATURE_QUEUE2_MODIFICATION GstQueue2Range *read; #endif /* we need this to send the first new segment event of the stream diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c index e674763..9a49b8b 100644 --- a/plugins/elements/gsttypefindelement.c +++ b/plugins/elements/gsttypefindelement.c @@ -97,7 +97,7 @@ GST_STATIC_PAD_TEMPLATE ("src", /* Require at least 2kB of data before we attempt typefinding in chain-mode. * 128kB is massive overkill for the maximum, but doesn't do any harm */ -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV /* TV demuxer needs 4*1024 as min size to match demuxer, if not * sometimes can't find correct demuxer */ -- 2.7.4