From 65565c8a1e586585bb6ff74545d3e52d979a8e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Fri, 11 Mar 2011 17:45:37 +0000 Subject: [PATCH 01/23] mad: build the mad plugin even if libid3tag is not available ID3 tags are usually handled by id3demux, and should be handled by id3demux. Tag handling in mad based on libid3tag is very basic and mostly unnecessary really, so just build this plugin without ID3 tag support if libid3tag is not available. --- configure.ac | 27 +++++++++-------- ext/mad/gstmad.c | 78 ++++++++++++++++++++++++++++-------------------- ext/mad/gstmad.h | 1 - 3 files changed, 60 insertions(+), 46 deletions(-) diff --git a/configure.ac b/configure.ac index 3a33718afd..ad578040f0 100644 --- a/configure.ac +++ b/configure.ac @@ -326,20 +326,23 @@ AG_GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [ ]) fi + dnl check with pkg-config first + AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15) + MAD_LIBS="$MAD_LIBS $ID3TAG_LIBS" + if test "x$HAVE_MAD" = "xno"; then + dnl fall back to oldskool detection + AC_CHECK_HEADER(mad.h, [ + AC_CHECK_LIB(mad, mad_decoder_finish, + HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS") + ]) + fi + if test "x$HAVE_ID3TAG" = "xyes"; then - dnl check with pkg-config first - AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15) - MAD_LIBS="$MAD_LIBS $ID3TAG_LIBS" - if test "x$HAVE_MAD" = "xno"; then - dnl fall back to oldskool detection - AC_CHECK_HEADER(mad.h, [ - AC_CHECK_LIB(mad, mad_decoder_finish, - HAVE_MAD="yes" MAD_LIBS="-lmad $ID3TAG_LIBS") - ]) - fi + AC_DEFINE(HAVE_ID3TAG, 1, [defined if libid3tag is available]) else - HAVE_MAD="no" - AC_MSG_WARN([libid3tag not available, cannot build MAD MP3 decoder plugin]) + AC_MSG_WARN([libid3tag not available, MAD MP3 decoder will be built without + ID3 tag reading support (which is not a problem, since ID3 + tags are usually handled by id3demux)]) fi ]) AC_SUBST(MAD_LIBS) diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index 35efbb5ad6..664ab1b403 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -40,6 +40,10 @@ #include "gstmad.h" #include +#ifdef HAVE_ID3TAG +#include +#endif + enum { ARG_0, @@ -103,7 +107,9 @@ static GstStateChangeReturn gst_mad_change_state (GstElement * element, static void gst_mad_set_index (GstElement * element, GstIndex * index); static GstIndex *gst_mad_get_index (GstElement * element); +#ifdef HAVE_ID3TAG static GstTagList *gst_mad_id3_to_tag_list (const struct id3_tag *tag); +#endif GST_BOILERPLATE (GstMad, gst_mad, GstElement, GST_TYPE_ELEMENT); @@ -1514,50 +1520,54 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer) goto end; } else if (mad->stream.error == MAD_ERROR_LOSTSYNC) { /* lost sync, force a resync */ - signed long tagsize; - GST_INFO ("recoverable lost sync error"); - tagsize = id3_tag_query (mad->stream.this_frame, - mad->stream.bufend - mad->stream.this_frame); +#ifdef HAVE_ID3TAG + { + signed long tagsize; - if (tagsize > mad->tempsize) { - GST_INFO ("mad: got partial id3 tag in buffer, skipping"); - } else if (tagsize > 0) { - struct id3_tag *tag; - id3_byte_t const *data; + tagsize = id3_tag_query (mad->stream.this_frame, + mad->stream.bufend - mad->stream.this_frame); - GST_INFO ("mad: got ID3 tag size %ld", tagsize); + if (tagsize > mad->tempsize) { + GST_INFO ("mad: got partial id3 tag in buffer, skipping"); + } else if (tagsize > 0) { + struct id3_tag *tag; + id3_byte_t const *data; - data = mad->stream.this_frame; + GST_INFO ("mad: got ID3 tag size %ld", tagsize); - /* mad has moved the pointer to the next frame over the start of the - * id3 tags, so we need to flush one byte less than the tagsize */ - mad_stream_skip (&mad->stream, tagsize - 1); + data = mad->stream.this_frame; - tag = id3_tag_parse (data, tagsize); - if (tag) { - GstTagList *list; + /* mad has moved the pointer to the next frame over the start of the + * id3 tags, so we need to flush one byte less than the tagsize */ + mad_stream_skip (&mad->stream, tagsize - 1); - list = gst_mad_id3_to_tag_list (tag); - id3_tag_delete (tag); - GST_DEBUG ("found tag"); - gst_element_post_message (GST_ELEMENT (mad), - gst_message_new_tag (GST_OBJECT (mad), - gst_tag_list_copy (list))); - if (mad->tags) { - gst_tag_list_insert (mad->tags, list, GST_TAG_MERGE_PREPEND); - } else { - mad->tags = gst_tag_list_copy (list); + tag = id3_tag_parse (data, tagsize); + if (tag) { + GstTagList *list; + + list = gst_mad_id3_to_tag_list (tag); + id3_tag_delete (tag); + GST_DEBUG ("found tag"); + gst_element_post_message (GST_ELEMENT (mad), + gst_message_new_tag (GST_OBJECT (mad), + gst_tag_list_copy (list))); + if (mad->tags) { + gst_tag_list_insert (mad->tags, list, GST_TAG_MERGE_PREPEND); + } else { + mad->tags = gst_tag_list_copy (list); + } + if (mad->need_newsegment) + mad->pending_events = + g_list_append (mad->pending_events, + gst_event_new_tag (list)); + else + gst_pad_push_event (mad->srcpad, gst_event_new_tag (list)); } - if (mad->need_newsegment) - mad->pending_events = - g_list_append (mad->pending_events, - gst_event_new_tag (list)); - else - gst_pad_push_event (mad->srcpad, gst_event_new_tag (list)); } } +#endif /* HAVE_ID3TAG */ } mad_frame_mute (&mad->frame); @@ -1902,6 +1912,7 @@ gst_mad_change_state (GstElement * element, GstStateChange transition) return ret; } +#ifdef HAVE_ID3TAG /* id3 tag helper (FIXME: why does mad parse id3 tags at all? It shouldn't) */ static GstTagList * gst_mad_id3_to_tag_list (const struct id3_tag *tag) @@ -2075,6 +2086,7 @@ gst_mad_id3_to_tag_list (const struct id3_tag *tag) return tag_list; } +#endif /* HAVE_ID3TAG */ /* plugin initialisation */ diff --git a/ext/mad/gstmad.h b/ext/mad/gstmad.h index 3acc7e29d6..730911da71 100644 --- a/ext/mad/gstmad.h +++ b/ext/mad/gstmad.h @@ -24,7 +24,6 @@ #include #include #include -#include G_BEGIN_DECLS From a72cc73798938a88c1da3a4d74d17eb2df7f6b02 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Mon, 14 Mar 2011 18:39:35 +0100 Subject: [PATCH 02/23] dvdsubdec: Implement clipping if the video size is smaller than the subpicture size Fixes bug #644704. --- gst/dvdsub/gstdvdsubdec.c | 58 ++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index e1ab657090..5a2a24ed82 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -317,16 +317,10 @@ gst_dvd_sub_dec_parse_subpic (GstDvdSubDec * dec) case SPU_SET_SIZE: /* image coordinates */ PARSE_BYTES_NEEDED (7); - dec->left = - CLAMP ((((guint) buf[1]) << 4) | (buf[2] >> 4), 0, - (dec->in_width - 1)); - dec->top = - CLAMP ((((guint) buf[4]) << 4) | (buf[5] >> 4), 0, - (dec->in_height - 1)); - dec->right = - CLAMP ((((buf[2] & 0x0f) << 8) | buf[3]), 0, (dec->in_width - 1)); - dec->bottom = - CLAMP ((((buf[5] & 0x0f) << 8) | buf[6]), 0, (dec->in_height - 1)); + dec->top = ((buf[4] & 0x3f) << 4) | ((buf[5] & 0xe0) >> 4); + dec->left = ((buf[1] & 0x3f) << 4) | ((buf[2] & 0xf0) >> 4); + dec->right = ((buf[2] & 0x03) << 8) | buf[3]; + dec->bottom = ((buf[5] & 0x03) << 8) | buf[6]; GST_DEBUG_OBJECT (dec, "SPU SET_SIZE left %d, top %d, right %d, " "bottom %d", dec->left, dec->top, dec->right, dec->bottom); @@ -594,6 +588,50 @@ gst_dvd_sub_dec_merge_title (GstDvdSubDec * dec, GstBuffer * buf) state.offset[0] = dec->offset[0]; state.offset[1] = dec->offset[1]; + /* center the image when display rectangle exceeds the video width */ + if (dec->in_width <= dec->right) { + gint left, disp_width; + + disp_width = dec->right - dec->left + 1; + left = (dec->in_width - disp_width) / 2; + dec->left = left; + dec->right = left + disp_width - 1; + + /* if it clips to the right, shift it left, but only till zero */ + if (dec->right >= dec->in_width) { + gint shift = dec->right - dec->in_width - 1; + if (shift > dec->left) + shift = dec->left; + dec->left -= shift; + dec->right -= shift; + } + + GST_DEBUG_OBJECT (dec, "clipping width to %d,%d", + dec->left, dec->in_width - 1); + } + + /* for the height, bring it up till it fits as well as it can. We + * assume the picture is in the lower part. We should better check where it + * is and do something more clever. */ + if (dec->in_height <= dec->bottom) { + + /* shift it up, but only till zero */ + gint shift = dec->bottom - dec->in_height - 1; + if (shift > dec->top) + shift = dec->top; + dec->top -= shift; + dec->bottom -= shift; + + /* start on even line */ + if (dec->top & 1) { + dec->top--; + dec->bottom--; + } + + GST_DEBUG_OBJECT (dec, "clipping height to %d,%d", + dec->top, dec->in_height - 1); + } + if (dec->current_button) { hl_top = dec->hl_top; hl_bottom = dec->hl_bottom; From 1c1868682e4923e9c8c6fccb477c274a4a86ec17 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Tue, 15 Mar 2011 10:59:23 +0100 Subject: [PATCH 03/23] dvdsubdec: Output only a single buffer per subpicture and set the correct duration Fixes bug #619136. --- gst/dvdsub/gstdvdsubdec.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 5a2a24ed82..5b53f39eeb 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -734,13 +734,20 @@ gst_send_subtitle_frame (GstDvdSubDec * dec, GstClockTime end_ts) dec->out_buffer = out_buf; dec->buf_dirty = FALSE; + } else { + goto out; } out_buf = gst_buffer_create_sub (dec->out_buffer, 0, GST_BUFFER_SIZE (dec->out_buffer)); GST_BUFFER_TIMESTAMP (out_buf) = dec->next_ts; - GST_BUFFER_DURATION (out_buf) = GST_CLOCK_DIFF (dec->next_ts, end_ts); + if (GST_CLOCK_TIME_IS_VALID (dec->next_event_ts)) { + GST_BUFFER_DURATION (out_buf) = GST_CLOCK_DIFF (dec->next_ts, + dec->next_event_ts); + } else { + GST_BUFFER_DURATION (out_buf) = GST_CLOCK_TIME_NONE; + } GST_DEBUG_OBJECT (dec, "Sending subtitle buffer with ts %" GST_TIME_FORMAT ", dur %" G_GINT64_FORMAT, From 101e8a024ff547f81ca34073de454f89e465aa63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 15 Mar 2011 11:02:42 +0100 Subject: [PATCH 04/23] dvdsubdec: Rearrange buffer allocation and pushing code a bit This makes the code easier to read, doesn't store every buffer in the instance until the next buffer is to be drawn and fixes an unitialized variable compiler warning. --- gst/dvdsub/gstdvdsubdec.c | 89 +++++++++++++++++---------------------- gst/dvdsub/gstdvdsubdec.h | 1 - 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c index 5b53f39eeb..868d5b38ba 100644 --- a/gst/dvdsub/gstdvdsubdec.c +++ b/gst/dvdsub/gstdvdsubdec.c @@ -164,7 +164,6 @@ gst_dvd_sub_dec_init (GstDvdSubDec * dec, GstDvdSubDecClass * klass) dec->next_ts = 0; dec->next_event_ts = GST_CLOCK_TIME_NONE; - dec->out_buffer = NULL; dec->buf_dirty = TRUE; dec->use_ARGB = FALSE; } @@ -689,57 +688,48 @@ gst_send_subtitle_frame (GstDvdSubDec * dec, GstClockTime end_ts) g_assert (dec->next_ts <= end_ts); /* Check if we need to redraw the output buffer */ - if (dec->buf_dirty) { - if (dec->out_buffer) { - gst_buffer_unref (dec->out_buffer); - dec->out_buffer = NULL; - } - - flow = gst_pad_alloc_buffer_and_set_caps (dec->srcpad, 0, - 4 * dec->in_width * dec->in_height, GST_PAD_CAPS (dec->srcpad), - &out_buf); - - if (flow != GST_FLOW_OK) { - GST_DEBUG_OBJECT (dec, "alloc buffer failed: flow = %s", - gst_flow_get_name (flow)); - goto out; - } - - /* Clear the buffer */ - /* FIXME - move this into the buffer rendering code */ - for (y = 0; y < dec->in_height; y++) { - guchar *line = GST_BUFFER_DATA (out_buf) + 4 * dec->in_width * y; - - for (x = 0; x < dec->in_width; x++) { - line[0] = 0; /* A */ - if (!dec->use_ARGB) { - line[1] = 16; /* Y */ - line[2] = 128; /* U */ - line[3] = 128; /* V */ - } else { - line[1] = 0; /* R */ - line[2] = 0; /* G */ - line[3] = 0; /* B */ - } - - line += 4; - } - } - - /* FIXME: do we really want to honour the forced_display flag - * for subtitles streans? */ - if (dec->visible || dec->forced_display) { - gst_dvd_sub_dec_merge_title (dec, out_buf); - } - - dec->out_buffer = out_buf; - dec->buf_dirty = FALSE; - } else { + if (!dec->buf_dirty) { + flow = GST_FLOW_OK; goto out; } - out_buf = gst_buffer_create_sub (dec->out_buffer, 0, - GST_BUFFER_SIZE (dec->out_buffer)); + flow = gst_pad_alloc_buffer_and_set_caps (dec->srcpad, 0, + 4 * dec->in_width * dec->in_height, GST_PAD_CAPS (dec->srcpad), &out_buf); + + if (flow != GST_FLOW_OK) { + GST_DEBUG_OBJECT (dec, "alloc buffer failed: flow = %s", + gst_flow_get_name (flow)); + goto out; + } + + /* Clear the buffer */ + /* FIXME - move this into the buffer rendering code */ + for (y = 0; y < dec->in_height; y++) { + guchar *line = GST_BUFFER_DATA (out_buf) + 4 * dec->in_width * y; + + for (x = 0; x < dec->in_width; x++) { + line[0] = 0; /* A */ + if (!dec->use_ARGB) { + line[1] = 16; /* Y */ + line[2] = 128; /* U */ + line[3] = 128; /* V */ + } else { + line[1] = 0; /* R */ + line[2] = 0; /* G */ + line[3] = 0; /* B */ + } + + line += 4; + } + } + + /* FIXME: do we really want to honour the forced_display flag + * for subtitles streans? */ + if (dec->visible || dec->forced_display) { + gst_dvd_sub_dec_merge_title (dec, out_buf); + } + + dec->buf_dirty = FALSE; GST_BUFFER_TIMESTAMP (out_buf) = dec->next_ts; if (GST_CLOCK_TIME_IS_VALID (dec->next_event_ts)) { @@ -759,7 +749,6 @@ gst_send_subtitle_frame (GstDvdSubDec * dec, GstClockTime end_ts) flow = gst_pad_push (dec->srcpad, out_buf); out: - dec->next_ts = end_ts; return flow; } diff --git a/gst/dvdsub/gstdvdsubdec.h b/gst/dvdsub/gstdvdsubdec.h index bd2af43110..52ea126885 100644 --- a/gst/dvdsub/gstdvdsubdec.h +++ b/gst/dvdsub/gstdvdsubdec.h @@ -89,7 +89,6 @@ struct _GstDvdSubDec GstClockTime next_event_ts; - GstBuffer *out_buffer; gboolean buf_dirty; }; From 004633d06b868b57fab7c53bda5eb953669de1ae Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Fri, 18 Mar 2011 19:34:57 +0100 Subject: [PATCH 05/23] autogen: wingo signed comment --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 8953133203..9a0ebde35b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -81,7 +81,7 @@ tool_run "$libtoolize" "--copy --force" tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS" tool_run "$autoheader" -# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo +# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode echo timestamp > stamp-h.in 2> /dev/null tool_run "$autoconf" From bfff921b4417abbfdeb6c5a7d3ce2f82eb72e00d Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Tue, 22 Mar 2011 12:59:33 +0100 Subject: [PATCH 06/23] configure.ac: redundant use of AC_MSG_RESULT() cleaned the redundant use of AC_MSG_RESULT() in configure.ac --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index ad578040f0..5ae77284cc 100644 --- a/configure.ac +++ b/configure.ac @@ -365,7 +365,6 @@ AG_GST_CHECK_FEATURE(TWOLAME, [twolame], twolame, [ PKG_CHECK_MODULES(TWOLAME, twolame >= 0.3.10, [ HAVE_TWOLAME="yes"], [ HAVE_TWOLAME="no" - AC_MSG_RESULT(no) ]) AC_SUBST(TWOLAME_CFLAGS) AC_SUBST(TWOLAME_LIBS) From 83de57faa319a48d8a0b81e608dfb7e93cb54f84 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 24 Mar 2011 18:50:17 +0200 Subject: [PATCH 07/23] Automatic update of common submodule From 6aec6b9 to 6aaa286 --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 6aec6b9716..6aaa286970 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6aec6b9716c184c60c4bc6a5916a2471cfa8c8cd +Subproject commit 6aaa286970e59ed89bd69544f2ee10551f377cb6 From 9f5071099bdbff0c355315eefbf0368ccb5119c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 25 Mar 2011 09:09:29 +0100 Subject: [PATCH 08/23] Automatic update of common submodule From 6aaa286 to d8814b6 --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 6aaa286970..d8814b6c7f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6aaa286970e59ed89bd69544f2ee10551f377cb6 +Subproject commit d8814b6c7fb8e037bd19bff6a2698f55ddb2b311 From d57141d9ce583645e7e837c79b5f89874b45addd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 25 Mar 2011 09:33:04 +0100 Subject: [PATCH 09/23] Automatic update of common submodule From d8814b6 to b77e2bf --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index d8814b6c7f..b77e2bfbb7 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d8814b6c7fb8e037bd19bff6a2698f55ddb2b311 +Subproject commit b77e2bfbb78e1093d39b7714572ed364e46df53c From b7516b9eb41c78135cd319729971851e04eaf25f Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Fri, 25 Mar 2011 14:57:00 +0200 Subject: [PATCH 10/23] Automatic update of common submodule From b77e2bf to 193b717 --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index b77e2bfbb7..193b7176e6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit b77e2bfbb78e1093d39b7714572ed364e46df53c +Subproject commit 193b7176e61160d78a967884f1b20af76d1c7379 From b9032ab93f811bc185af54a2e23d671b553d6653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 25 Mar 2011 22:34:31 +0100 Subject: [PATCH 11/23] Automatic update of common submodule From 193b717 to 1ccbe09 --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 193b7176e6..1ccbe098d6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 193b7176e61160d78a967884f1b20af76d1c7379 +Subproject commit 1ccbe098d6379612fcef09f4000da23585af980a From 1370f3f161ff36d0e31f65dae5c7efed5a6f6648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 21 Sep 2010 19:20:29 -0400 Subject: [PATCH 12/23] x264enc: Make it clear that constant quantizer is for debugging only https://bugzilla.gnome.org/show_bug.cgi?id=621663 --- ext/x264/gstx264enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 4617f23237..c1424e3678 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -232,7 +232,7 @@ gst_x264_enc_pass_get_type (void) static const GEnumValue pass_types[] = { {GST_X264_ENC_PASS_CBR, "Constant Bitrate Encoding", "cbr"}, - {GST_X264_ENC_PASS_QUANT, "Constant Quantizer", "quant"}, + {GST_X264_ENC_PASS_QUANT, "Constant Quantizer (debugging only)", "quant"}, {GST_X264_ENC_PASS_QUAL, "Constant Quality", "qual"}, {GST_X264_ENC_PASS_PASS1, "VBR Encoding - Pass 1", "pass1"}, {GST_X264_ENC_PASS_PASS2, "VBR Encoding - Pass 2", "pass2"}, From a4df8f90310ddfb7997d19435ced80a3b4902e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 21 Sep 2010 19:33:10 -0400 Subject: [PATCH 13/23] x264enc: Set max bitrate in quality mode https://bugzilla.gnome.org/show_bug.cgi?id=621663 --- ext/x264/gstx264enc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index c1424e3678..82b1696c6a 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -31,7 +31,7 @@ * of the encoding. This will similarly be the case if this target bitrate * is to obtained in multiple (2 or 3) pass encoding. * Alternatively, one may choose to perform Constant Quantizer or Quality encoding, - * in which case the #GstX264Enc:quantizer property controls much of the outcome. + * in which case the #GstX264Enc:quantizer property controls much of the outcome, in that case #GstX264Enc:bitrate is the maximum bitrate. * * The H264 profile that is eventually used depends on a few settings. * If #GstX264Enc:dct8x8 is enabled, then High profile is used. @@ -1131,6 +1131,10 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder) case GST_X264_ENC_PASS_QUAL: encoder->x264param.rc.i_rc_method = X264_RC_CRF; encoder->x264param.rc.f_rf_constant = encoder->quantizer; + encoder->x264param.rc.i_vbv_max_bitrate = encoder->bitrate; + encoder->x264param.rc.i_vbv_buffer_size + = encoder->x264param.rc.i_vbv_max_bitrate + * encoder->vbv_buf_capacity / 1000; break; case GST_X264_ENC_PASS_CBR: case GST_X264_ENC_PASS_PASS1: From 62e35a6b40feb7bb5d080cd2660b4ebe8fb107d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Tue, 21 Sep 2010 20:14:04 -0400 Subject: [PATCH 14/23] x264enc: Allow changing the bitrate and quantitizers dynamically https://bugzilla.gnome.org/show_bug.cgi?id=621663 --- ext/x264/gstx264enc.c | 54 +++++++++++++++++++++++++++++++++++++++---- ext/x264/gstx264enc.h | 3 +++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 82b1696c6a..0259c0b826 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -574,12 +574,14 @@ gst_x264_enc_class_init (GstX264EncClass * klass) g_object_class_install_property (gobject_class, ARG_BITRATE, g_param_spec_uint ("bitrate", "Bitrate", "Bitrate in kbit/sec", 1, 100 * 1024, ARG_BITRATE_DEFAULT, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | + GST_PARAM_MUTABLE_PLAYING)); g_object_class_install_property (gobject_class, ARG_VBV_BUF_CAPACITY, g_param_spec_uint ("vbv-buf-capacity", "VBV buffer capacity", "Size of the VBV buffer in milliseconds", 0, 10000, ARG_VBV_BUF_CAPACITY_DEFAULT, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | + GST_PARAM_MUTABLE_PLAYING)); #ifdef X264_PRESETS g_object_class_install_property (gobject_class, ARG_SPEED_PRESET, @@ -1209,6 +1211,8 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder) } #endif /* X264_PRESETS */ + encoder->reconfig = FALSE; + GST_OBJECT_UNLOCK (encoder); encoder->x264enc = x264_encoder_open (&encoder->x264param); @@ -1621,6 +1625,14 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in, if (G_UNLIKELY (encoder->x264enc == NULL)) return GST_FLOW_NOT_NEGOTIATED; + GST_OBJECT_LOCK (encoder); + if (encoder->reconfig) { + encoder->reconfig = FALSE; + if (x264_encoder_reconfig (encoder->x264enc, &encoder->x264param) < 0) + GST_WARNING_OBJECT (encoder, "Could not reconfigure"); + } + GST_OBJECT_UNLOCK (encoder); + encoder_return = x264_encoder_encode (encoder->x264enc, &nal, i_nal, pic_in, &pic_out); @@ -1759,6 +1771,35 @@ out: return ret; } + + +static void +gst_x264_enc_reconfig (GstX264Enc * encoder) +{ + switch (encoder->pass) { + case GST_X264_ENC_PASS_QUAL: + encoder->x264param.rc.f_rf_constant = encoder->quantizer; + encoder->x264param.rc.i_vbv_max_bitrate = encoder->bitrate; + encoder->x264param.rc.i_vbv_buffer_size + = encoder->x264param.rc.i_vbv_max_bitrate + * encoder->vbv_buf_capacity / 1000; + break; + case GST_X264_ENC_PASS_CBR: + case GST_X264_ENC_PASS_PASS1: + case GST_X264_ENC_PASS_PASS2: + case GST_X264_ENC_PASS_PASS3: + default: + encoder->x264param.rc.i_bitrate = encoder->bitrate; + encoder->x264param.rc.i_vbv_max_bitrate = encoder->bitrate; + encoder->x264param.rc.i_vbv_buffer_size + = encoder->x264param.rc.i_vbv_max_bitrate + * encoder->vbv_buf_capacity / 1000; + break; + } + + encoder->reconfig = TRUE; +} + static void gst_x264_enc_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) @@ -1773,8 +1814,10 @@ gst_x264_enc_set_property (GObject * object, guint prop_id, GST_OBJECT_LOCK (encoder); /* state at least matters for sps, bytestream, pass, * and so by extension ... */ + state = GST_STATE (encoder); - if (state != GST_STATE_READY && state != GST_STATE_NULL) + if ((state != GST_STATE_READY && state != GST_STATE_NULL) && + !(pspec->flags & GST_PARAM_MUTABLE_PLAYING)) goto wrong_state; switch (prop_id) { @@ -1783,12 +1826,15 @@ gst_x264_enc_set_property (GObject * object, guint prop_id, break; case ARG_QUANTIZER: encoder->quantizer = g_value_get_uint (value); + gst_x264_enc_reconfig (encoder); break; case ARG_BITRATE: encoder->bitrate = g_value_get_uint (value); + gst_x264_enc_reconfig (encoder); break; case ARG_VBV_BUF_CAPACITY: encoder->vbv_buf_capacity = g_value_get_uint (value); + gst_x264_enc_reconfig (encoder); break; case ARG_SPEED_PRESET: encoder->speed_preset = g_value_get_enum (value); @@ -1971,7 +2017,7 @@ gst_x264_enc_set_property (GObject * object, guint prop_id, /* ERROR */ wrong_state: { - GST_DEBUG_OBJECT (encoder, "setting property in wrong state"); + GST_WARNING_OBJECT (encoder, "setting property in wrong state"); GST_OBJECT_UNLOCK (encoder); } } diff --git a/ext/x264/gstx264enc.h b/ext/x264/gstx264enc.h index 03aafc0bdc..01cd27de1f 100644 --- a/ext/x264/gstx264enc.h +++ b/ext/x264/gstx264enc.h @@ -112,6 +112,9 @@ struct _GstX264Enc gint i_type; GstEvent *forcekeyunit_event; + + /* configuration changed while playing */ + gboolean reconfig; }; struct _GstX264EncClass From ea8491c73fbdd3597e942b38d89098055c137ce9 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 4 Apr 2011 15:57:58 +0300 Subject: [PATCH 15/23] Automatic update of common submodule From 1ccbe09 to c3cafe1 --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 1ccbe098d6..c3cafe123f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 1ccbe098d6379612fcef09f4000da23585af980a +Subproject commit c3cafe123f3a363d337a29ad32fdd6d3631f52c0 From 9811a3ccf5b9c727f93bb8c80b5cfb7ca25a6189 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sun, 10 Apr 2011 18:34:11 -0400 Subject: [PATCH 16/23] android: remove the android/ folder --- android/NOTICE | 504 -------------------------------------- android/amrnb.mk | 48 ---- android/amrwbdec.mk | 47 ---- android/asf.mk | 58 ----- android/mpegaudioparse.mk | 48 ---- 5 files changed, 705 deletions(-) delete mode 100644 android/NOTICE delete mode 100644 android/amrnb.mk delete mode 100644 android/amrwbdec.mk delete mode 100644 android/asf.mk delete mode 100644 android/mpegaudioparse.mk diff --git a/android/NOTICE b/android/NOTICE deleted file mode 100644 index 8add30ad59..0000000000 --- a/android/NOTICE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/android/amrnb.mk b/android/amrnb.mk deleted file mode 100644 index c3f5432453..0000000000 --- a/android/amrnb.mk +++ /dev/null @@ -1,48 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -amrnb_LOCAL_SRC_FILES:= \ - amrnb.c \ - amrnbdec.c \ - amrnbenc.c - -LOCAL_SRC_FILES:= $(addprefix ../ext/amrnb/,$(amrnb_LOCAL_SRC_FILES)) - -LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libopencore-amrnb - -LOCAL_MODULE:= libgstamrnb - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include \ - $(TARGET_OUT_HEADERS) - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 - -include $(BUILD_SHARED_LIBRARY) diff --git a/android/amrwbdec.mk b/android/amrwbdec.mk deleted file mode 100644 index f9acd4fab3..0000000000 --- a/android/amrwbdec.mk +++ /dev/null @@ -1,47 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -amrnb_LOCAL_SRC_FILES:= \ - amrwb.c \ - amrwbdec.c - -LOCAL_SRC_FILES:= $(addprefix ../ext/amrwbdec/,$(amrnb_LOCAL_SRC_FILES)) - -LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libopencore-amrwb - -LOCAL_MODULE:= libgstamrwbdec - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include \ - $(TARGET_OUT_HEADERS) - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 - -include $(BUILD_SHARED_LIBRARY) diff --git a/android/asf.mk b/android/asf.mk deleted file mode 100644 index 19a117f7f9..0000000000 --- a/android/asf.mk +++ /dev/null @@ -1,58 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -asf_LOCAL_SRC_FILES:= \ - gst/asfdemux/gstasfdemux.c \ - gst/asfdemux/gstasf.c \ - gst/asfdemux/asfheaders.c \ - gst/asfdemux/asfpacket.c \ - gst/asfdemux/gstrtspwms.c \ - gst/asfdemux/gstrtpasfdepay.c - -LOCAL_SRC_FILES:= $(addprefix ../,$(asf_LOCAL_SRC_FILES)) - -LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 \ - libgstriff-0.10 \ - libgstaudio-0.10 \ - libgstinterfaces-0.10 \ - libgsttag-0.10 \ - libgstrtsp-0.10 \ - libgstsdp-0.10 \ - libgstrtp-0.10 - -LOCAL_MODULE:= libgstasf - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/asfdemux \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../gst-libs \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 - -include $(BUILD_SHARED_LIBRARY) diff --git a/android/mpegaudioparse.mk b/android/mpegaudioparse.mk deleted file mode 100644 index 691ae52f4e..0000000000 --- a/android/mpegaudioparse.mk +++ /dev/null @@ -1,48 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -mpegaudioparse_LOCAL_SRC_FILES:= \ - gst/mpegaudioparse/plugin.c \ - gst/mpegaudioparse/gstmpegaudioparse.c \ - gst/mpegaudioparse/gstxingmux.c - -LOCAL_SRC_FILES:= $(addprefix ../,$(mpegaudioparse_LOCAL_SRC_FILES)) - - -LOCAL_SHARED_LIBRARIES := \ - libgstreamer-0.10 \ - libgstbase-0.10 \ - libglib-2.0 \ - libgthread-2.0 \ - libgmodule-2.0 \ - libgobject-2.0 - -LOCAL_MODULE:= libgstmpegaudioparse - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../gst/mpegaudioparse \ - $(LOCAL_PATH)/.. \ - $(LOCAL_PATH) \ - $(TARGET_OUT_HEADERS)/gstreamer-0.10 \ - $(TARGET_OUT_HEADERS)/glib-2.0 \ - $(TARGET_OUT_HEADERS)/glib-2.0/glib \ - external/libxml2/include - -ifeq ($(STECONF_ANDROID_VERSION),"FROYO") -LOCAL_SHARED_LIBRARIES += libicuuc -LOCAL_C_INCLUDES += external/icu4c/common -endif - -LOCAL_CFLAGS := -DHAVE_CONFIG_H -# -# define LOCAL_PRELINK_MODULE to false to not use pre-link map -# -LOCAL_PRELINK_MODULE := false - -#It's a gstreamer plugins, and it must be installed on ..../lib/gstreamer-0.10 -LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/gstreamer-0.10 - -include $(BUILD_SHARED_LIBRARY) From 1e6a607e0189e56ae9295691932fbaa475ac7cb6 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sun, 10 Apr 2011 18:24:22 -0400 Subject: [PATCH 17/23] android: make it ready for androgenizer To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files. Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git --- Android.mk | 60 ++++++++++++++++++++++++++++------ ext/mad/Makefile.am | 15 +++++++++ ext/x264/Makefile.am | 14 ++++++++ gst/asfdemux/Makefile.am | 14 ++++++++ gst/dvdlpcmdec/Makefile.am | 14 ++++++++ gst/dvdsub/Makefile.am | 14 ++++++++ gst/iec958/Makefile.am | 14 ++++++++ gst/mpegaudioparse/Makefile.am | 14 ++++++++ gst/mpegstream/Makefile.am | 14 ++++++++ gst/realmedia/Makefile.am | 13 ++++++++ gst/synaesthesia/Makefile.am | 14 ++++++++ 11 files changed, 190 insertions(+), 10 deletions(-) diff --git a/Android.mk b/Android.mk index d8a9773dbc..437f369a52 100644 --- a/Android.mk +++ b/Android.mk @@ -1,12 +1,52 @@ LOCAL_PATH := $(call my-dir) - -GSTREAMER_TOP := $(LOCAL_PATH) - include $(CLEAR_VARS) -#dependancy library -#include $(GSTREAMER_TOP)/android/amrnb_library.mk -#plugins -include $(GSTREAMER_TOP)/android/mpegaudioparse.mk -include $(GSTREAMER_TOP)/android/asf.mk -#include $(GSTREAMER_TOP)/android/amrnb.mk -#include $(GSTREAMER_TOP)/android/amrwbdec.mk + +GST_PLUGINS_UGLY_TOP := $(LOCAL_PATH) + +GST_PLUGINS_UGLY_BUILT_SOURCES = \ + ext/mad/Android.mk \ + gst/synaesthesia/Android.mk \ + gst/iec958/Android.mk \ + gst/mpegaudioparse/Android.mk \ + gst/mpegstream/Android.mk \ + gst/realmedia/Android.mk \ + gst/dvdsub/Android.mk \ + gst/dvdlpcmdec/Android.mk \ + gst/asfdemux/Android.mk \ + ext/x264/Android.mk + +GST_PLUGINS_UGLY_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_UGLY_TOP))/%, $(GST_PLUGINS_UGLY_BUILT_SOURCES)) + +.PHONY: gst-plugins-ugly-configure gst-plugins-ugly-configure-real + +gst-plugins-ugly-configure-real: + cd $(GST_PLUGINS_UGLY_TOP) ; \ + CC="$(CONFIGURE_CC)" \ + CFLAGS="$(CONFIGURE_CFLAGS)" \ + LD=$(TARGET_LD) \ + LDFLAGS="$(CONFIGURE_LDFLAGS)" \ + CPP=$(CONFIGURE_CPP) \ + CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \ + PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \ + PKG_CONFIG_TOP_BUILD_DIR=/ \ + $(abspath $(GST_PLUGINS_UGLY_TOP))/$(CONFIGURE) --host=arm-linux-androideabi \ + --prefix=/system --disable-orc --disable-valgrind --disable-gtk-doc && \ + for file in $(GST_PLUGINS_UGLY_BUILT_SOURCES); do \ + rm -f $$file && \ + make -C $$(dirname $$file) $$(basename $$file) ; \ + done + +gst-plugins-ugly-configure: gst-plugins-ugly-configure-real + +CONFIGURE_TARGETS += gst-plugins-ugly-configure + +-include $(GST_PLUGINS_UGLY_TOP)/ext/mad/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/ext/x264/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/synaesthesia/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/iec958/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/mpegaudioparse/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/mpegstream/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/realmedia/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/dvdsub/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/dvdlpcmdec/Android.mk +-include $(GST_PLUGINS_UGLY_TOP)/gst/asfdemux/Android.mk diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am index efae89a8cb..8923456eee 100644 --- a/ext/mad/Makefile.am +++ b/ext/mad/Makefile.am @@ -12,3 +12,18 @@ libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmad_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstmad.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstmad -:SHARED libgstmad \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstmad_la_SOURCES) \ + -:CPPFLAGS $(CPPFLAGS) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmad_la_CFLAGS) \ + -:LDFLAGS $(libgstmad_la_LDFLAGS) \ + $(libgstmad_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am index 6c4d4cf62f..f5590139fe 100644 --- a/ext/x264/Makefile.am +++ b/ext/x264/Makefile.am @@ -19,3 +19,17 @@ preset_DATA = GstX264Enc.prs EXTRA_DIST = $(preset_DATA) +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstx264 -:SHARED libgstx264 \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstx264_la_SOURCES) \ + -:CPPFLAGS $(CPPFLAGS) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstx264_la_CFLAGS) -I'$$(GSTREAMER_AGGREGATE_TOP)/x264' \ + -:LDFLAGS $(libgstx264_la_LDFLAGS) \ + $(libgstx264_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am index 5fda983052..c4e03b35eb 100644 --- a/gst/asfdemux/Makefile.am +++ b/gst/asfdemux/Makefile.am @@ -11,3 +11,17 @@ libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstasf_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstasfdemux -:SHARED libgstasfdemux \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstasfdemux_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstasfdemux_la_CFLAGS) \ + -:LDFLAGS $(libgstasfdemux_la_LDFLAGS) \ + $(libgstasfdemux_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am index 7fe692e285..1e4367b38a 100644 --- a/gst/dvdlpcmdec/Makefile.am +++ b/gst/dvdlpcmdec/Makefile.am @@ -8,3 +8,17 @@ libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdvdlpcmdec_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstdvdlpcmdec.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstdvdlpcmdec -:SHARED libgstdvdlpcmdec \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstdvdlpcmdec_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdvdlpcmdec_la_CFLAGS) \ + -:LDFLAGS $(libgstdvdlpcmdec_la_LDFLAGS) \ + $(libgstdvdlpcmdec_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am index d757c54519..8042b75017 100644 --- a/gst/dvdsub/Makefile.am +++ b/gst/dvdsub/Makefile.am @@ -7,3 +7,17 @@ libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstdvdsub_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstdvdsub -:SHARED libgstdvdsub \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstdvdsub_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdvdsub_la_CFLAGS) \ + -:LDFLAGS $(libgstdvdsub_la_LDFLAGS) \ + $(libgstdvdsub_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/iec958/Makefile.am b/gst/iec958/Makefile.am index fdd207fe69..b3e04063ce 100644 --- a/gst/iec958/Makefile.am +++ b/gst/iec958/Makefile.am @@ -7,3 +7,17 @@ libgstiec958_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstiec958_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = ac3_padder.h ac3iec.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstiec958 -:SHARED libgstiec958 \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstiec958_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstiec958_la_CFLAGS) \ + -:LDFLAGS $(libgstiec958_la_LDFLAGS) \ + $(libgstiec958_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 6d3c464cea..61a00bdedd 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -7,3 +7,17 @@ libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmpegaudioparse_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstmpegaudioparse.h gstxingmux.h + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstmpegaudioparse -:SHARED libgstmpegaudioparse \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstmpegaudioparse_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegaudioparse_la_CFLAGS) \ + -:LDFLAGS $(libgstmpegaudioparse_la_LDFLAGS) \ + $(libgstmpegaudioparse_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/mpegstream/Makefile.am b/gst/mpegstream/Makefile.am index f17a258591..7f7166f80b 100644 --- a/gst/mpegstream/Makefile.am +++ b/gst/mpegstream/Makefile.am @@ -20,3 +20,17 @@ noinst_HEADERS = gstmpegparse.h \ gstrfc2250enc.h EXTRA_DIST = README notes + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstmpegstream -:SHARED libgstmpegstream \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstmpegstream_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmpegstream_la_CFLAGS) \ + -:LDFLAGS $(libgstmpegstream_la_LDFLAGS) \ + $(libgstmpegstream_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am index aaac3c9dd8..c17d8f1699 100644 --- a/gst/realmedia/Makefile.am +++ b/gst/realmedia/Makefile.am @@ -24,3 +24,16 @@ noinst_PROGRAMS = asmrules asmrules_CFLAGS = $(GST_CFLAGS) -DTEST asmrules_LDADD = $(GST_LIBS) $(LIBM) +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstrealmedia -:SHARED libgstrealmedia \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstrealmedia_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrealmedia_la_CFLAGS) \ + -:LDFLAGS $(libgstrealmedia_la_LDFLAGS) \ + $(libgstrealmedia_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ diff --git a/gst/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am index 912f2be244..da4f9868e7 100644 --- a/gst/synaesthesia/Makefile.am +++ b/gst/synaesthesia/Makefile.am @@ -10,3 +10,17 @@ libgstsynaesthesia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstsynaesthesia_la_LIBTOOLFLAGS = --tag=disable-static EXTRA_DIST = README + +Android.mk: Makefile.am $(BUILT_SOURCES) + androgenizer \ + -:PROJECT libgstsynaesthesia -:SHARED libgstsynaesthesia \ + -:TAGS eng debug \ + -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ + -:SOURCES $(libgstsynaesthesia_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstsynaesthesia_la_CFLAGS) \ + -:LDFLAGS $(libgstsynaesthesia_la_LDFLAGS) \ + $(libgstsynaesthesia_la_LIBADD) \ + -ldl \ + -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ + LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ + > $@ From e8d00e7334b9570989d270337f8854ddb3bc65e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 13 Apr 2011 20:31:53 +0200 Subject: [PATCH 18/23] x264enc: Implement getcaps function This allows to set width/height/etc restrictions downstream. --- ext/x264/gstx264enc.c | 50 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 0259c0b826..63f61598e4 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -471,6 +471,7 @@ static gboolean gst_x264_enc_init_encoder (GstX264Enc * encoder); static void gst_x264_enc_close_encoder (GstX264Enc * encoder); static gboolean gst_x264_enc_sink_set_caps (GstPad * pad, GstCaps * caps); +static GstCaps *gst_x264_enc_sink_get_caps (GstPad * pad); static gboolean gst_x264_enc_sink_event (GstPad * pad, GstEvent * event); static gboolean gst_x264_enc_src_event (GstPad * pad, GstEvent * event); static GstFlowReturn gst_x264_enc_chain (GstPad * pad, GstBuffer * buf); @@ -854,6 +855,8 @@ gst_x264_enc_init (GstX264Enc * encoder, GstX264EncClass * klass) encoder->sinkpad = gst_pad_new_from_static_template (&sink_factory, "sink"); gst_pad_set_setcaps_function (encoder->sinkpad, GST_DEBUG_FUNCPTR (gst_x264_enc_sink_set_caps)); + gst_pad_set_getcaps_function (encoder->sinkpad, + GST_DEBUG_FUNCPTR (gst_x264_enc_sink_get_caps)); gst_pad_set_event_function (encoder->sinkpad, GST_DEBUG_FUNCPTR (gst_x264_enc_sink_event)); gst_pad_set_chain_function (encoder->sinkpad, @@ -1454,6 +1457,53 @@ gst_x264_enc_sink_set_caps (GstPad * pad, GstCaps * caps) return TRUE; } +static GstCaps * +gst_x264_enc_sink_get_caps (GstPad * pad) +{ + GstX264Enc *encoder; + GstPad *peer; + GstCaps *caps; + + /* If we already have caps return them */ + if (GST_PAD_CAPS (pad)) + return GST_PAD_CAPS (pad); + + encoder = GST_X264_ENC (gst_pad_get_parent (pad)); + if (!encoder) + return gst_caps_new_empty (); + + peer = gst_pad_get_peer (encoder->srcpad); + if (peer) { + const GstCaps *templcaps; + GstCaps *peercaps; + guint i, n; + + peercaps = gst_pad_get_caps (peer); + + /* Translate peercaps to YUV */ + peercaps = gst_caps_make_writable (peercaps); + n = gst_caps_get_size (peercaps); + for (i = 0; i < n; i++) { + GstStructure *s = gst_caps_get_structure (peercaps, i); + + gst_structure_set_name (s, "video/x-raw-yuv"); + gst_structure_remove_field (s, "stream-format"); + gst_structure_remove_field (s, "alignment"); + } + + templcaps = gst_pad_get_pad_template_caps (pad); + + caps = gst_caps_intersect (peercaps, templcaps); + gst_caps_unref (peercaps); + } else { + caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); + } + + gst_object_unref (encoder); + + return caps; +} + static gboolean gst_x264_enc_src_event (GstPad * pad, GstEvent * event) { From 81173fcbad4ba0cc107e3f168523876bcc2dc754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 14 Apr 2011 15:03:33 +0100 Subject: [PATCH 19/23] asfdemux: fix unused-but-set-variable warnings with gcc 4.6 --- gst/asfdemux/gstasfdemux.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 3d32e0a35f..020d749793 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -2264,13 +2264,13 @@ gst_asf_demux_parse_stream_object (GstASFDemux * demux, guint8 * data, AsfCorrectionType correction_type; AsfStreamType stream_type; GstClockTime time_offset; - gboolean is_encrypted; + gboolean is_encrypted G_GNUC_UNUSED; guint16 stream_id; guint16 flags; ASFGuid guid; guint stream_specific_size; - guint type_specific_size; - guint unknown; + guint type_specific_size G_GNUC_UNUSED; + guint unknown G_GNUC_UNUSED; /* Get the rest of the header's header */ if (size < (16 + 16 + 8 + 4 + 4 + 2 + 4)) @@ -2776,7 +2776,7 @@ gst_asf_demux_process_metadata (GstASFDemux * demux, guint8 * data, for (i = 0; i < blockcount; ++i) { GstStructure *s; - guint16 lang_idx, stream_num, name_len, data_type; + guint16 stream_num, name_len, data_type, lang_idx G_GNUC_UNUSED; guint32 data_len, ival; gchar *name_utf8; @@ -2841,7 +2841,7 @@ gst_asf_demux_process_header (GstASFDemux * demux, guint8 * data, guint64 size) { GstFlowReturn ret = GST_FLOW_OK; guint32 i, num_objects; - guint8 unknown; + guint8 unknown G_GNUC_UNUSED; /* Get the rest of the header's header */ if (size < (4 + 1 + 1)) @@ -2876,9 +2876,11 @@ not_enough_data: static GstFlowReturn gst_asf_demux_process_file (GstASFDemux * demux, guint8 * data, guint64 size) { - guint64 file_size, creation_time, packets_count; - guint64 play_time, send_time, preroll; - guint32 flags, min_pktsize, max_pktsize, min_bitrate; + guint64 creation_time G_GNUC_UNUSED; + guint64 file_size G_GNUC_UNUSED; + guint64 send_time G_GNUC_UNUSED; + guint64 packets_count, play_time, preroll; + guint32 flags, min_pktsize, max_pktsize, min_bitrate G_GNUC_UNUSED; if (size < (16 + 8 + 8 + 8 + 8 + 8 + 8 + 4 + 4 + 4 + 4)) goto not_enough_data; @@ -3184,7 +3186,7 @@ gst_asf_demux_process_simple_index (GstASFDemux * demux, guint8 * data, guint64 size) { GstClockTime interval; - guint32 x, count, i; + guint32 count, i; if (size < (16 + 8 + 4 + 4)) goto not_enough_data; @@ -3192,7 +3194,7 @@ gst_asf_demux_process_simple_index (GstASFDemux * demux, guint8 * data, /* skip file id */ gst_asf_demux_skip_bytes (16, &data, &size); interval = gst_asf_demux_get_uint64 (&data, &size) * (GstClockTime) 100; - x = gst_asf_demux_get_uint32 (&data, &size); + gst_asf_demux_skip_bytes (4, &data, &size); count = gst_asf_demux_get_uint32 (&data, &size); if (count > 0) { demux->sidx_interval = interval; @@ -3319,7 +3321,7 @@ gst_asf_demux_process_ext_stream_props (GstASFDemux * demux, guint8 * data, /* read stream names */ for (i = 0; i < stream_name_count; ++i) { - guint16 stream_lang_idx; + guint16 stream_lang_idx G_GNUC_UNUSED; gchar *stream_name = NULL; if (size < 2) @@ -3594,15 +3596,10 @@ gst_asf_demux_process_object (GstASFDemux * demux, guint8 ** p_data, GST_INFO ("%s: size %" G_GUINT64_FORMAT, demux->objpath, obj.size); switch (obj.id) { - case ASF_OBJ_STREAM:{ - AsfStream *stream; - - stream = - gst_asf_demux_parse_stream_object (demux, *p_data, obj_data_size); - + case ASF_OBJ_STREAM: + gst_asf_demux_parse_stream_object (demux, *p_data, obj_data_size); ret = GST_FLOW_OK; break; - } case ASF_OBJ_FILE: ret = gst_asf_demux_process_file (demux, *p_data, obj_data_size); break; From 4d3311566c33e95e8d9588a3aeb4c8796f02eb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 14 Apr 2011 15:03:56 +0100 Subject: [PATCH 20/23] dvdread, sidplay, x264enc: fix unused-but-set-variable warnings with gcc 4.6 --- ext/dvdread/dvdreadsrc.c | 3 +-- ext/sidplay/gstsiddec.cc | 2 -- ext/x264/gstx264enc.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c index dea020031c..a46ee4cf6f 100644 --- a/ext/dvdread/dvdreadsrc.c +++ b/ext/dvdread/dvdreadsrc.c @@ -724,7 +724,7 @@ gst_dvd_read_src_read (GstDvdReadSrc * src, gint angle, gint new_seek, GstSegment *seg; guint8 oneblock[DVD_VIDEO_LB_LEN]; dsi_t dsi_pack; - guint next_vobu, next_ilvu_start, cur_output_size; + guint next_vobu, cur_output_size; gint len; gint retries; gint64 next_time; @@ -811,7 +811,6 @@ nav_retry: /* determine where we go next. These values are the ones we * mostly care about */ - next_ilvu_start = src->cur_pack + dsi_pack.sml_agli.data[angle].address; cur_output_size = dsi_pack.dsi_gi.vobu_ea + 1; /* If we're not at the end of this cell, we can determine the next diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index ebdef08891..7f0a94ab02 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -189,10 +189,8 @@ static void gst_siddec_class_init (GstSidDec * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; parent_class = GST_ELEMENT_CLASS (g_type_class_peek_parent (klass)); diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 63f61598e4..098b41f0a8 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1667,7 +1667,6 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in, #endif int encoder_return; GstFlowReturn ret; - GstClockTime timestamp; GstClockTime duration; guint8 *data; GstEvent *forcekeyunit_event = NULL; @@ -1723,7 +1722,6 @@ gst_x264_enc_encode_frame (GstX264Enc * encoder, x264_picture_t * pic_in, in_buf = g_queue_pop_head (encoder->delay); if (in_buf) { - timestamp = GST_BUFFER_TIMESTAMP (in_buf); duration = GST_BUFFER_DURATION (in_buf); gst_buffer_unref (in_buf); } else { From 120731ee4eb1a089bbac2dbd88bfc58c8c4397a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 14 Apr 2011 15:04:19 +0100 Subject: [PATCH 21/23] mpegstream: fix unused-but-set-variable warnings with gcc 4.6 --- gst/mpegstream/gstmpegdemux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c index 5264597cf8..d129d46efc 100644 --- a/gst/mpegstream/gstmpegdemux.c +++ b/gst/mpegstream/gstmpegdemux.c @@ -636,8 +636,7 @@ gst_mpeg_demux_parse_packet (GstMPEGParse * mpeg_parse, GstBuffer * buffer) guint16 headerlen; guint16 packet_length; - gboolean STD_buffer_bound_scale; - guint16 STD_buffer_size_bound; + guint16 STD_buffer_size_bound G_GNUC_UNUSED; guint64 dts; gint64 pts = -1; @@ -677,7 +676,7 @@ gst_mpeg_demux_parse_packet (GstMPEGParse * mpeg_parse, GstBuffer * buffer) case 0x40: GST_DEBUG_OBJECT (mpeg_demux, "have STD"); - STD_buffer_bound_scale = bits & 0x20; + /* STD_buffer_bound_scale = ((bits & 0x20) == 0x20); */ STD_buffer_size_bound = ((guint16) (bits & 0x1F)) << 8; STD_buffer_size_bound |= *buf++; From 59ced3ae36328b9660326cc6965bd65492193b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 16 Apr 2011 23:23:56 +0100 Subject: [PATCH 22/23] rademux: fix two 'variable may be used uninitialized' warnings caused by -DG_DISABLE_ASSERT --- gst/realmedia/rademux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c index 5626aec23d..eb9832f4d5 100644 --- a/gst/realmedia/rademux.c +++ b/gst/realmedia/rademux.c @@ -569,7 +569,7 @@ gst_real_audio_demux_handle_buffer (GstRealAudioDemux * demux, GstBuffer * buf) break; } default: - g_assert_not_reached (); + g_return_val_if_reached (GST_FLOW_ERROR); } return ret; @@ -611,7 +611,7 @@ gst_real_audio_demux_loop (GstRealAudioDemux * demux) } break; default: - g_assert_not_reached (); + g_return_if_reached (); } /* now get the data */ From 894760b682d934f8d236ce7e03595f5163f9b56e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 16 Apr 2011 23:26:27 +0100 Subject: [PATCH 23/23] 0.10.17.2 pre-release --- configure.ac | 2 +- .../gst-plugins-ugly-plugins.hierarchy | 83 ++++++++++--------- .../gst-plugins-ugly-plugins.interfaces | 4 +- docs/plugins/inspect/plugin-a52dec.xml | 4 +- docs/plugins/inspect/plugin-amrnb.xml | 4 +- docs/plugins/inspect/plugin-amrwbdec.xml | 4 +- docs/plugins/inspect/plugin-asf.xml | 4 +- docs/plugins/inspect/plugin-cdio.xml | 4 +- docs/plugins/inspect/plugin-dvdlpcmdec.xml | 4 +- docs/plugins/inspect/plugin-dvdread.xml | 4 +- docs/plugins/inspect/plugin-dvdsub.xml | 4 +- docs/plugins/inspect/plugin-iec958.xml | 4 +- docs/plugins/inspect/plugin-lame.xml | 4 +- docs/plugins/inspect/plugin-mad.xml | 4 +- docs/plugins/inspect/plugin-mpeg2dec.xml | 4 +- .../plugins/inspect/plugin-mpegaudioparse.xml | 4 +- docs/plugins/inspect/plugin-mpegstream.xml | 4 +- docs/plugins/inspect/plugin-realmedia.xml | 4 +- docs/plugins/inspect/plugin-siddec.xml | 4 +- docs/plugins/inspect/plugin-synaesthesia.xml | 4 +- docs/plugins/inspect/plugin-twolame.xml | 4 +- docs/plugins/inspect/plugin-x264.xml | 4 +- po/sl.po | 33 ++++---- win32/common/config.h | 11 ++- 24 files changed, 107 insertions(+), 102 deletions(-) diff --git a/configure.ac b/configure.ac index 5ae77284cc..212965d24c 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl please read gstreamer/docs/random/autotools before changing this file dnl initialize autoconf dnl releases only do -Wall, cvs and prerelease does -Werror too dnl use a three digit version number for releases, and four for cvs/prerelease -AC_INIT(GStreamer Ugly Plug-ins, 0.10.17.1, +AC_INIT(GStreamer Ugly Plug-ins, 0.10.17.2, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gst-plugins-ugly) diff --git a/docs/plugins/gst-plugins-ugly-plugins.hierarchy b/docs/plugins/gst-plugins-ugly-plugins.hierarchy index af23127ae4..361e16e99a 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.hierarchy +++ b/docs/plugins/gst-plugins-ugly-plugins.hierarchy @@ -1,60 +1,61 @@ GObject GstObject - GstBus - GstClock + GstPad + GstPadTemplate + GstPluginFeature + GstElementFactory + GstTypeFindFactory + GstIndexFactory GstElement - AC3IEC - GstA52Dec - GstASFDemux - GstAmrnbDec - GstAmrnbEnc - GstAmrwbDec - GstBaseRTPDepayload - GstRtpAsfDepay - GstBaseSrc - GstPushSrc - GstCddaBaseSrc - GstCdioCddaSrc - GstDvdReadSrc - GstPNMSrc GstBin GstPipeline - GstDvdLpcmDec + GstRMDemux + GstRealAudioDemux + GstRDTDepay + GstRDTManager + GstRTSPReal + GstBaseSrc + GstPushSrc + GstPNMSrc + GstDvdReadSrc + GstCddaBaseSrc + GstCdioCddaSrc + GstMad + GstX264Enc + GstTwoLame + GstSidDec + GstLameMP3Enc + GstLame + GstA52Dec + GstAmrwbDec + GstMpeg2dec + GstAmrnbDec + GstAmrnbEnc + GstSynaesthesia GstDvdSubDec GstDvdSubParse - GstLame - GstLameMP3Enc + AC3IEC + GstDvdLpcmDec + GstXingMux GstMPEGAudioParse GstMPEGParse GstMPEGDemux GstDVDDemux - GstMad - GstMpeg2dec - GstRDTDepay - GstRDTManager - GstRMDemux - GstRTSPReal + GstASFDemux GstRTSPWMS - GstRealAudioDemux - GstSidDec - GstTwoLame - GstX264Enc - GstXingMux - GstPad - GstPadTemplate - GstPlugin - GstPluginFeature - GstElementFactory - GstIndexFactory - GstTypeFindFactory - GstRegistry + GstBaseRTPDepayload + GstRtpAsfDepay + GstBus GstTask GstTaskPool + GstClock + GstPlugin + GstRegistry GstSignalObject GInterface GTypePlugin GstChildProxy - GstPreset - GstRTSPExtension - GstTagSetter GstURIHandler + GstRTSPExtension + GstPreset + GstTagSetter diff --git a/docs/plugins/gst-plugins-ugly-plugins.interfaces b/docs/plugins/gst-plugins-ugly-plugins.interfaces index 818bad97b8..63b25bb8e4 100644 --- a/docs/plugins/gst-plugins-ugly-plugins.interfaces +++ b/docs/plugins/gst-plugins-ugly-plugins.interfaces @@ -1,13 +1,13 @@ GstBin GstChildProxy GstPipeline GstChildProxy +GstRTSPReal GstRTSPExtension +GstPNMSrc GstURIHandler GstDvdReadSrc GstURIHandler GstCddaBaseSrc GstURIHandler GstCdioCddaSrc GstURIHandler -GstPNMSrc GstURIHandler GstX264Enc GstPreset GstTwoLame GstPreset GstLameMP3Enc GstPreset GstLame GstTagSetter GstPreset GstAmrnbEnc GstPreset -GstRTSPReal GstRTSPExtension GstRTSPWMS GstRTSPExtension diff --git a/docs/plugins/inspect/plugin-a52dec.xml b/docs/plugins/inspect/plugin-a52dec.xml index fc7299fd73..bd656e6a13 100644 --- a/docs/plugins/inspect/plugin-a52dec.xml +++ b/docs/plugins/inspect/plugin-a52dec.xml @@ -3,10 +3,10 @@ Decodes ATSC A/52 encoded audio streams ../../ext/a52dec/.libs/libgsta52dec.so libgsta52dec.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-amrnb.xml b/docs/plugins/inspect/plugin-amrnb.xml index f37f9e006a..ae3b74fe84 100644 --- a/docs/plugins/inspect/plugin-amrnb.xml +++ b/docs/plugins/inspect/plugin-amrnb.xml @@ -3,10 +3,10 @@ Adaptive Multi-Rate Narrow-Band ../../ext/amrnb/.libs/libgstamrnb.so libgstamrnb.so - 0.10.17.1 + 0.10.17.2 unknown gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-amrwbdec.xml b/docs/plugins/inspect/plugin-amrwbdec.xml index b159126d2c..5dd7e70099 100644 --- a/docs/plugins/inspect/plugin-amrwbdec.xml +++ b/docs/plugins/inspect/plugin-amrwbdec.xml @@ -3,10 +3,10 @@ Adaptive Multi-Rate Wide-Band Decoder ../../ext/amrwbdec/.libs/libgstamrwbdec.so libgstamrwbdec.so - 0.10.17.1 + 0.10.17.2 unknown gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-asf.xml b/docs/plugins/inspect/plugin-asf.xml index f608ae3f5a..bbce276764 100644 --- a/docs/plugins/inspect/plugin-asf.xml +++ b/docs/plugins/inspect/plugin-asf.xml @@ -3,10 +3,10 @@ Demuxes and muxes audio and video in Microsofts ASF format ../../gst/asfdemux/.libs/libgstasf.so libgstasf.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-cdio.xml b/docs/plugins/inspect/plugin-cdio.xml index edc46ba27c..90318e58c7 100644 --- a/docs/plugins/inspect/plugin-cdio.xml +++ b/docs/plugins/inspect/plugin-cdio.xml @@ -3,10 +3,10 @@ Read audio from audio CDs ../../ext/cdio/.libs/libgstcdio.so libgstcdio.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdlpcmdec.xml b/docs/plugins/inspect/plugin-dvdlpcmdec.xml index bf1a628146..4314f2b33a 100644 --- a/docs/plugins/inspect/plugin-dvdlpcmdec.xml +++ b/docs/plugins/inspect/plugin-dvdlpcmdec.xml @@ -3,10 +3,10 @@ Decode DVD LPCM frames into standard PCM ../../gst/dvdlpcmdec/.libs/libgstdvdlpcmdec.so libgstdvdlpcmdec.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdread.xml b/docs/plugins/inspect/plugin-dvdread.xml index bc53d16653..8a8085f7bd 100644 --- a/docs/plugins/inspect/plugin-dvdread.xml +++ b/docs/plugins/inspect/plugin-dvdread.xml @@ -3,10 +3,10 @@ Access a DVD with dvdread ../../ext/dvdread/.libs/libgstdvdread.so libgstdvdread.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-dvdsub.xml b/docs/plugins/inspect/plugin-dvdsub.xml index b72cf83bcb..14140e7bef 100644 --- a/docs/plugins/inspect/plugin-dvdsub.xml +++ b/docs/plugins/inspect/plugin-dvdsub.xml @@ -3,10 +3,10 @@ DVD subtitle parser and decoder ../../gst/dvdsub/.libs/libgstdvdsub.so libgstdvdsub.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-iec958.xml b/docs/plugins/inspect/plugin-iec958.xml index 2f7b7085a0..58e5728464 100644 --- a/docs/plugins/inspect/plugin-iec958.xml +++ b/docs/plugins/inspect/plugin-iec958.xml @@ -3,10 +3,10 @@ Convert raw AC3 into IEC958 (S/PDIF) frames ../../gst/iec958/.libs/libgstiec958.so libgstiec958.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-lame.xml b/docs/plugins/inspect/plugin-lame.xml index 3d4a58cfce..2f2f598df0 100644 --- a/docs/plugins/inspect/plugin-lame.xml +++ b/docs/plugins/inspect/plugin-lame.xml @@ -3,10 +3,10 @@ Encode MP3s with LAME ../../ext/lame/.libs/libgstlame.so libgstlame.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mad.xml b/docs/plugins/inspect/plugin-mad.xml index 2b9190e101..596cf1bd41 100644 --- a/docs/plugins/inspect/plugin-mad.xml +++ b/docs/plugins/inspect/plugin-mad.xml @@ -3,10 +3,10 @@ mp3 decoding based on the mad library ../../ext/mad/.libs/libgstmad.so libgstmad.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpeg2dec.xml b/docs/plugins/inspect/plugin-mpeg2dec.xml index e7001f5008..8918cbfd42 100644 --- a/docs/plugins/inspect/plugin-mpeg2dec.xml +++ b/docs/plugins/inspect/plugin-mpeg2dec.xml @@ -3,10 +3,10 @@ LibMpeg2 decoder ../../ext/mpeg2dec/.libs/libgstmpeg2dec.so libgstmpeg2dec.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpegaudioparse.xml b/docs/plugins/inspect/plugin-mpegaudioparse.xml index 342977d927..07c7cd30be 100644 --- a/docs/plugins/inspect/plugin-mpegaudioparse.xml +++ b/docs/plugins/inspect/plugin-mpegaudioparse.xml @@ -3,10 +3,10 @@ MPEG-1 layer 1/2/3 audio stream elements ../../gst/mpegaudioparse/.libs/libgstmpegaudioparse.so libgstmpegaudioparse.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-mpegstream.xml b/docs/plugins/inspect/plugin-mpegstream.xml index 461f86e103..c5f145163d 100644 --- a/docs/plugins/inspect/plugin-mpegstream.xml +++ b/docs/plugins/inspect/plugin-mpegstream.xml @@ -3,10 +3,10 @@ MPEG system stream parser ../../gst/mpegstream/.libs/libgstmpegstream.so libgstmpegstream.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-realmedia.xml b/docs/plugins/inspect/plugin-realmedia.xml index 149002cb16..c183a8ff7f 100644 --- a/docs/plugins/inspect/plugin-realmedia.xml +++ b/docs/plugins/inspect/plugin-realmedia.xml @@ -3,10 +3,10 @@ RealMedia support plugins ../../gst/realmedia/.libs/libgstrmdemux.so libgstrmdemux.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-siddec.xml b/docs/plugins/inspect/plugin-siddec.xml index d33a037e47..99c30c2022 100644 --- a/docs/plugins/inspect/plugin-siddec.xml +++ b/docs/plugins/inspect/plugin-siddec.xml @@ -3,10 +3,10 @@ Uses libsidplay to decode .sid files ../../ext/sidplay/.libs/libgstsid.so libgstsid.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-synaesthesia.xml b/docs/plugins/inspect/plugin-synaesthesia.xml index c1f90399b2..ba1446206b 100644 --- a/docs/plugins/inspect/plugin-synaesthesia.xml +++ b/docs/plugins/inspect/plugin-synaesthesia.xml @@ -3,10 +3,10 @@ Creates video visualizations of audio input, using stereo and pitch information ../../gst/synaesthesia/.libs/libgstsynaesthesia.so libgstsynaesthesia.so - 0.10.10.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins CVS/prerelease + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-twolame.xml b/docs/plugins/inspect/plugin-twolame.xml index 38bcb0fc22..262046e0c9 100644 --- a/docs/plugins/inspect/plugin-twolame.xml +++ b/docs/plugins/inspect/plugin-twolame.xml @@ -3,10 +3,10 @@ Encode MP2s with TwoLAME ../../ext/twolame/.libs/libgsttwolame.so libgsttwolame.so - 0.10.17.1 + 0.10.17.2 LGPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/docs/plugins/inspect/plugin-x264.xml b/docs/plugins/inspect/plugin-x264.xml index ee349f03ff..787b763483 100644 --- a/docs/plugins/inspect/plugin-x264.xml +++ b/docs/plugins/inspect/plugin-x264.xml @@ -3,10 +3,10 @@ libx264-based H264 plugins ../../ext/x264/.libs/libgstx264.so libgstx264.so - 0.10.17.1 + 0.10.17.2 GPL gst-plugins-ugly - GStreamer Ugly Plug-ins git + GStreamer Ugly Plug-ins prerelease Unknown package origin diff --git a/po/sl.po b/po/sl.po index 02aa87ea81..be4f5fac4d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,15 +1,16 @@ # Slovenian translation for gst-plugins-ugly. -# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2009 - 2011 Free Software Foundation, Inc. # This file is distributed under the same license as the gst-plugins-ugly package. # Matej Urbančič , 2009. +# Klemen Košir , 2011. # msgid "" msgstr "" -"Project-Id-Version: gst-plugins-ugly 0.10.12.2\n" +"Project-Id-Version: gst-plugins-ugly 0.10.14.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2010-10-15 15:20+0100\n" -"PO-Revision-Date: 2009-12-25 21:35+0100\n" -"Last-Translator: Matej Urbančič \n" +"POT-Creation-Date: 2011-04-16 20:57+0100\n" +"PO-Revision-Date: 2011-03-08 21:31+0100\n" +"Last-Translator: Klemen Košir \n" "Language-Team: Slovenian \n" "Language: sl\n" "MIME-Version: 1.0\n" @@ -22,30 +23,30 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" msgid "Could not read from CD." -msgstr "Ni mogoče prebrati CD nosilca." +msgstr "S CD-ja ni mogoče brati." msgid "Could not open CD device for reading." -msgstr "Ni mogoče odpreti CD naprave za branje." +msgstr "Naprave CD ni mogoče odpreti za branje." msgid "Disc is not an Audio CD." msgstr "Disk ni zvočni CD." msgid "Could not open DVD" -msgstr "Ni mogoče odpreti DVD nosilca" +msgstr "DVD-ja ni mogoče odpreti" #, c-format msgid "Could not open DVD title %d" -msgstr "Ni mogoče odpreti DVD naslova %d" +msgstr "DVD naslova %d ni mogoče odpreti." #, c-format msgid "Failed to go to chapter %d of DVD title %d" -msgstr "Napaka med odpiranjem poglavja %d DVD naslova %d" +msgstr "Napaka med odpiranjem poglavja %d DVD naslova %d." #, c-format msgid "" "Could not open DVD title %d. Interactive titles are not supported by this " "element" -msgstr "Ni mogoče odpreti DVD naslova %d. Interaktivni naslovni niso podprti." +msgstr "DVD naslova %d ni mogoče odpreti. Interaktivni naslovi niso podprti." msgid "" "Could not read DVD. This may be because the DVD is encrypted and a DVD " @@ -54,23 +55,23 @@ msgstr "" #, fuzzy msgid "Could not read DVD." -msgstr "Ni mogoče odpreti DVD nosilca" +msgstr "DVD-ja ni mogoče odpreti" msgid "Failed to configure LAME encoder. Check your encoding parameters." msgstr "" -"Napaka med nastavljanjem LAME kodirnika. Preverite parametre kodirnika." +"Napaka med nastavljanjem kodirnika LAME. Preverite parametre kodiranja." #, c-format msgid "" "The requested bitrate %d kbit/s for property '%s' is not allowed. The " "bitrate was changed to %d kbit/s." msgstr "" -"Zahtevana bitna hitrost %d kbit/s za lastnost '%s' ni dovoljena. Bitna " -"hitrost je spremenjena na %d kbit/s." +"Zahtevana bitna hitrost %d kbit/s za lastnost \"%s\" ni dovoljena. Bitna " +"hitrost je bila spremenjena na %d kbit/s." msgid "Failed to configure TwoLAME encoder. Check your encoding parameters." msgstr "" -"Napaka med nastavljanjem kodirnika TwoLAME. Preverite parametre kodirnika." +"Napaka med nastavljanjem kodirnika TwoLAME. Preverite parametre kodiranja." msgid "This stream contains no data." msgstr "Pretok ne vsebuje podatkov." diff --git a/win32/common/config.h b/win32/common/config.h index e1d39b14a7..f33d1cadb3 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -46,7 +46,7 @@ #define GST_LICENSE "LGPL" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins git" +#define GST_PACKAGE_NAME "GStreamer Ugly Plug-ins prerelease" /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" @@ -147,6 +147,9 @@ /* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV +/* defined if libid3tag is available */ +#undef HAVE_ID3TAG + /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -233,7 +236,7 @@ #define PACKAGE_NAME "GStreamer Ugly Plug-ins" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer Ugly Plug-ins 0.10.17.1" +#define PACKAGE_STRING "GStreamer Ugly Plug-ins 0.10.17.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gst-plugins-ugly" @@ -242,7 +245,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.10.17.1" +#define PACKAGE_VERSION "0.10.17.2" /* directory where plugins are located */ #ifdef _DEBUG @@ -270,7 +273,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.17.1" +#define VERSION "0.10.17.2" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */