From: Eunhae Choi Date: Mon, 5 Sep 2016 12:44:48 +0000 (+0900) Subject: fix build error of tv patch and apply tizen build option rule X-Git-Tag: accepted/tizen/3.0/ivi/20161011.044141~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cfe01c59f0fd1a30a2d1b687cbdc3f20e2a53ab3;p=platform%2Fupstream%2Fgst-plugins-base.git fix build error of tv patch and apply tizen build option rule Change-Id: I435c0dc5daf42fe5976492d1e3c1c7889b752243 --- diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c index 2d27db0..3bda5d4 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.c +++ b/gst-libs/gst/audio/gstaudiodecoder.c @@ -2244,7 +2244,7 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, GstEvent * event) } else { GST_DEBUG_OBJECT (dec, "unsupported format; ignoring"); GST_AUDIO_DECODER_STREAM_UNLOCK (dec); -#ifdef GST_EXT_AUDIODECODER_MODIFICATION +#ifdef TIZEN_FEATURE_AUDIODECODER_MODIFICATION goto newseg_wrong_format; #else gst_event_unref (event); @@ -2374,7 +2374,7 @@ gst_audio_decoder_sink_eventfunc (GstAudioDecoder * dec, GstEvent * event) } return ret; -#ifdef GST_EXT_AUDIODECODER_MODIFICATION +#ifdef TIZEN_FEATURE_AUDIODECODER_MODIFICATION newseg_wrong_format: { GST_DEBUG_OBJECT (dec, "received non TIME newsegment"); diff --git a/gst-libs/gst/video/video-format.c b/gst-libs/gst/video/video-format.c index 62e1ba0..e67dbf5 100644 --- a/gst-libs/gst/video/video-format.c +++ b/gst-libs/gst/video/video-format.c @@ -3580,7 +3580,7 @@ static const VideoFormat formats[] = { PSTR2222, PLANE0123, OFFS0, SUB4444, PACK_A444_10LE), MAKE_YUV_FORMAT (NV61, "raw video", GST_MAKE_FOURCC ('N', 'V', '6', '1'), DPTH888, PSTR122, PLANE011, OFFS010, SUB422, PACK_NV61), -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV MAKE_YUV_FORMAT (STV0, "raw video", GST_MAKE_FOURCC ('S', 'T', 'V', '0'), DPTH888, PSTR111, PLANE012, OFFS0, SUB420, PACK_420), MAKE_YUV_FORMAT (STV1, "raw video", GST_MAKE_FOURCC ('S', 'T', 'V', '1'), @@ -3764,7 +3764,7 @@ gst_video_format_from_fourcc (guint32 fourcc) switch (fourcc) { case GST_MAKE_FOURCC ('I', '4', '2', '0'): return GST_VIDEO_FORMAT_I420; -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV case GST_MAKE_FOURCC ('S', 'T', 'V', '0'): return GST_VIDEO_FORMAT_STV0; case GST_MAKE_FOURCC ('S', 'T', 'V', '1'): diff --git a/gst-libs/gst/video/video-format.h b/gst-libs/gst/video/video-format.h index b5c1c50..99cfd6d 100644 --- a/gst-libs/gst/video/video-format.h +++ b/gst-libs/gst/video/video-format.h @@ -161,10 +161,8 @@ typedef enum { GST_VIDEO_FORMAT_A444_10BE, GST_VIDEO_FORMAT_A444_10LE, GST_VIDEO_FORMAT_NV61, -#ifdef GST_TIZEN_TV - GST_VIDEO_FORMAT_STV0, - GST_VIDEO_FORMAT_STV1, -#endif + GST_VIDEO_FORMAT_STV0, /* TIZEN_PROFILE_TV */ + GST_VIDEO_FORMAT_STV1, /* TIZEN_PROFILE_TV */ } GstVideoFormat; #define GST_VIDEO_MAX_PLANES 4 diff --git a/gst-libs/gst/video/video-info.c b/gst-libs/gst/video/video-info.c index 589b547..658e545 100644 --- a/gst-libs/gst/video/video-info.c +++ b/gst-libs/gst/video/video-info.c @@ -678,7 +678,7 @@ fill_planes (GstVideoInfo * info) break; case GST_VIDEO_FORMAT_I420: case GST_VIDEO_FORMAT_YV12: /* same as I420, but plane 1+2 swapped */ -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV case GST_VIDEO_FORMAT_STV0: case GST_VIDEO_FORMAT_STV1: #endif @@ -724,7 +724,7 @@ fill_planes (GstVideoInfo * info) info->size = info->stride[0] * height * 3; break; case GST_VIDEO_FORMAT_NV12: -#ifdef GST_TIZEN_MODIFICATION +#ifdef TIZEN_FEATURE_VIDEO_MODIFICATION case GST_VIDEO_FORMAT_SN12: case GST_VIDEO_FORMAT_ST12: #endif @@ -733,7 +733,7 @@ fill_planes (GstVideoInfo * info) info->stride[1] = info->stride[0]; info->offset[0] = 0; info->offset[1] = info->stride[0] * GST_ROUND_UP_2 (height); -#ifdef GST_TIZEN_MODIFICATION +#ifdef TIZEN_FEATURE_VIDEO_MODIFICATION info->size = info->stride[0] * GST_ROUND_UP_2 (height) * 3 / 2; #else cr_h = GST_ROUND_UP_2 (height) / 2; diff --git a/gst-libs/gst/video/videooverlay.c b/gst-libs/gst/video/videooverlay.c index 9167684..e4e988b 100644 --- a/gst-libs/gst/video/videooverlay.c +++ b/gst-libs/gst/video/videooverlay.c @@ -343,7 +343,7 @@ gst_video_overlay_get_type (void) return gst_video_overlay_type; } -#ifdef GST_EXT_WAYLAND_ENHANCEMENT +#ifdef TIZEN_FEATURE_WAYLAND_ENHANCEMENT /** * gst_video_overlay_set_wl_window_wl_surface_id: * @overlay: a #GstVideoOverlay to set the window on. diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index 4496abf..1be56de 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY (sub_parse_debug); #define DEFAULT_ENCODING NULL -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION #define DEFAULT_CURRENT_LANGUAGE NULL #endif enum @@ -48,7 +48,7 @@ enum PROP_0, PROP_ENCODING, PROP_VIDEOFPS, -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION PROP_EXTSUB_CURRENT_LANGUAGE #endif }; @@ -120,7 +120,7 @@ gst_sub_parse_dispose (GObject * object) subparse->textbuf = NULL; } -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (subparse->state.current_language) { g_free (subparse->state.current_language); subparse->state.current_language = NULL; @@ -166,7 +166,7 @@ gst_sub_parse_class_init (GstSubParseClass * klass) "and the subtitle format requires it subtitles may be out of sync.", 0, 1, G_MAXINT, 1, 24000, 1001, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION g_object_class_install_property (object_class, PROP_EXTSUB_CURRENT_LANGUAGE, g_param_spec_string ("current-language", "Current language", "Current language of the subtitle in external subtitle case.", @@ -203,7 +203,7 @@ gst_sub_parse_init (GstSubParse * subparse) subparse->fps_n = 24000; subparse->fps_d = 1001; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION subparse->state.language_list = NULL; subparse->state.current_language = NULL; subparse->state.langlist_msg_posted = FALSE; @@ -348,7 +348,7 @@ gst_sub_parse_set_property (GObject * object, guint prop_id, } break; } -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION case PROP_EXTSUB_CURRENT_LANGUAGE: if (subparse->state.current_language) g_free(subparse->state.current_language); @@ -380,7 +380,7 @@ gst_sub_parse_get_property (GObject * object, guint prop_id, case PROP_VIDEOFPS: gst_value_set_fraction (value, subparse->fps_n, subparse->fps_d); break; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION case PROP_EXTSUB_CURRENT_LANGUAGE: g_value_set_string (value, subparse->state.current_language); break; @@ -1220,7 +1220,7 @@ parser_state_init (ParserState * state) state->state = 0; state->segment = NULL; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION state->language_list = NULL; state->current_language = NULL; state->langlist_msg_posted = FALSE; @@ -1534,7 +1534,7 @@ handle_buffer (GstSubParse * self, GstBuffer * buf) GstCaps *caps = NULL; gchar *line, *subtitle; gboolean need_tags = FALSE; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION GstMessage *m = NULL; #endif @@ -1593,7 +1593,7 @@ handle_buffer (GstSubParse * self, GstBuffer * buf) GST_LOG_OBJECT (self, "Parsing line '%s'", line + offset); subtitle = self->parse_line (&self->state, line + offset); g_free (line); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (!self->state.langlist_msg_posted && self->state.language_list) { m = gst_message_new_element (GST_OBJECT_CAST (self), gst_structure_new("Ext_Sub_Language_List", "lang_list", G_TYPE_POINTER, self->state.language_list, NULL)); diff --git a/gst/subparse/gstsubparse.h b/gst/subparse/gstsubparse.h index f4d5c92..4a45770 100644 --- a/gst/subparse/gstsubparse.h +++ b/gst/subparse/gstsubparse.h @@ -69,7 +69,7 @@ typedef struct { gpointer user_data; gboolean have_internal_fps; /* If TRUE don't overwrite fps by property */ gint fps_n, fps_d; /* used by frame based parsers */ -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION GList* language_list; gchar* current_language; gboolean langlist_msg_posted; diff --git a/gst/subparse/samiparse.c b/gst/subparse/samiparse.c index 5fc70bb..ed86124 100644 --- a/gst/subparse/samiparse.c +++ b/gst/subparse/samiparse.c @@ -32,7 +32,7 @@ typedef struct _HtmlParser HtmlParser; typedef struct _HtmlContext HtmlContext; typedef struct _GstSamiContext GstSamiContext; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION typedef struct _LanguageStruct GstLangStruct; struct _LanguageStruct { @@ -60,7 +60,7 @@ struct _GstSamiContext * content of the sync elements to buf */ guint64 time1; /* previous start attribute in sync tag */ guint64 time2; /* current start attribute in sync tag */ -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION guint64 time3; /* To store the last current time when language is changed */ GList *lang_list; /* Language list for an external subtitle file */ gchar *current_language; /* Current language parsed */ @@ -486,7 +486,7 @@ html_context_handle_element (HtmlContext * ctxt, gint count = 0, i; gchar **attrs; const gchar *found, *next; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION const gchar *name_temp = NULL; gint j = 0; #endif @@ -531,7 +531,7 @@ html_context_handle_element (HtmlContext * ctxt, attrs[i] = attr_name; attrs[i + 1] = attr_value; } -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION /* sometimes spaces can be there in between !-- and P * that also we have to take care */ if (!g_ascii_strcasecmp("!--", name)) { @@ -749,7 +749,7 @@ handle_start_sync (GstSamiContext * sctx, const gchar ** atts) sctx->time1 = sctx->time2; sctx->time2 = atoi ((const char *) value) * GST_MSECOND; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION sctx->time3 = sctx->time2; #endif sctx->time2 = MAX (sctx->time2, sctx->time1); @@ -824,7 +824,7 @@ handle_start_font (GstSamiContext * sctx, const gchar ** atts) sami_context_push_state (sctx, SPAN_TAG); } } -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION static void handle_p (GstSamiContext * sctx, const gchar ** atts) { @@ -923,7 +923,7 @@ handle_start_element (HtmlContext * ctx, const gchar * name, } else if (!g_ascii_strcasecmp ("ruby", name)) { sami_context_push_state (sctx, RUBY_TAG); } else if (!g_ascii_strcasecmp ("br", name)) { -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (sctx->current_language && sctx->desired_language && !strcmp(sctx->current_language, sctx->desired_language)) #endif @@ -936,14 +936,14 @@ handle_start_element (HtmlContext * ctx, const gchar * name, g_string_append (sctx->rubybuf, ""); sami_context_push_state (sctx, RT_TAG); } else if (!g_ascii_strcasecmp ("i", name)) { -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (sctx->current_language && sctx->desired_language && !strcmp(sctx->current_language, sctx->desired_language)) #endif g_string_append (sctx->buf, ""); sami_context_push_state (sctx, ITALIC_TAG); } else if (!g_ascii_strcasecmp ("p", name)) { -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION handle_p (sctx, atts); } else if (!g_ascii_strcasecmp ("!--P", name)) { handle_start_language_list (sctx, atts); @@ -965,7 +965,7 @@ handle_end_element (HtmlContext * ctx, const char *name, gpointer user_data) /* We will usually have one buffer left when the body is closed * as we need the next sync to actually send it */ -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION sctx->end_body = TRUE; #endif @@ -998,7 +998,7 @@ handle_text (HtmlContext * ctx, const gchar * text, gsize text_len, if (!sctx->in_sync) return; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (has_tag (sctx->state, RT_TAG) && (sctx->current_language && sctx->desired_language && !strcmp(sctx->current_language, sctx->desired_language))) { #else @@ -1008,7 +1008,7 @@ handle_text (HtmlContext * ctx, const gchar * text, gsize text_len, g_string_append (sctx->rubybuf, text); g_string_append_c (sctx->rubybuf, ' '); } else { -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (sctx->current_language && sctx->desired_language && !strcmp(sctx->current_language, sctx->desired_language)) #endif @@ -1036,7 +1036,7 @@ sami_context_init (ParserState * state) context->rubybuf = g_string_new (""); context->resultbuf = g_string_new (""); context->state = g_string_new (""); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (context->current_language) free(context->current_language); context->current_language = NULL; @@ -1073,7 +1073,7 @@ void sami_context_deinit (ParserState * state) { GstSamiContext *context = (GstSamiContext *) state->user_data; -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION GstLangStruct *temp = NULL; int i = 0; #endif @@ -1085,7 +1085,7 @@ sami_context_deinit (ParserState * state) g_string_free (context->rubybuf, TRUE); g_string_free (context->resultbuf, TRUE); g_string_free (context->state, TRUE); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (context->lang_list) { while ((temp = g_list_nth_data (context->lang_list, i))) { if (temp->language_code) @@ -1132,7 +1132,7 @@ sami_context_reset (ParserState * state) } } -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION void sami_context_change_language (ParserState * state) { @@ -1158,7 +1158,7 @@ parse_sami (ParserState * state, const gchar * line) gchar *unescaped = unescape_string (line); html_context_parse (context->htmlctxt, (gchar *) unescaped, strlen (unescaped)); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (context->lang_list) state->language_list = context->lang_list; @@ -1169,7 +1169,7 @@ parse_sami (ParserState * state, const gchar * line) } #endif g_free (unescaped); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION if (context->desired_language && context->current_language) { if (!strcmp(context->current_language, context->desired_language)) { #endif @@ -1186,7 +1186,7 @@ parse_sami (ParserState * state, const gchar * line) state->duration = context->time2 - context->time1; context->has_result = FALSE; } -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION } } #endif diff --git a/gst/subparse/samiparse.h b/gst/subparse/samiparse.h index 7c1a578..060e6cb 100644 --- a/gst/subparse/samiparse.h +++ b/gst/subparse/samiparse.h @@ -31,7 +31,7 @@ void sami_context_init (ParserState * state); void sami_context_deinit (ParserState * state); void sami_context_reset (ParserState * state); -#ifdef GST_TIZEN_SUBPARSE_MODIFICATION +#ifdef TIZEN_FEATURE_SUBPARSE_MODIFICATION void sami_context_change_language (ParserState * state); #endif diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 554d336..3fef934 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -5538,7 +5538,7 @@ plugin_init (GstPlugin * plugin) au_type_find, "au,snd", AU_CAPS, NULL, NULL); TYPE_FIND_REGISTER_RIFF (plugin, "video/x-msvideo", GST_RANK_PRIMARY, "avi", "AVI "); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER_RIFF (plugin, "audio/qcelp", GST_RANK_PRIMARY, "qcp", "QLCM"); TYPE_FIND_REGISTER_RIFF (plugin, "video/x-cdxa", GST_RANK_PRIMARY, @@ -5559,7 +5559,7 @@ plugin_init (GstPlugin * plugin) "mid,midi", "RMID"); TYPE_FIND_REGISTER (plugin, "audio/mobile-xmf", GST_RANK_PRIMARY, mxmf_type_find, "mxmf", MXMF_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "video/x-fli", GST_RANK_MARGINAL, flx_type_find, "flc,fli", FLX_CAPS, NULL, NULL); #endif @@ -5569,7 +5569,7 @@ plugin_init (GstPlugin * plugin) id3v1_type_find, "mp3,mp2,mp1,mpga,ogg,flac,tta", ID3_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "application/x-apetag", GST_RANK_PRIMARY + 102, apetag_type_find, "mp3,ape,mpc,wv", APETAG_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "audio/x-ttafile", GST_RANK_PRIMARY, tta_type_find, "tta", TTA_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "audio/x-mod", GST_RANK_SECONDARY, mod_type_find, @@ -5582,11 +5582,11 @@ plugin_init (GstPlugin * plugin) "ac3,eac3", AC3_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "audio/x-dts", GST_RANK_SECONDARY, dts_type_find, "dts", DTS_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "audio/x-gsm", GST_RANK_PRIMARY, NULL, "gsm", GSM_CAPS, NULL, NULL); #endif -#ifdef GST_TIZEN_TV +#ifdef TIZEN_PROFILE_TV TYPE_FIND_REGISTER (plugin, "video/mpeg-sys", GST_RANK_PRIMARY, mpeg_sys_type_find, "mpe,mpeg,mpg", MPEG_SYS_CAPS, NULL, NULL); #endif @@ -5615,7 +5615,7 @@ plugin_init (GstPlugin * plugin) q3gp_type_find, "3gp", Q3GP_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "video/quicktime", GST_RANK_PRIMARY, qt_type_find, "mov,mp4", QT_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "image/x-quicktime", GST_RANK_SECONDARY, qtif_type_find, "qif,qtif,qti", QTIF_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "image/jp2", GST_RANK_PRIMARY, @@ -5631,7 +5631,7 @@ plugin_init (GstPlugin * plugin) TYPE_FIND_REGISTER_START_WITH (plugin, "application/x-pn-realaudio", GST_RANK_SECONDARY, "ra,ram,rm,rmvb", ".ra\375", 4, GST_TYPE_FIND_MAXIMUM); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "application/x-shockwave-flash", GST_RANK_SECONDARY, swf_type_find, "swf,swfl", SWF_CAPS, NULL, NULL); #endif @@ -5648,7 +5648,7 @@ plugin_init (GstPlugin * plugin) "txt", UTF16_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "text/utf-32", GST_RANK_MARGINAL, utf32_type_find, "txt", UTF32_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "text/uri-list", GST_RANK_MARGINAL, uri_type_find, "ram", URI_CAPS, NULL, NULL); #endif @@ -5656,7 +5656,7 @@ plugin_init (GstPlugin * plugin) hls_type_find, "m3u8", HLS_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "application/sdp", GST_RANK_SECONDARY, sdp_type_find, "sdp", SDP_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "application/smil", GST_RANK_SECONDARY, smil_type_find, "smil", SMIL_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "application/ttml+xml", GST_RANK_SECONDARY, @@ -5666,7 +5666,7 @@ plugin_init (GstPlugin * plugin) #endif TYPE_FIND_REGISTER_RIFF (plugin, "audio/x-wav", GST_RANK_PRIMARY, "wav", "WAVE"); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "audio/x-aiff", GST_RANK_SECONDARY, aiff_type_find, "aiff,aif,aifc", AIFF_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "audio/x-svx", GST_RANK_SECONDARY, svx_type_find, @@ -5698,7 +5698,7 @@ plugin_init (GstPlugin * plugin) "png", "\211PNG\015\012\032\012", 8, GST_TYPE_FIND_MAXIMUM); TYPE_FIND_REGISTER (plugin, "image/bmp", GST_RANK_PRIMARY, bmp_type_find, "bmp", BMP_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "image/tiff", GST_RANK_PRIMARY, tiff_type_find, "tif,tiff", TIFF_CAPS, NULL, NULL); TYPE_FIND_REGISTER_RIFF (plugin, "image/webp", GST_RANK_PRIMARY, @@ -5710,7 +5710,7 @@ plugin_init (GstPlugin * plugin) pnm_type_find, "pnm,ppm,pgm,pbm", PNM_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "video/x-matroska", GST_RANK_PRIMARY, matroska_type_find, "mkv,mka,mk3d,webm", MATROSKA_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "application/mxf", GST_RANK_PRIMARY, mxf_type_find, "mxf", MXF_CAPS, NULL, NULL); TYPE_FIND_REGISTER_START_WITH (plugin, "video/x-mve", GST_RANK_SECONDARY, @@ -5723,7 +5723,7 @@ plugin_init (GstPlugin * plugin) "amr", "#!AMR", 5, GST_TYPE_FIND_LIKELY); TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-amr-wb-sh", GST_RANK_PRIMARY, "amr", "#!AMR-WB", 7, GST_TYPE_FIND_MAXIMUM); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "audio/iLBC-sh", GST_RANK_PRIMARY, ilbc_type_find, "ilbc", ILBC_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "audio/x-sbc", GST_RANK_MARGINAL, sbc_type_find, @@ -5757,7 +5757,7 @@ plugin_init (GstPlugin * plugin) vorbis_type_find, NULL, VORBIS_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "video/x-theora", GST_RANK_PRIMARY, theora_type_find, NULL, THEORA_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "application/x-ogm-video", GST_RANK_PRIMARY, ogmvideo_type_find, NULL, OGMVIDEO_CAPS, NULL, NULL); TYPE_FIND_REGISTER (plugin, "application/x-ogm-audio", GST_RANK_PRIMARY, @@ -5777,7 +5777,7 @@ plugin_init (GstPlugin * plugin) #endif TYPE_FIND_REGISTER (plugin, "audio/aac", GST_RANK_SECONDARY, aac_type_find, "aac,adts,adif,loas", AAC_CAPS, NULL, NULL); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER_START_WITH (plugin, "audio/x-spc", GST_RANK_SECONDARY, "spc", "SNES-SPC700 Sound File Data", 27, GST_TYPE_FIND_MAXIMUM); TYPE_FIND_REGISTER (plugin, "audio/x-wavpack", GST_RANK_SECONDARY, @@ -5833,7 +5833,7 @@ plugin_init (GstPlugin * plugin) TYPE_FIND_REGISTER_START_WITH (plugin, "application/octet-stream", GST_RANK_SECONDARY, "DS_Store", "\000\000\000\001Bud1", 8, GST_TYPE_FIND_LIKELY); -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER_START_WITH (plugin, "image/vnd.adobe.photoshop", GST_RANK_SECONDARY, "psd", "8BPS\000\001\000\000\000\000", 10, GST_TYPE_FIND_LIKELY); @@ -5850,7 +5850,7 @@ plugin_init (GstPlugin * plugin) xdgmime_typefind, NULL, NULL, NULL, NULL); #endif -#ifndef GST_EXT_MIME_TYPES +#ifndef TIZEN_FEATURE_DISABLE_MIME_TYPES TYPE_FIND_REGISTER (plugin, "image/x-degas", GST_RANK_MARGINAL, degas_type_find, NULL, NULL, NULL, NULL); #endif diff --git a/packaging/gst-plugins-base.spec b/packaging/gst-plugins-base.spec index 1a93bad..abb6e09 100644 --- a/packaging/gst-plugins-base.spec +++ b/packaging/gst-plugins-base.spec @@ -5,7 +5,7 @@ Name: gst-plugins-base Version: 1.6.1 -Release: 5 +Release: 6 License: LGPL-2.0+ Summary: GStreamer Streaming-Media Framework Plug-Ins Url: http://gstreamer.freedesktop.org/ @@ -70,18 +70,19 @@ to compile and link applications that use gstreamer-plugins-base. export V=1 NOCONFIGURE=1 ./autogen.sh export CFLAGS="%{optflags} -fno-strict-aliasing\ - -DGST_EXT_WAYLAND_ENHANCEMENT\ + -DTIZEN_FEATURE_WAYLAND_ENHANCEMENT\ %if "%{?profile}" == "tv" - -DGST_TIZEN_TV\ + -DTIZEN_PROFILE_TV\ %endif %ifarch %{arm} - -DGST_EXT_AUDIODECODER_MODIFICATION\ - -DGST_EXT_LINK_FIMCCONVERT\ - -DGST_EXT_MIME_TYPES\ - -DGST_TIZEN_MODIFICATION\ - -DGST_TIZEN_SUBPARSE_MODIFICATION\ + -DTIZEN_FEATURE_AUDIODECODER_MODIFICATION\ + -DTIZEN_FEATURE_DISABLE_MIME_TYPES\ + -DTIZEN_FEATURE_MQ_MODIFICATION\ + -DTIZEN_FEATURE_VIDEO_MODIFICATION\ + -DTIZEN_FEATURE_SUBPARSE_MODIFICATION\ %endif " + %configure\ --disable-static\ --enable-experimental\