gst-plugins-good: Rename some definitions for TIZEN

__TIZEN__ is renamed and deprecated.

Change-Id: I2d1f09006403dd1a458241672bb1a2d809ac6753
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulsesink.c b/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
index e034835..85d83cb 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
+++ b/subprojects/gst-plugins-good/ext/pulse/pulsesink.c
@@ -60,9 +60,9 @@
 #include <gst/glib-compat-private.h>
 
 #include "gstpulseelements.h"
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 #include <vconf.h>
-#endif /* __TIZEN__ && PCM_DUMP_ENABLE */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION && PCM_DUMP_ENABLE */
 #include "pulsesink.h"
 #include "pulseutil.h"
 
@@ -76,10 +76,10 @@ GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
 #define DEFAULT_VOLUME          1.0
 #define DEFAULT_MUTE            FALSE
 #define MAX_VOLUME              10.0
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
 #define DEFAULT_AUDIO_LATENCY     "mid"
 #define DEFAULT_AUTO_RENDER_DELAY FALSE
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
 enum
 {
@@ -92,20 +92,20 @@ enum
   PROP_MUTE,
   PROP_CLIENT_NAME,
   PROP_STREAM_PROPERTIES,
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   PROP_AUDIO_LATENCY,
   PROP_AUTO_RENDER_DELAY,
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
   PROP_LAST
 };
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 #define GST_PULSESINK_DUMP_VCONF_KEY            "memory/private/sound/pcm_dump"
 #define GST_PULSESINK_DUMP_INPUT_PATH_PREFIX    "/tmp/dump_pulsesink_in_"
 #define GST_PULSESINK_DUMP_OUTPUT_PATH_PREFIX   "/tmp/dump_pulsesink_out_"
 #define GST_PULSESINK_DUMP_INPUT_FLAG           0x00000400
 #define GST_PULSESINK_DUMP_OUTPUT_FLAG          0x00000800
-#endif /* __TIZEN__ && PCM_DUMP_ENABLE */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION && PCM_DUMP_ENABLE */
 
 #define GST_TYPE_PULSERING_BUFFER        \
         (gst_pulseringbuffer_get_type())
@@ -223,7 +223,7 @@ static void gst_pulseringbuffer_clear (GstAudioRingBuffer * buf);
 static guint gst_pulseringbuffer_commit (GstAudioRingBuffer * buf,
     guint64 * sample, guchar * data, gint in_samples, gint out_samples,
     gint * accum);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
 static gboolean gst_pulsering_set_corked (GstPulseRingBuffer * pbuf, gboolean corked,
     gboolean wait);
 #endif
@@ -346,7 +346,7 @@ gst_pulsering_destroy_stream (GstPulseRingBuffer * pbuf)
     pa_stream_set_write_callback (pbuf->stream, NULL, NULL);
     pa_stream_set_underflow_callback (pbuf->stream, NULL, NULL);
     pa_stream_set_overflow_callback (pbuf->stream, NULL, NULL);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
     pa_stream_set_latency_update_callback (pbuf->stream, NULL, NULL);
     pa_stream_set_suspended_callback (pbuf->stream, NULL, NULL);
     pa_stream_set_started_callback (pbuf->stream, NULL, NULL);
@@ -669,12 +669,12 @@ gst_pulseringbuffer_close_device (GstAudioRingBuffer * buf)
   gst_pulsering_destroy_context (pbuf);
   pa_threaded_mainloop_unlock (mainloop);
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   if (psink->dump_fd_input) {
     fclose(psink->dump_fd_input);
     psink->dump_fd_input = NULL;
   }
-#endif /* __TIZEN__ && PCM_DUMP_ENABLE */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION && PCM_DUMP_ENABLE */
 
   GST_LOG_OBJECT (psink, "closed device");
 
@@ -792,7 +792,7 @@ gst_pulsering_stream_latency_cb (pa_stream * s, void *userdata)
       GST_TIMEVAL_TO_TIME (info->timestamp), info->write_index_corrupt,
       info->write_index, info->read_index_corrupt, info->read_index,
       info->sink_usec, sink_usec);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   if (!psink || !psink->auto_render_delay)
     return;
 
@@ -893,7 +893,7 @@ gst_pulsering_stream_event_cb (pa_stream * p, const char *name,
       GST_ELEMENT_ERROR (psink, STREAM, FORMAT, ("Sink format changed"),
           ("Sink format changed"));
     }
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   } else if (!strcmp (name, PA_STREAM_EVENT_POP_TIMEOUT)) {
     GST_WARNING_OBJECT (psink, "got event [%s], cork stream now!!!!", name);
     gst_pulsering_set_corked (pbuf, TRUE, FALSE);
@@ -938,7 +938,7 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
   const pa_buffer_attr *actual;
   pa_channel_map channel_map;
   pa_operation *o = NULL;
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   pa_cvolume v;
 #endif
   pa_cvolume *pv = NULL;
@@ -990,7 +990,7 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
   else
     name = "Playback Stream";
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   if (psink->need_dump_input == TRUE && psink->dump_fd_input == NULL) {
     char *suffix , *dump_path;
     GDateTime *time = g_date_time_new_now_local();
@@ -1004,7 +1004,7 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
     g_free(dump_path);
     g_date_time_unref(time);
   }
-#endif /* __TIZEN__ && PCM_DUMP_ENABLE */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION && PCM_DUMP_ENABLE */
 
   /* create a stream */
   formats[0] = pbuf->format;
@@ -1043,7 +1043,7 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
   GST_INFO_OBJECT (psink, "prebuf:    %d", wanted.prebuf);
   GST_INFO_OBJECT (psink, "minreq:    %d", wanted.minreq);
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   /* configure volume when we changed it, else we leave the default */
   if (psink->volume_set) {
     GST_LOG_OBJECT (psink, "have volume of %f", psink->volume);
@@ -1063,7 +1063,7 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
   flags = PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE |
       PA_STREAM_ADJUST_LATENCY | PA_STREAM_START_CORKED;
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   if (psink->mute_set) {
     if (psink->mute)
       flags |= PA_STREAM_START_MUTED;
@@ -1098,7 +1098,7 @@ gst_pulseringbuffer_acquire (GstAudioRingBuffer * buf,
   GST_INFO_OBJECT (psink, "negotiated to: %s", print_buf);
 #endif
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   {
     uint32_t idx;
     if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
@@ -1167,7 +1167,7 @@ connect_failed:
             pa_strerror (pa_context_errno (pbuf->context))), (NULL));
     goto unlock_and_fail;
   }
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
 no_index:
   {
     GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
@@ -1613,7 +1613,7 @@ gst_pulseringbuffer_commit (GstAudioRingBuffer * buf, guint64 * sample,
   if (pbuf->paused)
     goto was_paused;
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   /* ensure running clock for whatever out there */
   if (pbuf->corked) {
     if (!gst_pulsering_set_corked (pbuf, FALSE, FALSE))
@@ -1984,7 +1984,7 @@ gst_pulsesink_payload (GstAudioBaseSink * sink, GstBuffer * buf)
   }
 }
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 static GstPadProbeReturn
 gst_pulsesink_pad_dump_probe (GstPad * pad, GstPadProbeInfo * info, gpointer data)
 {
@@ -2001,7 +2001,7 @@ gst_pulsesink_pad_dump_probe (GstPad * pad, GstPadProbeInfo * info, gpointer dat
   }
   return GST_PAD_PROBE_OK;
 }
-#endif /* __TIZEN__ && PCM_DUMP_ENABLE */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION && PCM_DUMP_ENABLE */
 
 static void
 gst_pulsesink_class_init (GstPulseSinkClass * klass)
@@ -2101,7 +2101,7 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
           "list of pulseaudio stream properties",
           GST_TYPE_STRUCTURE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   g_object_class_install_property (gobject_class,
       PROP_AUDIO_LATENCY,
       g_param_spec_string ("latency", "Audio Backend Latency",
@@ -2114,7 +2114,7 @@ gst_pulsesink_class_init (GstPulseSinkClass * klass)
       g_param_spec_boolean ("auto-render-delay", "Auto Render Delay",
           "Apply render delay automatically", DEFAULT_AUTO_RENDER_DELAY,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
   gst_element_class_set_static_metadata (gstelement_class,
       "PulseAudio Audio Sink",
@@ -2496,10 +2496,10 @@ info_failed:
 static void
 gst_pulsesink_init (GstPulseSink * pulsesink)
 {
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   GstPad *sinkpad = NULL;
   int vconf_dump = 0;
-#endif /* __TIZEN__ && PCM_DUMP_ENABLE */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION && PCM_DUMP_ENABLE */
 
   pulsesink->server = NULL;
   pulsesink->device = NULL;
@@ -2521,7 +2521,7 @@ gst_pulsesink_init (GstPulseSink * pulsesink)
 
   pulsesink->properties = NULL;
   pulsesink->proplist = NULL;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   pulsesink->latency = g_strdup (DEFAULT_AUDIO_LATENCY);
   pulsesink->auto_render_delay = DEFAULT_AUTO_RENDER_DELAY;
   pulsesink->proplist = pa_proplist_new();
@@ -2540,7 +2540,7 @@ gst_pulsesink_init (GstPulseSink * pulsesink)
     }
   }
 #endif
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
   /* override with a custom clock */
   if (GST_AUDIO_BASE_SINK (pulsesink)->provided_clock)
@@ -2568,9 +2568,9 @@ gst_pulsesink_finalize (GObject * object)
   if (pulsesink->proplist)
     pa_proplist_free (pulsesink->proplist);
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   g_free (pulsesink->latency);
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -2578,14 +2578,14 @@ gst_pulsesink_finalize (GObject * object)
 static void
 gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
 {
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   pa_cvolume v;
   pa_operation *o = NULL;
 #endif
   GstPulseRingBuffer *pbuf;
   uint32_t idx;
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   if (!mainloop)
     goto no_mainloop;
 
@@ -2601,7 +2601,7 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
   if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
     goto no_index;
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   if (pbuf->is_pcm)
     gst_pulse_cvolume_from_linear (&v, pbuf->channels, volume);
   else
@@ -2621,7 +2621,7 @@ gst_pulsesink_set_volume (GstPulseSink * psink, gdouble volume)
 
   /* We don't really care about the result of this call */
 unlock:
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
 
   if (o)
     pa_operation_unref (o);
@@ -2632,7 +2632,7 @@ unlock:
   return;
 
   /* ERRORS */
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
 no_mainloop:
   {
     psink->volume = volume;
@@ -2655,7 +2655,7 @@ no_index:
     GST_DEBUG_OBJECT (psink, "we don't have a stream index");
     goto unlock;
   }
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
 volume_failed:
   {
     GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
@@ -2669,13 +2669,13 @@ volume_failed:
 static void
 gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
 {
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   pa_operation *o = NULL;
 #endif
   GstPulseRingBuffer *pbuf;
   uint32_t idx;
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   if (!mainloop)
     goto no_mainloop;
 
@@ -2691,7 +2691,7 @@ gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
   if ((idx = pa_stream_get_index (pbuf->stream)) == PA_INVALID_INDEX)
     goto no_index;
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
   if (!(o = pa_context_set_sink_input_mute (pbuf->context, idx,
               mute, NULL, NULL)))
     goto mute_failed;
@@ -2702,7 +2702,7 @@ gst_pulsesink_set_mute (GstPulseSink * psink, gboolean mute)
 
   /* We don't really care about the result of this call */
 unlock:
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
 
   if (o)
     pa_operation_unref (o);
@@ -2713,7 +2713,7 @@ unlock:
   return;
 
   /* ERRORS */
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
 no_mainloop:
   {
     psink->mute = mute;
@@ -2736,7 +2736,7 @@ no_index:
     GST_DEBUG_OBJECT (psink, "we don't have a stream index");
     goto unlock;
   }
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
 mute_failed:
   {
     GST_ELEMENT_ERROR (psink, RESOURCE, FAILED,
@@ -3095,7 +3095,7 @@ gst_pulsesink_set_property (GObject * object,
         pa_proplist_free (pulsesink->proplist);
       pulsesink->proplist = gst_pulse_make_proplist (pulsesink->properties);
       break;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
     case PROP_AUDIO_LATENCY:
       g_free (pulsesink->latency);
       pulsesink->latency = g_value_dup_string (value);
@@ -3113,7 +3113,7 @@ gst_pulsesink_set_property (GObject * object,
       pulsesink->auto_render_delay = g_value_get_boolean (value);
       GST_DEBUG_OBJECT (pulsesink, "setting auto-render-delay to %d", g_value_get_boolean (value));
       break;
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -3148,7 +3148,7 @@ gst_pulsesink_get_property (GObject * object,
       break;
     case PROP_VOLUME:
     {
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
       gdouble volume;
 
       gst_pulsesink_get_sink_input_info (pulsesink, &volume, NULL);
@@ -3160,7 +3160,7 @@ gst_pulsesink_get_property (GObject * object,
     }
     case PROP_MUTE:
     {
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_PULSE_MODIFICATION
       gboolean mute;
 
       gst_pulsesink_get_sink_input_info (pulsesink, NULL, &mute);
@@ -3176,14 +3176,14 @@ gst_pulsesink_get_property (GObject * object,
     case PROP_STREAM_PROPERTIES:
       gst_value_set_structure (value, pulsesink->properties);
       break;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
     case PROP_AUDIO_LATENCY:
       g_value_set_string (value, pulsesink->latency);
       break;
     case PROP_AUTO_RENDER_DELAY:
       g_value_set_boolean (value, pulsesink->auto_render_delay);
       break;
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulsesink.h b/subprojects/gst-plugins-good/ext/pulse/pulsesink.h
index 07a61bf..ccaa581 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulsesink.h
+++ b/subprojects/gst-plugins-good/ext/pulse/pulsesink.h
@@ -28,7 +28,7 @@
 #include "config.h"
 #endif
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 #include <stdio.h>
 #endif
 
@@ -71,14 +71,14 @@ struct _GstPulseSink
 
   gint notify; /* atomic */
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   gchar *latency;
   gboolean auto_render_delay:1;
 #ifdef PCM_DUMP_ENABLE
   gint need_dump_input;
   FILE *dump_fd_input;
 #endif
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
   const gchar *pa_version;
 

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulsesrc.c b/subprojects/gst-plugins-good/ext/pulse/pulsesrc.c
index 2714817..34a3345 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulsesrc.c
+++ b/subprojects/gst-plugins-good/ext/pulse/pulsesrc.c
@@ -49,7 +49,7 @@
 #include "pulsesrc.h"
 #include "pulseutil.h"
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 #include <vconf.h>
 #endif
 
@@ -64,9 +64,9 @@ GST_DEBUG_CATEGORY_EXTERN (pulse_debug);
 #define DEFAULT_VOLUME          1.0
 #define DEFAULT_MUTE            FALSE
 #define MAX_VOLUME              10.0
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
 #define DEFAULT_AUDIO_LATENCY   "mid"
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 /* See the pulsesink code for notes on how we interact with the PA mainloop
  * thread. */
 
@@ -85,13 +85,13 @@ enum
   PROP_SOURCE_OUTPUT_INDEX,
   PROP_VOLUME,
   PROP_MUTE,
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   PROP_AUDIO_LATENCY,
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
   PROP_LAST
 };
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 #define GST_PULSESRC_DUMP_VCONF_KEY            "memory/private/sound/pcm_dump"
 #define GST_PULSESRC_DUMP_OUTPUT_PATH_PREFIX   "/tmp/dump_pulsesrc_out"
 #define GST_PULSESRC_DUMP_OUTPUT_FLAG          0x00200000U
@@ -265,17 +265,17 @@ gst_pulsesrc_class_init (GstPulseSrcClass * klass)
           "Mute state of this stream",
           DEFAULT_MUTE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   g_object_class_install_property (gobject_class,
       PROP_AUDIO_LATENCY,
       g_param_spec_string ("latency", "Audio Backend Latency",
           "Audio Backend Latency (\"low\": Low Latency, \"mid\": Mid Latency, \"high\": High Latency)",
           DEFAULT_AUDIO_LATENCY,
           G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 }
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 static GstPadProbeReturn
 gst_pulsesrc_pad_dump_probe (GstPad *pad, GstPadProbeInfo * info, gpointer data)
 {
@@ -297,7 +297,7 @@ gst_pulsesrc_pad_dump_probe (GstPad *pad, GstPadProbeInfo * info, gpointer data)
 static void
 gst_pulsesrc_init (GstPulseSrc * pulsesrc)
 {
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   GstPad *srcpad = NULL;
   int vconf_dump = 0;
 #endif
@@ -330,7 +330,7 @@ gst_pulsesrc_init (GstPulseSrc * pulsesrc)
 
   pulsesrc->properties = NULL;
   pulsesrc->proplist = NULL;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   pulsesrc->latency = g_strdup (DEFAULT_AUDIO_LATENCY);
   pulsesrc->proplist = pa_proplist_new();
   pa_proplist_sets(pulsesrc->proplist, PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY, pulsesrc->latency);
@@ -346,7 +346,7 @@ gst_pulsesrc_init (GstPulseSrc * pulsesrc)
     gst_pad_add_probe (srcpad, GST_PAD_PROBE_TYPE_BUFFER, gst_pulsesrc_pad_dump_probe, pulsesrc, NULL);
   }
 #endif /* PCM_DUMP_ENABLE */
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
   /* this should be the default but it isn't yet */
   gst_audio_base_src_set_slave_method (GST_AUDIO_BASE_SRC (pulsesrc),
       GST_AUDIO_BASE_SRC_SLAVE_SKEW);
@@ -410,9 +410,9 @@ gst_pulsesrc_finalize (GObject * object)
   if (pulsesrc->proplist)
     pa_proplist_free (pulsesrc->proplist);
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   g_free (pulsesrc->latency);
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -884,7 +884,7 @@ gst_pulsesrc_set_property (GObject * object,
     case PROP_MUTE:
       gst_pulsesrc_set_stream_mute (pulsesrc, g_value_get_boolean (value));
       break;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
     case PROP_AUDIO_LATENCY:
       g_free (pulsesrc->latency);
       pulsesrc->latency = g_value_dup_string (value);
@@ -898,7 +898,7 @@ gst_pulsesrc_set_property (GObject * object,
       pa_proplist_sets(pulsesrc->proplist, PA_PROP_MEDIA_TIZEN_AUDIO_LATENCY, pulsesrc->latency);
       GST_DEBUG_OBJECT(pulsesrc, "latency(%s)", pulsesrc->latency);
       break;
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -954,11 +954,11 @@ gst_pulsesrc_get_property (GObject * object,
       g_value_set_boolean (value, mute);
       break;
     }
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
     case PROP_AUDIO_LATENCY:
       g_value_set_string (value, pulsesrc->latency);
       break;
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -1150,7 +1150,7 @@ gst_pulsesrc_close (GstAudioSrc * asrc)
   pa_threaded_mainloop_lock (pulsesrc->mainloop);
   gst_pulsesrc_destroy_context (pulsesrc);
   pa_threaded_mainloop_unlock (pulsesrc->mainloop);
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   if (pulsesrc->dump_fd_output) {
     fclose(pulsesrc->dump_fd_output);
     pulsesrc->dump_fd_output = NULL;
@@ -1670,7 +1670,7 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
     gst_pulsesrc_set_stream_volume (pulsesrc, pulsesrc->volume);
     pulsesrc->volume_set = FALSE;
   }
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   if (pulsesrc->need_dump_output) {
     char *suffix , *dump_path;
     GDateTime *time = NULL;

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulsesrc.h b/subprojects/gst-plugins-good/ext/pulse/pulsesrc.h
index f054da6..10a924d 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulsesrc.h
+++ b/subprojects/gst-plugins-good/ext/pulse/pulsesrc.h
@@ -30,7 +30,7 @@
 #include <pulse/pulseaudio.h>
 #include <pulse/thread-mainloop.h>
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
 #include <stdio.h>
 #endif
 
@@ -74,14 +74,14 @@ struct _GstPulseSrc
   gboolean paused:1;
   gboolean in_read:1;
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
   gchar *latency;
-#endif /* __TIZEN__ */
+#endif /* TIZEN_FEATURE_PULSE_MODIFICATION */
 
   GstStructure *properties;
   pa_proplist *proplist;
 
-#if defined(__TIZEN__) && defined(PCM_DUMP_ENABLE)
+#if defined(TIZEN_FEATURE_PULSE_MODIFICATION) && defined(PCM_DUMP_ENABLE)
   gint need_dump_output;
   FILE *dump_fd_output;
 #endif

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulseutil.c b/subprojects/gst-plugins-good/ext/pulse/pulseutil.c
index 6f00f75..db04beb 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulseutil.c
+++ b/subprojects/gst-plugins-good/ext/pulse/pulseutil.c
@@ -358,7 +358,7 @@ make_proplist_item (GQuark field_id, const GValue * value, gpointer user_data)
     case G_TYPE_STRING:
       pa_proplist_sets (p, prop_id, g_value_get_string (value));
       break;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
     case G_TYPE_INT:
       pa_proplist_setf (p, prop_id, "%d", g_value_get_int (value));
       break;
@@ -513,7 +513,7 @@ out:
   return ret;
 }
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
 #include <gio/gio.h>
 #define PA_BUS_NAME                                    "org.pulseaudio.Server"
 #define PA_STREAM_MANAGER_OBJECT_PATH                  "/org/pulseaudio/StreamManager"

diff --git a/subprojects/gst-plugins-good/ext/pulse/pulseutil.h b/subprojects/gst-plugins-good/ext/pulse/pulseutil.h
index 67f4a4c..5940407 100644 (file)
--- a/subprojects/gst-plugins-good/ext/pulse/pulseutil.h
+++ b/subprojects/gst-plugins-good/ext/pulse/pulseutil.h
@@ -93,7 +93,7 @@ GstStructure *gst_pulse_make_structure (pa_proplist *properties);
 
 GstCaps * gst_pulse_format_info_to_caps (pa_format_info * format);
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_PULSE_MODIFICATION
 void gst_pulse_set_volume_ratio (uint32_t stream_index, const char *direction, double ratio);
 #endif
 GstCaps * gst_pulse_fix_pcm_caps (GstCaps * incaps);

diff --git a/subprojects/gst-plugins-good/ext/vpx/gstvpxdec.c b/subprojects/gst-plugins-good/ext/vpx/gstvpxdec.c
index 92dcdb7..d842591 100644 (file)
--- a/subprojects/gst-plugins-good/ext/vpx/gstvpxdec.c
+++ b/subprojects/gst-plugins-good/ext/vpx/gstvpxdec.c
@@ -742,13 +742,13 @@ gst_vpx_dec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
   img = vpx_codec_get_frame (&dec->decoder, &iter);
   if (img) {
     if (vpxclass->get_frame_format (dec, img, &fmt) == FALSE) {
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_VPX_MODIFICATION
       vpx_img_free (img);
 #endif
       GST_ELEMENT_ERROR (decoder, LIBRARY, ENCODE,
           ("Failed to decode frame"), ("Unsupported color format %d",
               img->fmt));
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_VPX_MODIFICATION
       vpx_img_free (img);
 #endif
       gst_video_codec_frame_unref (frame);

diff --git a/subprojects/gst-plugins-good/gst/rtpmanager/rtpjitterbuffer.c b/subprojects/gst-plugins-good/gst/rtpmanager/rtpjitterbuffer.c
index 41a49b2..a6ee84a 100644 (file)
--- a/subprojects/gst-plugins-good/gst/rtpmanager/rtpjitterbuffer.c
+++ b/subprojects/gst-plugins-good/gst/rtpmanager/rtpjitterbuffer.c
@@ -1265,7 +1265,7 @@ rtp_jitter_buffer_pop (RTPJitterBuffer * jbuf, gint * percent)
 
   /* let's clear the pointers so we can ensure we don't free items that are
    * still in the jitterbuffer */
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_FIX_SEG_FAULT
   if (item)
 #endif
   item->next = item->prev = NULL;

diff --git a/subprojects/gst-plugins-good/gst/rtpmanager/rtpstats.c b/subprojects/gst-plugins-good/gst/rtpmanager/rtpstats.c
index c879086..150a3e4 100644 (file)
--- a/subprojects/gst-plugins-good/gst/rtpmanager/rtpstats.c
+++ b/subprojects/gst-plugins-good/gst/rtpmanager/rtpstats.c
@@ -618,7 +618,7 @@ rtp_twcc_stats_calculate_windowed_stats (RTPTWCCStats * stats)
     if (GST_CLOCK_STIME_IS_VALID (stats->avg_delta_of_delta)) {
       stats->avg_delta_of_delta_change =
           (avg_delta_of_delta -
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_RTP_MODIFICATION
           stats->avg_delta_of_delta) / (250 * GST_USECOND);
 #else
           stats->avg_delta_of_delta) / (gfloat) (250 * GST_USECOND);

diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
index 3135591..52ad35b 100644 (file)
--- a/subprojects/gst-plugins-good/meson.build
+++ b/subprojects/gst-plugins-good/meson.build
@@ -420,13 +420,14 @@ endif
 
 # TIZEN_BUILD_OPTION
 
+# TIZEN_FEATURE_XXX can be generally used for all of modules in this subproject
+cdata.set('TIZEN_FEATURE_FIX_SEG_FAULT', true)
+
+# TIZEN_FEATURE_[MODULE]_XXX should be used for a particular module
 tbm_dep = dependency('libtbm', required : get_option('tbm'))
 if tbm_dep.found()
   cdata.set('TIZEN_FEATURE_V4L2_TBM_SUPPORT', 1)
 endif
-
-gio_dep = dependency('gio-2.0')
-
 cdata.set('TIZEN_FEATURE_V4L2SRC_AUTO_SCAN_DEVICE_NODE', true)
 cdata.set('TIZEN_FEATURE_V4L2SRC_SUPPORT_CAMERA_ID', true)
 cdata.set('TIZEN_FEATURE_V4L2VIDEO_ADJ_RANK', true)
@@ -443,7 +444,11 @@ cdata.set('TIZEN_FEATURE_DISABLE_V4L2_DEPENDENCY', true)
 cdata.set('TIZEN_FEATURE_AVIDEMUX_MODIFICATION', true)
 cdata.set('TIZEN_FEATURE_USE_LIBV4L2', true)
 cdata.set('TIZEN_FEATURE_V4L2_ADDITIONAL_CID_SUPPORT', true)
-cdata.set('__TIZEN__', true)
+cdata.set('TIZEN_FEATURE_VPX_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_RTP_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_PULSE_MODIFICATION', true)
+
+gio_dep = dependency('gio-2.0')
 
 # TIZEN_BUILD_OPTION end