+++ /dev/null
-From 7ef6975f50de5430bca938ad51d00f19e51a2be1 Mon Sep 17 00:00:00 2001
-From: Athanasios Oikonomou <athoik@gmail.com>
-Date: Thu, 4 Jul 2013 20:12:04 +0300
-Subject: [PATCH 1/1] Set only by hardware supported audio mpeg 4 profile
-
-Only mpeg 4 lc profile is supported by the hardware. Other profiles
-will be decoded by software. Based on betacentauri patches.
----
- src/gstdvbaudiosink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gstdvbaudiosink.c b/src/gstdvbaudiosink.c
-index 93cb587..2b5fe73 100644
---- a/src/gstdvbaudiosink.c
-+++ b/src/gstdvbaudiosink.c
-@@ -196,7 +196,7 @@ GST_STATIC_PAD_TEMPLATE (
- X_RAW_INT(24,24)
- X_RAW_INT(32,24)
- X_RAW_INT(32,32)
-- "audio/mpeg; "
-+ "audio/mpeg, profile = (string) lc; "
- "audio/x-ac3; "
- "audio/x-private1-ac3; "
- "audio/x-dts; "
---
-1.7.9.5
-
+++ /dev/null
-diff --git a/src/gstdvbaudiosink.c b/src/gstdvbaudiosink.c
-index 9a71412..b99f2fc 100644
---- a/src/gstdvbaudiosink.c
-+++ b/src/gstdvbaudiosink.c
-@@ -394,7 +394,7 @@ gst_dvbaudiosink_init (GstDVBAudioSink *klass, GstDVBAudioSinkClass * gclass)
- klass->dump_filename = NULL;
-
- gst_base_sink_set_sync (GST_BASE_SINK(klass), FALSE);
-- gst_base_sink_set_async_enabled (GST_BASE_SINK(klass), TRUE);
-+ gst_base_sink_set_async_enabled (GST_BASE_SINK(klass), FALSE);
-
- gst_pad_set_acceptcaps_function (GST_BASE_SINK (klass)->sinkpad,
- GST_DEBUG_FUNCPTR (gst_dvbaudiosink_acceptcaps));
+++ /dev/null
-diff --git a/src/gstdvbaudiosink.c b/src/gstdvbaudiosink.c
-index 15f020f..63978a4 100644
---- a/src/gstdvbaudiosink.c
-+++ b/src/gstdvbaudiosink.c
-@@ -198,7 +198,9 @@ GST_STATIC_PAD_TEMPLATE (
- X_RAW_INT(32,32)
- "audio/mpeg; "
- "audio/x-ac3; "
-+ "audio/x-eac3; "
- "audio/x-private1-ac3; "
-+ "audio/x-private1-eac3; "
- "audio/x-dts; "
- "audio/x-private1-dts; "
- "audio/x-private1-lpcm; "
-@@ -345,6 +347,7 @@ gst_dvbaudiosink_acceptcaps (GstPad * pad, GstCaps * caps)
-
- if (!strcmp(type, "audio/mpeg") ||
- !strcmp(type, "audio/x-ac3") ||
-+ !strcmp(type, "audio/x-eac3") ||
- // !strcmp(type, "audio/x-private1-ac3") ||
- // !strcmp(type, "audio/x-private1-lpcm") ||
- // !strcmp(type, "audio/x-wma") ||
-@@ -844,6 +847,10 @@ gst_dvbaudiosink_set_caps (GstBaseSink * basesink, GstCaps * caps)
- GST_INFO_OBJECT (self, "MIMETYPE %s",type);
- bypass = 0;
- }
-+ else if (!strcmp(type, "audio/x-eac3")) {
-+ GST_INFO_OBJECT (self, "MIMETYPE %s",type);
-+ bypass = 0x22;
-+ }
- else if (!strcmp(type, "audio/x-private1-dts")) {
- GST_INFO_OBJECT (self, "MIMETYPE %s (DVD Audio - 2 byte skipping)",type);
- bypass = 2;
-@@ -854,6 +861,11 @@ gst_dvbaudiosink_set_caps (GstBaseSink * basesink, GstCaps * caps)
- bypass = 0;
- self->skip = 2;
- }
-+ else if (!strcmp(type, "audio/x-private1-eac3")) {
-+ GST_INFO_OBJECT (self, "MIMETYPE %s (DVD Audio - 2 byte skipping)",type);
-+ bypass = 0x22;
-+ self->skip = 2;
-+ }
- else if (!strcmp(type, "audio/x-private1-lpcm")) {
- GST_INFO_OBJECT (self, "MIMETYPE %s (DVD Audio)",type);
- bypass = 6;
-@@ -1248,7 +1260,7 @@ gst_dvbaudiosink_render (GstBaseSink * sink, GstBuffer * buffer)
- self->timestamp = timestamp;
- else
- timestamp = self->timestamp;
-- if (self->bypass < 0xd)
-+ if (self->bypass < 0xd || self->bypass == 0x22)
- self->timestamp += duration;
- }
- else
+++ /dev/null
-diff --git a/src/gstdvbvideosink.c b/src/gstdvbvideosink.c
-index fcd8fed..b3ce35f 100644
---- a/src/gstdvbvideosink.c
-+++ b/src/gstdvbvideosink.c
-@@ -316,8 +316,8 @@ gst_dvbvideosink_base_init (gpointer klass)
- GST_INFO ("model is DM7020HD... set bcm7405 caps");
- } else if ( !strncasecmp(string, "DM8000", 6) ) {
- hwtype = DM8000;
-- hwtemplate = &sink_factory_bcm7400;
-- GST_INFO ("model is DM8000... set bcm7400 caps");
-+ hwtemplate = &sink_factory_bcm7405;
-+ GST_INFO ("model is DM8000... set bcm7405 caps");
- } else if ( !strncasecmp(string, "DM800", 5) ) {
- hwtype = DM800;
- hwtemplate = &sink_factory_bcm7401;
+++ /dev/null
-SUMMARY = "Plugin for gstreamer: dvbmediasink"
-SECTION = "multimedia"
-LICENSE = "MIT | LGPLv2.1"
-LIC_FILES_CHKSUM = "file://src/gstdvbaudiosink.c;beginline=1;endline=45;md5=023ebb8eaef9b8cce8591a9d96638392 \
- file://src/gstdvbvideosink.c;beginline=1;endline=44;md5=b597d3f0a4e3b49db42d2b5140bd7004"
-
-DEPENDS = "gstreamer gst-plugins-base"
-BRANCH="master"
-SRCREV="91738211ef106ae7d14c1ccc5c4dd26c0f2dbf58"
-PR = "r11"
-
-inherit autotools pkgconfig git-project
-SRC_URI = "git://schwerkraft.elitedvb.net/dvbmediasink/dvbmediasink.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
-
-SRC_URI_append_vuplus = " \
- file://fix_dvbaudiosink_async_opt.patch \
- file://fix_dvbvideosink_dm8000_padtemplate.patch \
- file://fix_dvbaudiosink_support_ddp.patch \
- file://Set-only-by-hardware-supported-audio-mpeg-4-profile.patch \
- "
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend() {
- sed -i 's/AC_INIT.*$/AC_INIT(gst-plugin-dreambox-dvbmediasink, 0.10, @openvuplus)/' ${S}/configure.ac
- sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
-}
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+++ /dev/null
-DESCRIPTION = "gstreamer subsink plugin"
-SECTION = "multimedia"
-PRIORITY = "optional"
-DEPENDS = "gstreamer gst-plugins-base"
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
-
-inherit gitpkgv
-
-PV = "0.10.0+git${SRCPV}"
-PKGV = "0.10.0+git${GITPKGV}"
-PR = "r2"
-
-SRCREV = "0cb20d602414f25edd8d139627b8e0b2b58aae33"
-SRC_URI = "git://git.code.sf.net/p/openpli/gstsubsink"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend() {
- sed -i 's/AC_INIT.*$/AC_INIT(gst-plugin-subsink, 0.10.0, @pli4)/' ${S}/configure.ac
- sed -i 's/AM_INIT_AUTOMAKE.*$/AM_INIT_AUTOMAKE([foreign subdir-objects])/' ${S}/configure.ac
-}
-inherit autotools pkgconfig
-
-FILES_${PN} = "${libdir}/gstreamer-0.10/*.so*"
-FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
-FILES_${PN}-staticdev += "${libdir}/gstreamer-0.10/*.a"
-FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+++ /dev/null
-gst-plugins-bad-0.10.23
\ No newline at end of file
+++ /dev/null
-From 55091d9a55ad100b99638503da038432549632f8 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Wed, 21 Mar 2012 15:45:17 +0100
-Subject: [PATCH 1/3] mpegtsdemux-fix-bd-streamtype-detection.diff
-
----
- gst/mpegdemux/gstmpegtsdemux.c | 134 +++++++++++++++++++++++----------------
- 1 files changed, 79 insertions(+), 55 deletions(-)
-
-diff --git a/gst/mpegdemux/gstmpegtsdemux.c b/gst/mpegdemux/gstmpegtsdemux.c
-index 012c1cc..fffc50f 100644
---- a/gst/mpegdemux/gstmpegtsdemux.c
-+++ b/gst/mpegdemux/gstmpegtsdemux.c
-@@ -647,6 +647,18 @@ gst_mpegts_demux_get_stream_for_PID (GstMpegTSDemux * demux, guint16 PID)
- }
-
- static gboolean
-+gst_mpeg_desc_reg_format_id_in_array(GArray *array, guint32 identifier)
-+{
-+ guint i = 0;
-+ for (; i < array->len; ++i) {
-+ guint8 *desc = g_array_index(array, guint8*, i);
-+ if (DESC_REGISTRATION_format_identifier (desc) == identifier)
-+ return TRUE;
-+ }
-+ return FALSE;
-+}
-+
-+static gboolean
- gst_mpegts_demux_fill_stream (GstMpegTSStream * stream, guint8 id,
- guint8 stream_type)
- {
-@@ -655,6 +667,8 @@ gst_mpegts_demux_fill_stream (GstMpegTSStream * stream, guint8 id,
- GstMpegTSDemuxClass *klass;
- GstMpegTSDemux *demux;
- GstCaps *caps;
-+ GArray *stream_desc_reg_array = NULL;
-+ gboolean is_hdmv = FALSE;
-
- if (stream->stream_type && stream->stream_type != stream_type)
- goto wrong_type;
-@@ -666,6 +680,31 @@ gst_mpegts_demux_fill_stream (GstMpegTSStream * stream, guint8 id,
- template = NULL;
- caps = NULL;
-
-+ if (stream->ES_info) {
-+ stream_desc_reg_array =
-+ gst_mpeg_descriptor_find_all (stream->ES_info, DESC_REGISTRATION);
-+ if (stream_desc_reg_array &&
-+ gst_mpeg_desc_reg_format_id_in_array(stream_desc_reg_array, DRF_ID_HDMV)) {
-+ is_hdmv = TRUE;
-+ }
-+ }
-+
-+ if (!is_hdmv) {
-+ GstMpegTSStream *PMT_stream =
-+ gst_mpegts_demux_get_stream_for_PID (stream->demux, stream->PMT_pid);
-+ GstMPEGDescriptor *program_info = PMT_stream->PMT.program_info;
-+ if (program_info) {
-+ GArray *program_desc_reg_array =
-+ gst_mpeg_descriptor_find_all (program_info, DESC_REGISTRATION);
-+ if (program_desc_reg_array) {
-+ if (gst_mpeg_desc_reg_format_id_in_array(program_desc_reg_array, DRF_ID_HDMV)) {
-+ is_hdmv = TRUE;
-+ }
-+ g_array_free(program_desc_reg_array, TRUE);
-+ }
-+ }
-+ }
-+
- switch (stream_type) {
- case ST_VIDEO_MPEG1:
- case ST_VIDEO_MPEG2:
-@@ -756,11 +795,8 @@ gst_mpegts_demux_fill_stream (GstMpegTSStream * stream, guint8 id,
- break;
- case ST_PRIVATE_EA: /* Try to detect a VC1 stream */
- {
-- guint8 *desc = NULL;
--
-- if (stream->ES_info)
-- desc = gst_mpeg_descriptor_find (stream->ES_info, DESC_REGISTRATION);
-- if (!(desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_VC1)) {
-+ if (!(stream_desc_reg_array &&
-+ gst_mpeg_desc_reg_format_id_in_array(stream_desc_reg_array, DRF_ID_VC1))) {
- GST_WARNING ("0xea private stream type found but no descriptor "
- "for VC1. Assuming plain VC1.");
- }
-@@ -772,47 +808,7 @@ gst_mpegts_demux_fill_stream (GstMpegTSStream * stream, guint8 id,
- NULL);
- break;
- }
-- case ST_BD_AUDIO_AC3:
-- {
-- GstMpegTSStream *PMT_stream =
-- gst_mpegts_demux_get_stream_for_PID (stream->demux, stream->PMT_pid);
-- GstMPEGDescriptor *program_info = PMT_stream->PMT.program_info;
-- guint8 *desc = NULL;
--
-- if (program_info)
-- desc = gst_mpeg_descriptor_find (program_info, DESC_REGISTRATION);
--
-- if (desc && DESC_REGISTRATION_format_identifier (desc) == DRF_ID_HDMV) {
-- template = klass->audio_template;
-- name = g_strdup_printf ("audio_%04x", stream->PID);
-- caps = gst_caps_new_simple ("audio/x-eac3", NULL);
-- } else if (stream->ES_info && gst_mpeg_descriptor_find (stream->ES_info,
-- DESC_DVB_ENHANCED_AC3)) {
-- template = klass->audio_template;
-- name = g_strdup_printf ("audio_%04x", stream->PID);
-- caps = gst_caps_new_simple ("audio/x-eac3", NULL);
-- } else {
-- if (!stream->ES_info ||
-- !gst_mpeg_descriptor_find (stream->ES_info, DESC_DVB_AC3)) {
-- GST_WARNING ("AC3 stream type found but no corresponding "
-- "descriptor to differentiate between AC3 and EAC3. "
-- "Assuming plain AC3.");
-- }
-- template = klass->audio_template;
-- name = g_strdup_printf ("audio_%04x", stream->PID);
-- caps = gst_caps_new_simple ("audio/x-ac3", NULL);
-- }
-- break;
-- }
-- case ST_BD_AUDIO_EAC3:
-- template = klass->audio_template;
-- name = g_strdup_printf ("audio_%04x", stream->PID);
-- caps = gst_caps_new_simple ("audio/x-eac3", NULL);
-- break;
- case ST_PS_AUDIO_DTS:
-- case ST_BD_AUDIO_DTS:
-- case ST_BD_AUDIO_DTS_HD:
-- case ST_BD_AUDIO_DTS_HD_MASTER_AUDIO:
- template = klass->audio_template;
- name = g_strdup_printf ("audio_%04x", stream->PID);
- caps = gst_caps_new_simple ("audio/x-dts", NULL);
-@@ -822,24 +818,52 @@ gst_mpegts_demux_fill_stream (GstMpegTSStream * stream, guint8 id,
- name = g_strdup_printf ("audio_%04x", stream->PID);
- caps = gst_caps_new_simple ("audio/x-lpcm", NULL);
- break;
-- case ST_BD_AUDIO_LPCM:
-- template = klass->audio_template;
-- name = g_strdup_printf ("audio_%04x", stream->PID);
-- caps = gst_caps_new_simple ("audio/x-private-ts-lpcm", NULL);
-- break;
- case ST_PS_DVD_SUBPICTURE:
- template = klass->subpicture_template;
- name = g_strdup_printf ("subpicture_%04x", stream->PID);
- caps = gst_caps_new_simple ("video/x-dvd-subpicture", NULL);
- break;
-- case ST_BD_PGS_SUBPICTURE:
-- template = klass->subpicture_template;
-- name = g_strdup_printf ("subpicture_%04x", stream->PID);
-- caps = gst_caps_new_simple ("subpicture/x-pgs", NULL);
-- break;
- default:
- break;
- }
-+
-+ if (!template && is_hdmv) {
-+ switch (stream_type) {
-+ case ST_BD_AUDIO_AC3:
-+ template = klass->audio_template;
-+ name = g_strdup_printf ("audio_%04x", stream->PID);
-+ caps = gst_caps_new_simple ("audio/x-ac3", NULL);
-+ break;
-+ case ST_BD_AUDIO_EAC3:
-+ template = klass->audio_template;
-+ name = g_strdup_printf ("audio_%04x", stream->PID);
-+ caps = gst_caps_new_simple ("audio/x-eac3", NULL);
-+ break;
-+ case ST_BD_AUDIO_DTS:
-+ case ST_BD_AUDIO_DTS_HD:
-+ case ST_BD_AUDIO_DTS_HD_MASTER_AUDIO:
-+ template = klass->audio_template;
-+ name = g_strdup_printf ("audio_%04x", stream->PID);
-+ caps = gst_caps_new_simple ("audio/x-dts", NULL);
-+ break;
-+ case ST_BD_AUDIO_LPCM:
-+ template = klass->audio_template;
-+ name = g_strdup_printf ("audio_%04x", stream->PID);
-+ caps = gst_caps_new_simple ("audio/x-private-ts-lpcm", NULL);
-+ break;
-+ case ST_BD_PGS_SUBPICTURE:
-+ template = klass->subpicture_template;
-+ name = g_strdup_printf ("subpicture_%04x", stream->PID);
-+ caps = gst_caps_new_simple ("subpicture/x-pgs", NULL);
-+ break;
-+ default:
-+ break;
-+ }
-+ }
-+
-+ if (stream_desc_reg_array)
-+ g_array_free(stream_desc_reg_array, TRUE);
-+
- if (name == NULL || template == NULL || caps == NULL) {
- if (name)
- g_free (name);
---
-1.7.5.4
-
+++ /dev/null
-From 0d5e73089dcf64398a4835d84c0dbcf77ef04e14 Mon Sep 17 00:00:00 2001
-From: Andreas Frisch <fraxinas@opendreambox.org>
-Date: Mon, 28 Mar 2011 10:31:23 +0200
-Subject: [PATCH 2/3] add indexing capabilities to generate a SPN/PTS map on
- the fly in m2ts-mode
-
----
- gst/mpegtsmux/mpegtsmux.c | 234 ++++++++++++++++++++++++++++++++++++++++++++-
- gst/mpegtsmux/mpegtsmux.h | 13 +++
- 2 files changed, 243 insertions(+), 4 deletions(-)
-
-diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
-index a243e40..d5492a4 100644
---- a/gst/mpegtsmux/mpegtsmux.c
-+++ b/gst/mpegtsmux/mpegtsmux.c
-@@ -104,7 +104,8 @@
- ARG_PROG_MAP,
- ARG_M2TS_MODE,
- ARG_PAT_INTERVAL,
-- ARG_PMT_INTERVAL
-+ ARG_PMT_INTERVAL,
-+ ARG_ALIGNMENT
- };
-
- static GstStaticPadTemplate mpegtsmux_sink_factory =
-@@ -157,6 +158,12 @@
- static void mpegtsdemux_set_header_on_caps (MpegTsMux * mux);
- static gboolean mpegtsmux_sink_event (GstPad * pad, GstEvent * event);
- static gboolean mpegtsmux_src_event (GstPad * pad, GstEvent * event);
-+static void mpegtsmux_set_index (GstElement * element, GstIndex * index);
-+static GstIndex *mpegtsmux_get_index (GstElement * element);
-+
-+static GstFormat pts_format;
-+static GstFormat spn_format;
-+guint get_packets_per_buffer (MpegTsMux * mux);
-
- GST_BOILERPLATE (MpegTsMux, mpegtsmux, GstElement, GST_TYPE_ELEMENT);
-
-@@ -175,6 +182,10 @@
- "MPEG Transport Stream Muxer", "Codec/Muxer",
- "Multiplexes media streams into an MPEG Transport Stream",
- "Fluendo <contact@fluendo.com>");
-+
-+ pts_format =
-+ gst_format_register ("PTS", "MPEG System Presentation Time Stamp");
-+ spn_format = gst_format_register ("SPN", "Source Packet Number");
- }
-
- static void
-@@ -191,6 +202,9 @@
- gstelement_class->release_pad = mpegtsmux_release_pad;
- gstelement_class->change_state = mpegtsmux_change_state;
-
-+ gstelement_class->set_index = GST_DEBUG_FUNCPTR (mpegtsmux_set_index);
-+ gstelement_class->get_index = GST_DEBUG_FUNCPTR (mpegtsmux_get_index);
-+
- g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PROG_MAP,
- g_param_spec_boxed ("prog-map", "Program map",
- "A GstStructure specifies the mapping from elementary streams to programs",
-@@ -213,6 +227,12 @@
- "Set the interval (in ticks of the 90kHz clock) for writing out the PMT table",
- 1, G_MAXUINT, TSMUX_DEFAULT_PMT_INTERVAL,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-+
-+ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_ALIGNMENT,
-+ g_param_spec_uint ("alignment", "packet alignment",
-+ "Queue this amount of ts/m2ts packets before pushing buffer. On EOS, pad with dummy packets until aligned. Default: 32 for m2ts streams, else disabled.",
-+ 0, G_MAXUINT, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-+
- }
-
- static void
-@@ -247,6 +267,15 @@
- mux->streamheader_sent = FALSE;
- mux->force_key_unit_event = NULL;
- mux->pending_key_unit_ts = GST_CLOCK_TIME_NONE;
-+
-+ mux->spn_count = 0;
-+
-+ mux->element_index = NULL;
-+ mux->element_index_writer_id = -1;
-+
-+ mux->arbitrary_align = FALSE;
-+ mux->alignment_adapter = gst_adapter_new ();
-+ mux->packets_per_buffer = 0;
- }
-
- static void
-@@ -288,6 +317,15 @@
- g_list_free (mux->streamheader);
- mux->streamheader = NULL;
- }
-+ if (mux->alignment_adapter) {
-+ gst_adapter_clear (mux->alignment_adapter);
-+ g_object_unref (mux->alignment_adapter);
-+ mux->alignment_adapter = NULL;
-+ }
-+
-+ if (mux->element_index)
-+ gst_object_unref (mux->element_index);
-+
- GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
- }
-
-@@ -331,12 +369,27 @@
- walk = g_slist_next (walk);
- }
- break;
-+ case ARG_ALIGNMENT:
-+ mux->packets_per_buffer = g_value_get_uint (value);
-+ mux->arbitrary_align = TRUE;
-+ break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
- }
-
-+guint
-+get_packets_per_buffer (MpegTsMux * mux)
-+{
-+ if (mux->arbitrary_align == TRUE) {
-+ return mux->packets_per_buffer;
-+ } else if (mux->m2ts_mode) {
-+ return BDMV_PACKETS_PER_BUFFER;
-+ }
-+ return DEFAULT_PACKETS_PER_BUFFER;
-+}
-+
- static void
- gst_mpegtsmux_get_property (GObject * object, guint prop_id,
- GValue * value, GParamSpec * pspec)
-@@ -356,6 +409,9 @@
- case ARG_PMT_INTERVAL:
- g_value_set_uint (value, mux->pmt_interval);
- break;
-+ case ARG_ALIGNMENT:
-+ g_value_set_uint (value, get_packets_per_buffer (mux));
-+ break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-@@ -363,6 +419,37 @@
- }
-
- static void
-+mpegtsmux_set_index (GstElement * element, GstIndex * index)
-+{
-+ MpegTsMux *mux = GST_MPEG_TSMUX (element);
-+
-+ GST_OBJECT_LOCK (mux);
-+ if (mux->element_index)
-+ gst_object_unref (mux->element_index);
-+ mux->element_index = index ? gst_object_ref (index) : NULL;
-+ GST_OBJECT_UNLOCK (mux);
-+ GST_DEBUG_OBJECT (mux, "Set index %" GST_PTR_FORMAT, mux->element_index);
-+ gst_index_add_format (index, mux->element_index_writer_id, pts_format);
-+ gst_index_add_format (index, mux->element_index_writer_id, spn_format);
-+}
-+
-+static GstIndex *
-+mpegtsmux_get_index (GstElement * element)
-+{
-+ GstIndex *result = NULL;
-+ MpegTsMux *mux = GST_MPEG_TSMUX (element);
-+
-+ GST_OBJECT_LOCK (mux);
-+ if (mux->element_index)
-+ result = gst_object_ref (mux->element_index);
-+ GST_OBJECT_UNLOCK (mux);
-+
-+ GST_DEBUG_OBJECT (mux, "Returning index %" GST_PTR_FORMAT, result);
-+
-+ return result;
-+}
-+
-+static void
- release_buffer_cb (guint8 * data, void *user_data)
- {
- GstBuffer *buf = (GstBuffer *) user_data;
-@@ -505,6 +592,24 @@
- ret = GST_FLOW_OK;
- }
-
-+ if (mux->element_index) {
-+ gboolean parsed = FALSE;
-+ if (ts_data->stream->is_video_stream) {
-+ if (gst_structure_get_boolean (s, "parsed", &parsed) && parsed) {
-+ if (mux->element_index_writer_id == -1) {
-+ gst_index_get_writer_id (mux->element_index, GST_OBJECT (mux),
-+ &mux->element_index_writer_id);
-+ GST_INFO_OBJECT (mux,
-+ "created GstIndex writer_id = %d for PID 0x%04x",
-+ mux->element_index_writer_id, ts_data->pid);
-+ }
-+ } else
-+ GST_WARNING_OBJECT (pad,
-+ "Indexing capability for PID=0x%04x disabled - parsed input stream is required!",
-+ ts_data->pid);
-+ }
-+ }
-+
- beach:
- gst_caps_unref (caps);
- return ret;
-@@ -659,6 +764,105 @@
- return best;
- }
-
-+static GstFlowReturn
-+aligned_push (MpegTsMux * mux, GstBuffer * buf)
-+{
-+ guint accu_bytes, packet_length;
-+ GstBuffer *out_buf;
-+
-+ if (get_packets_per_buffer (mux) == 0) {
-+ return gst_pad_push (mux->srcpad, buf);
-+ }
-+
-+ packet_length = mux->m2ts_mode ? M2TS_PACKET_LENGTH : NORMAL_TS_PACKET_LENGTH;
-+ gst_adapter_push (mux->alignment_adapter, buf);
-+
-+ accu_bytes = gst_adapter_available (mux->alignment_adapter);
-+ GST_DEBUG_OBJECT (mux,
-+ "Accumulating packet in alignment adapter, accu_bytes=%i", accu_bytes);
-+
-+ if (accu_bytes == get_packets_per_buffer (mux) * packet_length) {
-+ out_buf = gst_adapter_take_buffer (mux->alignment_adapter, accu_bytes);
-+ gst_buffer_set_caps (out_buf, GST_PAD_CAPS (mux->srcpad));
-+ gst_adapter_clear (mux->alignment_adapter);
-+ GST_DEBUG_OBJECT (mux,
-+ "Accumulated desired amount of packets in alignment unit, handing off %i bytes",
-+ accu_bytes);
-+ return gst_pad_push (mux->srcpad, out_buf);
-+ } else if (accu_bytes > get_packets_per_buffer (mux) * packet_length) {
-+ GST_WARNING_OBJECT (mux, "Packet alignment error!");
-+ gst_adapter_clear (mux->alignment_adapter);
-+ return GST_FLOW_CUSTOM_ERROR;
-+ }
-+
-+ return GST_FLOW_OK;
-+}
-+
-+static void
-+mpegtsmux_eos_align (MpegTsMux * mux)
-+{
-+ guint accu_bytes, packet_length, packets_needed, dummy_packet_count;
-+ guint continuity_counter;
-+ unsigned char header[4];
-+ guint p;
-+ GstBuffer *buf;
-+ guint32 m2ts_header = 0;
-+
-+ accu_bytes = gst_adapter_available (mux->alignment_adapter);
-+ packet_length = mux->m2ts_mode ? M2TS_PACKET_LENGTH : NORMAL_TS_PACKET_LENGTH;
-+ packets_needed = get_packets_per_buffer (mux) - accu_bytes / packet_length;
-+
-+ if (get_packets_per_buffer (mux) == 0 || accu_bytes == 0) {
-+ return;
-+ }
-+
-+ GST_DEBUG_OBJECT (mux,
-+ "received EOS - %i bytes accumulated in alignment adapter -> %i dummy packets needed for padding!\n",
-+ accu_bytes, packets_needed);
-+
-+ if (mux->m2ts_mode) {
-+ gst_adapter_copy (mux->alignment_adapter, header,
-+ accu_bytes - packet_length, 4);
-+ m2ts_header = GST_READ_UINT32_BE (header);
-+ gst_adapter_copy (mux->alignment_adapter, header,
-+ accu_bytes - packet_length + 7, 1);
-+ } else {
-+ gst_adapter_copy (mux->alignment_adapter, header,
-+ accu_bytes - packet_length + 3, 1);
-+ }
-+
-+ continuity_counter = header[0] & 0xF;
-+
-+ for (dummy_packet_count = 0; dummy_packet_count < packets_needed;
-+ dummy_packet_count++) {
-+ buf = gst_buffer_new_and_alloc (packet_length);
-+ if (mux->m2ts_mode) {
-+ // monotonically increase m2ts_header
-+ m2ts_header++;
-+ GST_WRITE_UINT32_BE (GST_BUFFER_DATA (buf), m2ts_header);
-+ p = (guint) GST_BUFFER_DATA (buf) + 4;
-+ } else {
-+ p = (guint) GST_BUFFER_DATA (buf);
-+ }
-+ GST_WRITE_UINT8 (p++, TSMUX_SYNC_BYTE);
-+ // dummy PID
-+ GST_WRITE_UINT16_BE (p, 0x1FFF);
-+ p += 2;
-+ // adaptation field exists | no payload exists | continuity counter
-+ GST_WRITE_UINT8 (p++, 0x20 + ((++continuity_counter) & 0xF));
-+ // adaptation field length | flags
-+ GST_WRITE_UINT16_BE (p, 0xB700);
-+ p += 2;
-+ // adaptation field
-+ memset ((guint*)p, 0xFF, 0xB6);
-+
-+ aligned_push (mux, buf);
-+ GST_LOG_OBJECT (mux,
-+ "generated dummy packet %i with m2ts_header=0x%x, contiuity=0x%02x\n",
-+ dummy_packet_count, m2ts_header, continuity_counter);
-+ }
-+}
-+
- #define COLLECT_DATA_PAD(collect_data) (((GstCollectData *)(collect_data))->pad)
-
- static MpegTsPadData *
-@@ -971,6 +1175,7 @@
- } else {
- /* FIXME: Drain all remaining streams */
- /* At EOS */
-+ mpegtsmux_eos_align (mux);
- gst_pad_push_event (mux->srcpad, gst_event_new_eos ());
- }
-
-@@ -1081,7 +1286,7 @@
- GST_LOG_OBJECT (mux, "marking as delta unit");
- GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
- } else {
-- GST_DEBUG_OBJECT (mux, "marking as non-delta unit");
-+ GST_DEBUG_OBJECT (mux, "marking as non-delta unit, spn %i", mux->spn_count);
- mux->is_delta = TRUE;
- }
- }
-@@ -1104,6 +1309,8 @@
- return FALSE;
- }
-
-+// mux->spn_count++;
-+
- /* copies the TS data of 188 bytes to the m2ts buffer at an offset
- of 4 bytes to leave space for writing the timestamp later */
- memcpy (GST_BUFFER_DATA (buf) + 4, data, len);
-@@ -1168,13 +1375,25 @@
- break;
- gst_buffer_set_caps (out_buf, GST_PAD_CAPS (mux->srcpad));
- GST_BUFFER_TIMESTAMP (out_buf) = MPEG_SYS_TIME_TO_GSTTIME (cur_pcr);
-+
-+ mux->spn_count++;
-+
-+ if (mux->element_index) {
-+ if (!GST_BUFFER_FLAG_IS_SET (out_buf, GST_BUFFER_FLAG_DELTA_UNIT)) {
-+ gst_index_add_association (mux->element_index,
-+ mux->element_index_writer_id,
-+ GST_ASSOCIATION_FLAG_KEY_UNIT, spn_format,
-+ mux->spn_count, pts_format,
-+ GSTTIME_TO_MPEGTIME (GST_BUFFER_TIMESTAMP (out_buf)), NULL);
-+ }
-+ }
-
- /* Write the 4 byte timestamp value, bottom 30 bits only = PCR */
- GST_WRITE_UINT32_BE (GST_BUFFER_DATA (out_buf), cur_pcr & 0x3FFFFFFF);
-
- GST_LOG_OBJECT (mux, "Outputting a packet of length %d PCR %"
- G_GUINT64_FORMAT, M2TS_PACKET_LENGTH, cur_pcr);
-- ret = gst_pad_push (mux->srcpad, out_buf);
-+ ret = aligned_push (mux, out_buf);
- if (G_UNLIKELY (ret != GST_FLOW_OK)) {
- mux->last_flow_ret = ret;
- return FALSE;
-@@ -1190,7 +1409,7 @@
-
- GST_LOG_OBJECT (mux, "Outputting a packet of length %d PCR %"
- G_GUINT64_FORMAT, M2TS_PACKET_LENGTH, new_pcr);
-- ret = gst_pad_push (mux->srcpad, buf);
-+ ret = aligned_push (mux, buf);
- if (G_UNLIKELY (ret != GST_FLOW_OK)) {
- mux->last_flow_ret = ret;
- return FALSE;
-@@ -1221,7 +1440,7 @@
-
- GST_BUFFER_TIMESTAMP (buf) = mux->last_ts;
-
-- ret = gst_pad_push (mux->srcpad, buf);
-+ ret = aligned_push (mux, buf);
- if (G_UNLIKELY (ret != GST_FLOW_OK)) {
- mux->last_flow_ret = ret;
- return FALSE;
-@@ -1319,6 +1538,8 @@
- case GST_STATE_CHANGE_READY_TO_NULL:
- if (mux->adapter)
- gst_adapter_clear (mux->adapter);
-+ if (mux->alignment_adapter)
-+ gst_adapter_clear (mux->alignment_adapter);
- break;
- default:
- break;
-diff --git a/gst/mpegtsmux/mpegtsmux.h b/gst/mpegtsmux/mpegtsmux.h
-index 26003a8..1b88a33 100644
---- a/gst/mpegtsmux/mpegtsmux.h
-+++ b/gst/mpegtsmux/mpegtsmux.h
-@@ -130,6 +130,14 @@
- gboolean streamheader_sent;
- GstClockTime pending_key_unit_ts;
- GstEvent *force_key_unit_event;
-+
-+ guint32 spn_count;
-+ GstIndex *element_index;
-+ gint element_index_writer_id;
-+
-+ gboolean arbitrary_align;
-+ guint packets_per_buffer;
-+ GstAdapter *alignment_adapter;
- };
-
- struct MpegTsMuxClass {
-@@ -186,6 +194,9 @@
- #define MAX_PROG_NUMBER 32
- #define DEFAULT_PROG_ID 0
-
-+#define DEFAULT_PACKETS_PER_BUFFER 0
-+#define BDMV_PACKETS_PER_BUFFER 32
-+
- G_END_DECLS
-
- #endif
---
-1.7.5.4
-
+++ /dev/null
-From 9fce0ed5dd37daa6d98d0a4aaed05faafb2e6771 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Wed, 21 Mar 2012 15:55:42 +0100
-Subject: [PATCH 3/3] mpegpsdemux_speedup.diff
-
----
- gst/mpegdemux/gstmpegdemux.c | 52 +++++++++++++++++++++++++++++++++++++-----
- gst/mpegdemux/gstmpegdemux.h | 4 +++
- 2 files changed, 50 insertions(+), 6 deletions(-)
-
-diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c
-index 8359285..35a7ee9 100644
---- a/gst/mpegdemux/gstmpegdemux.c
-+++ b/gst/mpegdemux/gstmpegdemux.c
-@@ -285,7 +285,10 @@ gst_flups_demux_reset (GstFluPSDemux * demux)
- if (stream != NULL) {
- if (stream->pad)
- gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad);
--
-+ if (stream->buf)
-+ free(stream->buf);
-+ if (stream->meta_buf)
-+ gst_buffer_unref(stream->meta_buf);
- g_free (stream);
- demux->streams[i] = NULL;
- }
-@@ -415,6 +418,15 @@ gst_flups_demux_create_stream (GstFluPSDemux * demux, gint id, gint stream_type)
- stream->type = stream_type;
- stream->pad = gst_pad_new_from_template (template, name);
- stream->segment_thresh = threshold;
-+
-+ if (threshold == VIDEO_SEGMENT_THRESHOLD) {
-+ stream->buf = malloc(64*1024);
-+ stream->buf_pos = 0;
-+ stream->meta_buf = gst_buffer_new();
-+ }
-+ else
-+ stream->buf = 0;
-+
- gst_pad_set_event_function (stream->pad,
- GST_DEBUG_FUNCPTR (gst_flups_demux_src_event));
- gst_pad_set_query_function (stream->pad,
-@@ -466,6 +478,7 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
- GstFlowReturn result;
- guint64 timestamp;
- guint size;
-+ gboolean sent = FALSE;
-
- if (stream == NULL)
- goto no_stream;
-@@ -568,11 +581,38 @@ gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
- demux->next_pts = G_MAXUINT64;
- demux->next_dts = G_MAXUINT64;
-
-- result = gst_pad_push (stream->pad, buf);
-- GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, time: %"
-- GST_TIME_FORMAT ", size %d. result: %s",
-- stream->id, stream->type, GST_TIME_ARGS (timestamp),
-- size, gst_flow_get_name (result));
-+ if (stream->buf && stream->buf_pos && (timestamp != GST_CLOCK_TIME_NONE || stream->buf_pos+size > 64*1024)) {
-+ GstBuffer *tmp = gst_buffer_new_and_alloc(stream->buf_pos);
-+ gst_buffer_copy_metadata(tmp, stream->meta_buf, GST_BUFFER_COPY_ALL);
-+ GST_BUFFER_SIZE(tmp) = stream->buf_pos;
-+ memcpy(GST_BUFFER_DATA(tmp), stream->buf, stream->buf_pos);
-+ result = gst_pad_push (stream->pad, tmp);
-+ GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, time: %"
-+ GST_TIME_FORMAT ", size %d. result: %s",
-+ stream->id, stream->type, GST_TIME_ARGS (timestamp),
-+ stream->buf_pos, gst_flow_get_name (result));
-+ stream->buf_pos = 0;
-+ sent = TRUE;
-+ }
-+
-+ if (!stream->buf || size > 64*1024) {
-+ result = gst_pad_push (stream->pad, buf);
-+ GST_DEBUG_OBJECT (demux, "pushed stream id 0x%02x type 0x%02x, time: %"
-+ GST_TIME_FORMAT ", size %d. result: %s",
-+ stream->id, stream->type, GST_TIME_ARGS (timestamp),
-+ size, gst_flow_get_name (result));
-+ }
-+ else {
-+ if (!stream->buf_pos)
-+ gst_buffer_copy_metadata(stream->meta_buf, buf, GST_BUFFER_COPY_ALL);
-+
-+ memcpy(stream->buf + stream->buf_pos, GST_BUFFER_DATA(buf), size);
-+ stream->buf_pos += size;
-+ gst_buffer_unref(buf);
-+
-+ if (!sent)
-+ result = GST_FLOW_OK;
-+ }
-
- return result;
-
-diff --git a/gst/mpegdemux/gstmpegdemux.h b/gst/mpegdemux/gstmpegdemux.h
-index 6cf7aed..5977578 100644
---- a/gst/mpegdemux/gstmpegdemux.h
-+++ b/gst/mpegdemux/gstmpegdemux.h
-@@ -92,6 +92,10 @@ struct _GstFluPSStream
- gboolean discont;
- gboolean notlinked;
- gboolean need_segment;
-+
-+ GstBuffer *meta_buf;
-+ unsigned char *buf;
-+ size_t buf_pos;
- };
-
- struct _GstFluPSDemux
---
-1.7.5.4
-
+++ /dev/null
-diff -Naur git.org/gst/mpegdemux/gstmpegdemux.c git/gst/mpegdemux/gstmpegdemux.c
---- git.org/gst/mpegdemux/gstmpegdemux.c 2012-08-01 19:21:08.662409533 +0200
-+++ git/gst/mpegdemux/gstmpegdemux.c 2012-08-01 19:18:15.294405055 +0200
-@@ -292,7 +292,7 @@
- if (stream->pad)
- gst_element_remove_pad (GST_ELEMENT_CAST (demux), stream->pad);
- if (stream->buf)
-- free(stream->buf);
-+ g_free(stream->buf);
- if (stream->meta_buf)
- gst_buffer_unref(stream->meta_buf);
- g_free (stream);
-@@ -426,7 +426,7 @@
- stream->segment_thresh = threshold;
-
- if (threshold == VIDEO_SEGMENT_THRESHOLD) {
-- stream->buf = malloc(64*1024);
-+ stream->buf = g_malloc(64*1024);
- stream->buf_pos = 0;
- stream->meta_buf = gst_buffer_new();
- }
-@@ -481,7 +481,7 @@
- gst_flups_demux_send_data (GstFluPSDemux * demux, GstFluPSStream * stream,
- GstBuffer * buf)
- {
-- GstFlowReturn result;
-+ GstFlowReturn result = GST_FLOW_OK;
- guint64 timestamp;
- guint size;
- gboolean sent = FALSE;
+++ /dev/null
---- a/gst/hls/gsthlsdemux.c
-+++ b/gst/hls/gsthlsdemux.c
-@@ -1116,6 +1116,8 @@ gst_hls_demux_change_playlist (GstHLSDemux * demux, guint max_bitrate)
- GList *previous_variant, *current_variant;
- gint old_bandwidth, new_bandwidth;
-
-+ GST_M3U8_CLIENT_LOCK (demux->client);
-+
- /* If user specifies a connection speed never use a playlist with a bandwidth
- * superior than it */
- if (demux->connection_speed != 0 && max_bitrate > demux->connection_speed)
-@@ -1131,11 +1133,11 @@ retry_failover_protection:
-
- /* Don't do anything else if the playlist is the same */
- if (new_bandwidth == old_bandwidth) {
-+ GST_M3U8_CLIENT_UNLOCK (demux->client);
- return TRUE;
- }
-
- demux->client->main->current_variant = current_variant;
-- GST_M3U8_CLIENT_UNLOCK (demux->client);
-
- gst_m3u8_client_set_current (demux->client, current_variant->data);
-
-@@ -1152,9 +1154,9 @@ retry_failover_protection:
- gst_message_new_element (GST_OBJECT_CAST (demux), s));
- } else {
- GList *failover = NULL;
-+ gboolean ret;
-
- GST_INFO_OBJECT (demux, "Unable to update playlist. Switching back");
-- GST_M3U8_CLIENT_LOCK (demux->client);
-
- failover = g_list_previous (current_variant);
- if (failover && new_bandwidth == GST_M3U8 (failover->data)->bandwidth) {
-@@ -1163,19 +1165,26 @@ retry_failover_protection:
- }
-
- demux->client->main->current_variant = previous_variant;
-- GST_M3U8_CLIENT_UNLOCK (demux->client);
-+
- gst_m3u8_client_set_current (demux->client, previous_variant->data);
- /* Try a lower bitrate (or stop if we just tried the lowest) */
- if (new_bandwidth ==
- GST_M3U8 (g_list_first (demux->client->main->lists)->data)->bandwidth)
-- return FALSE;
-+
-+ ret = FALSE;
- else
-- return gst_hls_demux_change_playlist (demux, new_bandwidth - 1);
-+ ret = gst_hls_demux_change_playlist (demux, new_bandwidth - 1);
-+
-+ GST_M3U8_CLIENT_UNLOCK (demux->client);
-+
-+ return ret;
- }
-
- /* Force typefinding since we might have changed media type */
- demux->do_typefind = TRUE;
-
-+ GST_M3U8_CLIENT_UNLOCK (demux->client);
-+
- return TRUE;
- }
-
---- a/gst/hls/m3u8.c
-+++ b/gst/hls/m3u8.c
-@@ -423,7 +423,8 @@ gst_m3u8_client_new (const gchar * uri)
- client->current = NULL;
- client->sequence = -1;
- client->update_failed_count = 0;
-- client->lock = g_mutex_new ();
-+ client->lock = g_new0 (GStaticRecMutex, 1);
-+ g_static_rec_mutex_init(client->lock);
- gst_m3u8_set_uri (client->main, g_strdup (uri));
-
- return client;
-@@ -435,7 +436,9 @@ gst_m3u8_client_free (GstM3U8Client * self)
- g_return_if_fail (self != NULL);
-
- gst_m3u8_free (self->main);
-- g_mutex_free (self->lock);
-+ g_static_rec_mutex_free (self->lock);
-+ g_free (self->lock);
-+
- g_free (self);
- }
-
---- a/gst/hls/m3u8.h
-+++ b/gst/hls/m3u8.h
-@@ -32,8 +32,8 @@ typedef struct _GstM3U8Client GstM3U8Client;
- #define GST_M3U8(m) ((GstM3U8*)m)
- #define GST_M3U8_MEDIA_FILE(f) ((GstM3U8MediaFile*)f)
-
--#define GST_M3U8_CLIENT_LOCK(c) g_mutex_lock (c->lock);
--#define GST_M3U8_CLIENT_UNLOCK(c) g_mutex_unlock (c->lock);
-+#define GST_M3U8_CLIENT_LOCK(c) g_static_rec_mutex_lock (c->lock);
-+#define GST_M3U8_CLIENT_UNLOCK(c) g_static_rec_mutex_unlock (c->lock);
-
- struct _GstM3U8
- {
-@@ -73,7 +73,7 @@ struct _GstM3U8Client
- GstM3U8 *current;
- guint update_failed_count;
- gint sequence; /* the next sequence for this client */
-- GMutex *lock;
-+ GStaticRecMutex *lock;
- };
-
-
+++ /dev/null
-diff --git a/gst/hls/gsthlsdemux.c b/gst/hls/gsthlsdemux.c
-index 3308a29..09acee1 100644
---- a/gst/hls/gsthlsdemux.c
-+++ b/gst/hls/gsthlsdemux.c
-@@ -315,14 +315,6 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
- case GST_STATE_CHANGE_READY_TO_PAUSED:
- gst_hls_demux_reset (demux, FALSE);
- break;
-- case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
-- /* Start the streaming loop in paused only if we already received
-- the main playlist. It might have been stopped if we were in PAUSED
-- state and we filled our queue with enough cached fragments
-- */
-- if (gst_m3u8_client_get_uri (demux->client)[0] != '\0')
-- gst_task_start (demux->updates_task);
-- break;
- default:
- break;
- }
-@@ -330,17 +322,6 @@ gst_hls_demux_change_state (GstElement * element, GstStateChange transition)
- ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
-
- switch (transition) {
-- case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-- demux->cancelled = TRUE;
-- gst_uri_downloader_cancel (demux->downloader);
-- gst_task_stop (demux->updates_task);
-- g_mutex_lock (demux->updates_timed_lock);
-- GST_TASK_SIGNAL (demux->updates_task);
-- g_mutex_unlock (demux->updates_timed_lock);
-- g_static_rec_mutex_lock (&demux->updates_lock);
-- g_static_rec_mutex_unlock (&demux->updates_lock);
-- demux->cancelled = FALSE;
-- break;
- case GST_STATE_CHANGE_PAUSED_TO_READY:
- demux->cancelled = TRUE;
- gst_hls_demux_stop (demux);
-@@ -718,14 +699,14 @@ gst_hls_demux_stream_loop (GstHLSDemux * demux)
- * cache the first fragments and then it waits until it has more data in the
- * queue. This task is woken up when we push a new fragment to the queue or
- * when we reached the end of the playlist */
-+ GST_DEBUG_OBJECT (demux, "Enter task");
-
- if (G_UNLIKELY (demux->need_cache)) {
- if (!gst_hls_demux_cache_fragments (demux))
- goto cache_error;
-
- /* we can start now the updates thread (only if on playing) */
-- if (GST_STATE (demux) == GST_STATE_PLAYING)
-- gst_task_start (demux->updates_task);
-+ gst_task_start (demux->updates_task);
- GST_INFO_OBJECT (demux, "First fragments cached successfully");
- }
-
-@@ -765,10 +746,14 @@ gst_hls_demux_stream_loop (GstHLSDemux * demux)
- demux->position_shift = 0;
- }
-
-+ GST_DEBUG_OBJECT (demux, "Pushing buffer %p", buf);
-+
- ret = gst_pad_push_list (demux->srcpad, buffer_list);
- if (ret != GST_FLOW_OK)
- goto error_pushing;
-
-+ GST_DEBUG_OBJECT (demux, "Pushed buffer");
-+
- return;
-
- end_of_playlist:
-@@ -806,6 +791,7 @@ error_pushing:
-
- pause_task:
- {
-+ GST_DEBUG_OBJECT (demux, "Pause task");
- gst_task_pause (demux->stream_task);
- return;
- }
-@@ -877,10 +863,13 @@ gst_hls_demux_updates_loop (GstHLSDemux * demux)
- gst_hls_demux_schedule (demux);
-
- /* block until the next scheduled update or the signal to quit this thread */
-+ GST_DEBUG_OBJECT (demux, "Waiting");
- if (g_cond_timed_wait (GST_TASK_GET_COND (demux->updates_task),
- demux->updates_timed_lock, &demux->next_update)) {
-+ GST_DEBUG_OBJECT (demux, "Unlocked");
- goto quit;
- }
-+ GST_DEBUG_OBJECT (demux, "Continue");
-
- if (demux->cancelled)
- goto quit;
-@@ -918,6 +907,7 @@ gst_hls_demux_updates_loop (GstHLSDemux * demux)
-
- /* fetch the next fragment */
- if (g_queue_is_empty (demux->queue)) {
-+ GST_DEBUG_OBJECT (demux, "queue empty, get next fragment");
- if (!gst_hls_demux_get_next_fragment (demux, FALSE)) {
- if (demux->cancelled) {
- goto quit;
-@@ -1289,6 +1279,7 @@ gst_hls_demux_get_next_fragment (GstHLSDemux * demux, gboolean caching)
- GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_DISCONT);
- }
-
-+ GST_DEBUG_OBJECT (demux, "Pushing fragment in queue");
- g_queue_push_tail (demux->queue, download);
- gst_buffer_list_unref (buffer_list);
- if (!caching) {
-diff --git a/gst/hls/m3u8.c b/gst/hls/m3u8.c
-index 65afa8b..b6c04a8 100644
---- a/gst/hls/m3u8.c
-+++ b/gst/hls/m3u8.c
-@@ -37,6 +37,7 @@ static gboolean gst_m3u8_update (GstM3U8 * m3u8, gchar * data,
- static GstM3U8MediaFile *gst_m3u8_media_file_new (gchar * uri,
- gchar * title, GstClockTime duration, guint sequence);
- static void gst_m3u8_media_file_free (GstM3U8MediaFile * self);
-+gchar *uri_join (const gchar * uri, const gchar * path);
-
- static GstM3U8 *
- gst_m3u8_new (void)
-@@ -270,24 +271,9 @@ gst_m3u8_update (GstM3U8 * self, gchar * data, gboolean * updated)
- goto next_line;
- }
-
-- if (!gst_uri_is_valid (data)) {
-- gchar *slash;
-- if (!self->uri) {
-- GST_WARNING ("uri not set, can't build a valid uri");
-- goto next_line;
-- }
-- slash = g_utf8_strrchr (self->uri, -1, '/');
-- if (!slash) {
-- GST_WARNING ("Can't build a valid uri");
-- goto next_line;
-- }
--
-- *slash = '\0';
-- data = g_strdup_printf ("%s/%s", self->uri, data);
-- *slash = '/';
-- } else {
-- data = g_strdup (data);
-- }
-+ data = uri_join (self->uri, data);
-+ if (data == NULL)
-+ goto next_line;
-
- r = g_utf8_strchr (data, -1, '\r');
- if (r)
-@@ -674,3 +660,51 @@ gst_m3u8_client_get_playlist_for_bitrate (GstM3U8Client * client, guint bitrate)
-
- return current_variant;
- }
-+
-+gchar *
-+uri_join (const gchar * uri1, const gchar * uri2)
-+{
-+ gchar *uri_copy, *tmp, *ret = NULL;
-+
-+ if (gst_uri_is_valid (uri2))
-+ return g_strdup (uri2);
-+
-+ uri_copy = g_strdup (uri1);
-+ if (uri2[0] != '/') {
-+ /* uri2 is a relative uri2 */
-+ tmp = g_utf8_strrchr (uri_copy, -1, '/');
-+ if (!tmp) {
-+ GST_WARNING ("Can't build a valid uri_copy");
-+ goto out;
-+ }
-+
-+ *tmp = '\0';
-+ ret = g_strdup_printf ("%s/%s", uri_copy, uri2);
-+ } else {
-+ /* uri2 is an absolute uri2 */
-+ char *scheme, *hostname;
-+
-+ scheme = uri_copy;
-+ /* find the : in <scheme>:// */
-+ tmp = g_utf8_strchr (uri_copy, -1, ':');
-+ if (!tmp) {
-+ GST_WARNING ("Can't build a valid uri_copy");
-+ goto out;
-+ }
-+
-+ *tmp = '\0';
-+
-+ /* skip :// */
-+ hostname = tmp + 3;
-+
-+ tmp = g_utf8_strchr (hostname, -1, '/');
-+ if (tmp)
-+ *tmp = '\0';
-+
-+ ret = g_strdup_printf ("%s://%s%s", scheme, hostname, uri2);
-+ }
-+
-+out:
-+ g_free (uri_copy);
-+ return ret;
-+}
+++ /dev/null
-diff -Naur org/ext/rtmp/gstrtmpsrc.c git/ext/rtmp/gstrtmpsrc.c
---- org/ext/rtmp/gstrtmpsrc.c 2013-07-16 17:17:38.000000000 +0200
-+++ git/ext/rtmp/gstrtmpsrc.c 2013-07-16 17:20:56.154789765 +0200
-@@ -57,8 +57,6 @@
- #include <winsock2.h>
- #endif
-
--#include <sys/socket.h>
--
- GST_DEBUG_CATEGORY_STATIC (rtmpsrc_debug);
- #define GST_CAT_DEFAULT rtmpsrc_debug
-
-@@ -84,7 +82,6 @@
- GValue * value, GParamSpec * pspec);
- static void gst_rtmp_src_finalize (GObject * object);
-
--static gboolean gst_rtmp_src_unlock (GstBaseSrc * src);
- static gboolean gst_rtmp_src_stop (GstBaseSrc * src);
- static gboolean gst_rtmp_src_start (GstBaseSrc * src);
- static gboolean gst_rtmp_src_is_seekable (GstBaseSrc * src);
-@@ -148,7 +145,6 @@
-
- gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_rtmp_src_start);
- gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_rtmp_src_stop);
-- gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_rtmp_src_unlock);
- gstbasesrc_class->is_seekable = GST_DEBUG_FUNCPTR (gst_rtmp_src_is_seekable);
- gstbasesrc_class->prepare_seek_segment =
- GST_DEBUG_FUNCPTR (gst_rtmp_src_prepare_seek_segment);
-@@ -584,24 +580,6 @@
- #undef STR2AVAL
-
- static gboolean
--gst_rtmp_src_unlock (GstBaseSrc * basesrc)
--{
-- GstRTMPSrc *rtmpsrc = GST_RTMP_SRC (basesrc);
--
-- GST_DEBUG_OBJECT (rtmpsrc, "unlock");
--
-- /* This cancels the recv() underlying RTMP_Read, but will cause a
-- * SIGPIPE. Hopefully the app is ignoring it, or you've patched
-- * librtmp. */
-- if (rtmpsrc->rtmp && rtmpsrc->rtmp->m_sb.sb_socket > 0) {
-- shutdown (rtmpsrc->rtmp->m_sb.sb_socket, SHUT_RDWR);
-- }
--
-- return TRUE;
--}
--
--
--static gboolean
- gst_rtmp_src_stop (GstBaseSrc * basesrc)
- {
- GstRTMPSrc *src;
+++ /dev/null
-From bf4042d879346bb90814856b7eb023706d1a8e15 Mon Sep 17 00:00:00 2001
-From: betacentauri <@>
-Date: Sat, 29 Jun 2013 14:33:34 +0200
-Subject: [PATCH] Lower rank of faad to prevent using it if not necessary
-
----
- ext/faad/gstfaad.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/faad/gstfaad.c b/ext/faad/gstfaad.c
-index e106da9..82fd547 100644
---- a/ext/faad/gstfaad.c
-+++ b/ext/faad/gstfaad.c
-@@ -893,7 +893,7 @@ gst_faad_close_decoder (GstFaad * faad)
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
-- return gst_element_register (plugin, "faad", GST_RANK_PRIMARY, GST_TYPE_FAAD);
-+ return gst_element_register (plugin, "faad", GST_RANK_SECONDARY, GST_TYPE_FAAD);
- }
-
- GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
---
-1.7.9.5
-
+++ /dev/null
-From 114ec19a882192dfcb5f71bb12c811d0a3b7f324 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Tue, 8 May 2012 17:27:55 +0200
-Subject: [PATCH] orc.m4: fix location of orcc when cross-compiling
-
-* Prepend PKG_CONFIG_SYSROOT to orcc, so configure doesn't
- accidentially use an incompatible version of orcc installed
- on the build system.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- m4/orc.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/common/m4/orc.m4 b/common/m4/orc.m4
-index 26b2459..81b111e 100644
---- a/common/m4/orc.m4
-+++ b/common/m4/orc.m4
-@@ -3,6 +3,8 @@ dnl pkg-config-based checks for Orc
- dnl specific:
- dnl ORC_CHECK([REQUIRED_VERSION])
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([ORC_CHECK],
- [
- ORC_REQ=ifelse([$1], , "0.4.6", [$1])
-@@ -24,7 +26,7 @@ AC_DEFUN([ORC_CHECK],
- HAVE_ORC=yes
- if test "x$ORCC" = "x" ; then
- AC_MSG_CHECKING(for usable orcc)
-- ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-+ ORCC=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
- dnl check whether the orcc found by pkg-config can be run from the build environment
- dnl if this is not the case (e.g. when cross-compiling) fall back to orcc from PATH
- AS_IF([$ORCC --version 1> /dev/null 2> /dev/null], [], [ORCC=`which orcc`])
---
-1.7.9.5
-
+++ /dev/null
-require recipes-multimedia/gstreamer/gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
- file://gst/tta/filters.h;beginline=12;endline=29;md5=629b0c7a665d155a6677778f4460ec06 \
- file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
- file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
-
-DEPENDS += "libmusicbrainz tremor curl libmms librtmp libmms faad2"
-DEPENDS += "gst-plugins-base"
-CONFLICTS = "librsvg"
-
-PR = "r6"
-GIT_PV = ""
-
-SRCREV = "cef47d85294a0dca38631f938b81a3f0dd6891bd"
-
-EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb --enable-faad \
- --disable-vdpau --disable-apexsink --enable-orc --disable-mpeg2enc --disable-mplex --disable-rsvg --disable-uvch264"
-
-ARM_INSTRUCTION_SET = "arm"
-
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN};branch=0.10"
-
-SRC_URI += " \
- file://0003-mpegpsdemux_speedup.diff.patch \
- file://0004-mpegdemux-compile-fixes.patch \
- file://0005-hlsdemux-locking-fixes.patch \
- file://0006-hlsdemux-backport.patch \
- file://0007-revert-rtmp-change.patch \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \
- file://Lower-rank-of-faad-to-prevent-using-it-if-not-necess.patch \
-"
-
-inherit autotools pkgconfig gettext git-project
-
-do_common_update() {
- cd ${S}
- # Make sure we have common
- if test ! -f common/gst-autogen.sh;
- then
- echo "+ Setting up common submodule"
- git submodule init
- fi
- git submodule update
-
- # source helper functions
- if test ! -f common/gst-autogen.sh;
- then
- echo There is something wrong with your source tree.
- echo You are missing common/gst-autogen.sh
- exit 1
- fi
- . common/gst-autogen.sh
- # install pre-commit hook for doing clean commits
- if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
- then
- rm -f .git/hooks/pre-commit
- ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit
- fi
-
- # GNU gettext automake support doesn't get along with git.
- # https://bugzilla.gnome.org/show_bug.cgi?id=661128
- autopoint || touch config.rpath
- touch -t 200001010000 po/gst-plugins-base-0.10.pot
-}
-addtask common_update after do_unpack before do_patch
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-require mips-only.inc
+++ /dev/null
-DEPENDS += "libmms librtmp"
-PR .= "-vuplus0"
-
-SRC_URI += " \
- file://0001-mpegtsdemux-fix-bd-streamtype-detection.diff.patch \
- file://0002-add-indexing-capabilities-to-generate-a-SPN-PTS-map-.patch \
- file://0003-mpegpsdemux_speedup.diff.patch \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \
-"
-
-EXTRA_OECONF += "--enable-orc --with-plugins="
-# fix "configure: error: cannot run test program while cross compiling"
-EXTRA_OECONF += "--disable-mpeg2enc --disable-mplex"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+++ /dev/null
-Upstream-Status: Submitted [similar patch by other author, bugzilla]
-Bugtracker-URL: https://bugzilla.gnome.org/show_bug.cgi?id=663600
-
-Prepend PKG_CONFIG_SYSROOT to includedir, so configure doesn't
-search for gstconfig.h in /usr/include.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- configure.ac | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1901bcf..460fb0a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -435,7 +435,7 @@ AG_GST_CHECK_PLUGIN(volume)
- dnl check for gstreamer core features (subsystems)
- dnl FIXME: this assumes srcdir == builddir for uninstalled setups
- GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h"
--AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH)
-+AG_GST_PARSE_SUBSYSTEM_DISABLES($PKG_CONFIG_SYSROOT_DIR$GST_CONFIGPATH)
- AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1")
-
- dnl disable plug-ins that require libxml2's HTML support if it is not available
---
-1.7.5.4
-
+++ /dev/null
-../gst-plugins-base-0.10.36/disable-vorbis-encoder.patch
\ No newline at end of file
+++ /dev/null
-Remove -DTREMOR option since Tremor has dropped its internal
-libogg2, and gst-plugins-base has dependency on that.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-Signed-off-by: Shane Wang <shane.wang@intel.com>
-
-diff -r 70065fb4e085 ext/vorbis/Makefile.am
---- a/ext/vorbis/Makefile.am Tue Mar 13 16:36:56 2012 +0800
-+++ b/ext/vorbis/Makefile.am Tue Mar 13 16:38:53 2012 +0800
-@@ -30,7 +30,7 @@
- gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c
- libgstivorbisdec_la_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-- -DTREMOR $(IVORBIS_CFLAGS)
-+ $(IVORBIS_CFLAGS)
- libgstivorbisdec_la_LIBADD = \
- $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \
- $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
+++ /dev/null
-../gst-plugins-base-0.10.36/orc.m4-fix-location-of-orcc-when-cross-compiling.patch
\ No newline at end of file
+++ /dev/null
---- a/configure.ac 2012-08-25 00:33:07.000000000 +0200
-+++ b/configure.ac 2012-08-25 00:34:12.730232665 +0200
-@@ -806,7 +806,7 @@
- dnl AM_PATH_VORBIS only takes two options
- translit(dnm, m, l) AM_CONDITIONAL(USE_VORBIS, true)
- AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [
-- AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0 vorbisenc >= 1.0)
-+ AG_GST_PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0)
- if test $HAVE_VORBIS = no
- then
- XIPH_PATH_VORBIS(HAVE_VORBIS="yes", HAVE_VORBIS="no")
---- a/ext/vorbis/gstvorbis.c 2012-08-25 00:34:05.086232463 +0200
-+++ b/ext/vorbis/gstvorbis.c 2012-08-25 00:33:32.000000000 +0200
-@@ -36,10 +36,6 @@
- static gboolean
- plugin_init (GstPlugin * plugin)
- {
-- if (!gst_element_register (plugin, "vorbisenc", GST_RANK_PRIMARY,
-- GST_TYPE_VORBISENC))
-- return FALSE;
--
- if (!gst_element_register (plugin, "vorbisdec", GST_RANK_PRIMARY,
- gst_vorbis_dec_get_type ()))
- return FALSE;
-@@ -52,8 +48,6 @@
- gst_vorbis_tag_get_type ()))
- return FALSE;
-
-- GST_DEBUG_CATEGORY_INIT (vorbisenc_debug, "vorbisenc", 0,
-- "vorbis encoding element");
- GST_DEBUG_CATEGORY_INIT (vorbisdec_debug, "vorbisdec", 0,
- "vorbis decoding element");
- GST_DEBUG_CATEGORY_INIT (vorbisparse_debug, "vorbisparse", 0,
---- a/ext/vorbis/Makefile.am 2012-08-25 00:34:05.086232463 +0200
-+++ b/ext/vorbis/Makefile.am 2012-08-25 00:33:32.000000000 +0200
-@@ -6,7 +6,6 @@
- libgstvorbis_la_SOURCES = gstvorbis.c \
- gstvorbisdec.c \
- gstvorbisdeclib.c \
-- gstvorbisenc.c \
- gstvorbisparse.c \
- gstvorbistag.c \
- gstvorbiscommon.c
---- a/m4/vorbis.m4 2012-08-25 00:34:05.086232463 +0200
-+++ b/m4/vorbis.m4 2012-08-25 00:33:32.000000000 +0200
-@@ -26,7 +26,7 @@
-
- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
- VORBISFILE_LIBS="-lvorbisfile"
-- VORBISENC_LIBS="-lvorbisenc"
-+ VORBISENC_LIBS=""
-
- if test "x$vorbis_includes" != "x" ; then
- VORBIS_CFLAGS="-I$vorbis_includes"
+++ /dev/null
-From 114ec19a882192dfcb5f71bb12c811d0a3b7f324 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Tue, 8 May 2012 17:27:55 +0200
-Subject: [PATCH] orc.m4: fix location of orcc when cross-compiling
-
-* Prepend PKG_CONFIG_SYSROOT to orcc, so configure doesn't
- accidentially use an incompatible version of orcc installed
- on the build system.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- m4/orc.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/common/m4/orc.m4 b/common/m4/orc.m4
-index 26b2459..81b111e 100644
---- a/common/m4/orc.m4
-+++ b/common/m4/orc.m4
-@@ -3,6 +3,8 @@ dnl pkg-config-based checks for Orc
- dnl specific:
- dnl ORC_CHECK([REQUIRED_VERSION])
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([ORC_CHECK],
- [
- ORC_REQ=ifelse([$1], , "0.4.6", [$1])
-@@ -24,7 +26,7 @@ AC_DEFUN([ORC_CHECK],
- HAVE_ORC=yes
- if test "x$ORCC" = "x" ; then
- AC_MSG_CHECKING(for usable orcc)
-- ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-+ ORCC=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
- dnl check whether the orcc found by pkg-config can be run from the build environment
- dnl if this is not the case (e.g. when cross-compiling) fall back to orcc from PATH
- AS_IF([$ORCC --version 1> /dev/null 2> /dev/null], [], [ORCC=`which orcc`])
---
-1.7.9.5
-
+++ /dev/null
-require recipes-multimedia/gstreamer/gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
- file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
- file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0"
-
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
-DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor orc orc-native cdparanoia"
-DEPENDS += "gstreamer"
-
-SRCREV = "bdb33163478fdf95938fbdca7eabad3ea920a277"
-
-PR = "r2"
-GIT_PV = ""
-
-inherit autotools pkgconfig gettext git-project
-
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN};branch=0.10"
-
-SRC_URI += " \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \
- file://disable-vorbis-encoder.patch \
- file://gst-plugins-base-tremor.patch \
- file://configure.ac-fix-subparse-plugin.patch \
-"
-
-do_common_update() {
- cd ${S}
- # Make sure we have common
- if test ! -f common/gst-autogen.sh;
- then
- echo "+ Setting up common submodule"
- git submodule init
- fi
- git submodule update
-
- # source helper functions
- if test ! -f common/gst-autogen.sh;
- then
- echo There is something wrong with your source tree.
- echo You are missing common/gst-autogen.sh
- exit 1
- fi
- . common/gst-autogen.sh
- # install pre-commit hook for doing clean commits
- if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
- then
- rm -f .git/hooks/pre-commit
- ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit
- fi
-
- # GNU gettext automake support doesn't get along with git.
- # https://bugzilla.gnome.org/show_bug.cgi?id=661128
- autopoint || touch config.rpath
- touch -t 200001010000 po/gst-plugins-base-0.10.pot
-}
-addtask common_update after do_unpack before do_patch
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-require mips-only.inc
+++ /dev/null
-DEPENDS += "cdparanoia orc orc-native"
-PR .= "-vuplus0"
-
-SRC_URI += "file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \
- file://disable-vorbis-encoder.patch"
-
-EXTRA_OECONF += "--enable-orc"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+++ /dev/null
-gst-plugins-good-0.10.31
\ No newline at end of file
+++ /dev/null
-From f80b60feb376b3ea0947631b8fd260fd690e4012 Mon Sep 17 00:00:00 2001
-From: Andreas Monzner <andreas.monzner@dream-property.net>
-Date: Thu, 27 Dec 2012 12:05:27 +0100
-Subject: [PATCH] accept substream syncwords (DTS-HD)
-
----
- gst/audioparsers/gstdcaparse.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/gst/audioparsers/gstdcaparse.c b/gst/audioparsers/gstdcaparse.c
-index 2bf0e38..3a87efb 100644
---- a/gst/audioparsers/gstdcaparse.c
-+++ b/gst/audioparsers/gstdcaparse.c
-@@ -377,6 +377,11 @@ gst_dca_parse_check_valid_frame (GstBaseParse * parse,
-
- if (!gst_dca_parse_parse_header (dcaparse, &r, &s2, &r2, &c2, NULL, NULL,
- &n2, &s3, &t)) {
-+ guint32 marker = gst_byte_reader_peek_uint32_be_unchecked (&r);
-+ if (marker == 0x64582025 || marker == 0x58642520) {
-+ GST_DEBUG_OBJECT (dcaparse, "found substream syncword... accept it..");
-+ return TRUE;
-+ }
- GST_DEBUG_OBJECT (dcaparse, "didn't find second syncword");
- *skipsize = 4;
- return FALSE;
---
-1.7.10.4
-
+++ /dev/null
-From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-Date: Thu, 22 Aug 2013 12:15:54 -0400
-Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER
-
-kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls]
-removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three
-years of depreciation.
-
-The ioctl values are still free, and the case statement which processess them
-in v4l2 userspace falls through to the proper replacement. So in the short
-term, we can explicitly define them using the old absolute values, and everything
-will work.
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
----
- sys/v4l2/v4l2_calls.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
-index 309bfb6..3c64544 100644
---- a/sys/v4l2/v4l2_calls.c
-+++ b/sys/v4l2/v4l2_calls.c
-@@ -54,11 +54,16 @@
- #include "gst/gst-i18n-plugin.h"
-
- /* Those are ioctl calls */
-+
-+/* V4L2_CID_HCENTER has been removed from the mainline kernel, but
-+ the ioctl space is still present. Since these values fall through
-+ to their replacement, it is safe (in the short term) to re-use the
-+ old values explictily */
- #ifndef V4L2_CID_HCENTER
--#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
-+#define V4L2_CID_HCENTER V4L2_CID_BASE+22
- #endif
- #ifndef V4L2_CID_VCENTER
--#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
-+#define V4L2_CID_VCENTER V4L2_CID_BASE+23
- #endif
-
- GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
---
-1.7.10.4
-
+++ /dev/null
-From f4ac6c27e670473fc2944ecc6563fff7170dede3 Mon Sep 17 00:00:00 2001
-From: betacentauri <@>
-Date: Mon, 1 Jul 2013 17:41:53 +0200
-Subject: [PATCH] [MatroskaDemux] Set profile field in cap for aac audio
-
----
- gst/matroska/matroska-demux.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
-index e9ce024..34e92b0 100644
---- a/gst/matroska/matroska-demux.c
-+++ b/gst/matroska/matroska-demux.c
-@@ -5413,6 +5413,8 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
- "mpegversion", G_TYPE_INT, mpegversion,
- "framed", G_TYPE_BOOLEAN, TRUE, NULL);
- gst_caps_set_simple (caps, "codec_data", GST_TYPE_BUFFER, priv, NULL);
-+ if (context->codec_priv && context->codec_priv_size > 0)
-+ gst_codec_utils_aac_caps_set_level_and_profile (caps, context->codec_priv, context->codec_priv_size);
- *codec_name = g_strdup_printf ("MPEG-%d AAC audio", mpegversion);
- gst_buffer_unref (priv);
- }
---
-1.7.9.5
-
+++ /dev/null
-diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c
-index 203cb76..a8d4005 100644
---- a/gst/flv/gstflvdemux.c
-+++ b/gst/flv/gstflvdemux.c
-@@ -694,6 +694,9 @@ gst_flv_demux_audio_negotiate (GstFlvDemux * demux, guint32 codec_tag,
- caps = gst_caps_new_simple ("audio/mpeg",
- "mpegversion", G_TYPE_INT, 4, "framed", G_TYPE_BOOLEAN, TRUE,
- "stream-format", G_TYPE_STRING, "raw", NULL);
-+ if (demux->audio_codec_data &&
-+ GST_BUFFER_SIZE (demux->audio_codec_data) >= 2)
-+ gst_codec_utils_aac_caps_set_level_and_profile (caps, GST_BUFFER_DATA (demux->audio_codec_data), GST_BUFFER_SIZE (demux->audio_codec_data));
- break;
- }
- case 7:
+++ /dev/null
---- gst-plugins-good-0.10.30/gst/audioparsers/plugin.c~ 2012-01-04 21:55:58.816556710 +0100
-+++ gst-plugins-good-0.10.30/gst/audioparsers/plugin.c 2012-01-04 21:55:58.843221178 +0100
-@@ -34,13 +34,13 @@
- gboolean ret;
-
- ret = gst_element_register (plugin, "aacparse",
-- GST_RANK_PRIMARY + 1, GST_TYPE_AAC_PARSE);
-+ GST_RANK_PRIMARY + 2, GST_TYPE_AAC_PARSE);
- ret &= gst_element_register (plugin, "amrparse",
- GST_RANK_PRIMARY + 1, GST_TYPE_AMR_PARSE);
- ret &= gst_element_register (plugin, "ac3parse",
-- GST_RANK_PRIMARY + 1, GST_TYPE_AC3_PARSE);
-+ GST_RANK_PRIMARY + 2, GST_TYPE_AC3_PARSE);
- ret &= gst_element_register (plugin, "dcaparse",
-- GST_RANK_PRIMARY + 1, GST_TYPE_DCA_PARSE);
-+ GST_RANK_PRIMARY + 2, GST_TYPE_DCA_PARSE);
- ret &= gst_element_register (plugin, "flacparse",
- GST_RANK_PRIMARY + 1, GST_TYPE_FLAC_PARSE);
- ret &= gst_element_register (plugin, "mpegaudioparse",
+++ /dev/null
-From 114ec19a882192dfcb5f71bb12c811d0a3b7f324 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Tue, 8 May 2012 17:27:55 +0200
-Subject: [PATCH] orc.m4: fix location of orcc when cross-compiling
-
-* Prepend PKG_CONFIG_SYSROOT to orcc, so configure doesn't
- accidentially use an incompatible version of orcc installed
- on the build system.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- m4/orc.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/common/m4/orc.m4 b/common/m4/orc.m4
-index 26b2459..81b111e 100644
---- a/common/m4/orc.m4
-+++ b/common/m4/orc.m4
-@@ -3,6 +3,8 @@ dnl pkg-config-based checks for Orc
- dnl specific:
- dnl ORC_CHECK([REQUIRED_VERSION])
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([ORC_CHECK],
- [
- ORC_REQ=ifelse([$1], , "0.4.6", [$1])
-@@ -24,7 +26,7 @@ AC_DEFUN([ORC_CHECK],
- HAVE_ORC=yes
- if test "x$ORCC" = "x" ; then
- AC_MSG_CHECKING(for usable orcc)
-- ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-+ ORCC=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
- dnl check whether the orcc found by pkg-config can be run from the build environment
- dnl if this is not the case (e.g. when cross-compiling) fall back to orcc from PATH
- AS_IF([$ORCC --version 1> /dev/null 2> /dev/null], [], [ORCC=`which orcc`])
---
-1.7.9.5
-
+++ /dev/null
-diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c
-index b6e313c..7ecc04d 100644
---- a/gst/rtsp/gstrtspsrc.c
-+++ b/gst/rtsp/gstrtspsrc.c
-@@ -5351,12 +5351,13 @@ gst_rtspsrc_setup_streams (GstRTSPSrc * src, gboolean async)
- case GST_RTSP_LOWER_TRANS_UDP_MCAST:
- /* only allow multicast for other streams */
- GST_DEBUG_OBJECT (src, "stream %p as UDP multicast", stream);
-- protocols = GST_RTSP_LOWER_TRANS_UDP_MCAST;
-+ //
-+ //protocols = GST_RTSP_LOWER_TRANS_UDP_MCAST;
- break;
- case GST_RTSP_LOWER_TRANS_UDP:
- /* only allow unicast for other streams */
- GST_DEBUG_OBJECT (src, "stream %p as UDP unicast", stream);
-- protocols = GST_RTSP_LOWER_TRANS_UDP;
-+ //protocols = GST_RTSP_LOWER_TRANS_UDP;
- break;
- default:
- GST_DEBUG_OBJECT (src, "stream %p unknown transport %d", stream,
+++ /dev/null
-diff -Naur git.org/sys/v4l2/gstv4l2object.c git/sys/v4l2/gstv4l2object.c
---- git.org/sys/v4l2/gstv4l2object.c 2012-12-27 21:32:12.000000000 +0000
-+++ git/sys/v4l2/gstv4l2object.c 2012-12-27 21:41:58.989064164 +0000
-@@ -2108,8 +2108,8 @@
- *interlaced = FALSE;
- break;
- case V4L2_FIELD_INTERLACED:
-- case V4L2_FIELD_INTERLACED_TB:
-- case V4L2_FIELD_INTERLACED_BT:
-+// case V4L2_FIELD_INTERLACED_TB:
-+// case V4L2_FIELD_INTERLACED_BT:
- *interlaced = TRUE;
- break;
- default:
+++ /dev/null
-require recipes-multimedia/gstreamer/gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
- file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
-
-DEPENDS += "cdparanoia cairo jpeg libpng zlib libid3tag flac speex libsoup-2.4"
-DEPENDS += "gst-plugins-base"
-
-PR = "r5"
-GIT_PV = ""
-
-SRCREV = "7768342230450559509e3e593b2ea33e81ea0ca4"
-
-EXTRA_OECONF = "--enable-orc --disable-esd --disable-aalib --disable-shout2 --disable-libcaca --disable-hal"
-
-inherit autotools pkgconfig gettext git-project
-
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN};branch=0.10"
-
-SRC_URI += " \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \
- file://0001-accept-substream-syncwords-DTS-HD.patch \
- file://0004-MatroskaDemux-Set-profile-field-in-cap-for-aac-audio.patch \
- file://0005-FlvDemux-Set-profile-field-in-cap-for-aac-audio.patch \
- file://rtsp-check-all-protocols.patch;apply=yes;striplevel=1 \
-"
-
-SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch"
-
-
-do_common_update() {
- cd ${S}
- # Make sure we have common
- if test ! -f common/gst-autogen.sh;
- then
- echo "+ Setting up common submodule"
- git submodule init
- fi
- git submodule update
-
- # source helper functions
- if test ! -f common/gst-autogen.sh;
- then
- echo There is something wrong with your source tree.
- echo You are missing common/gst-autogen.sh
- exit 1
- fi
- . common/gst-autogen.sh
- # install pre-commit hook for doing clean commits
- if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
- then
- rm -f .git/hooks/pre-commit
- ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit
- fi
-
- # GNU gettext automake support doesn't get along with git.
- # https://bugzilla.gnome.org/show_bug.cgi?id=661128
- autopoint || touch config.rpath
- touch -t 200001010000 po/gst-plugins-base-0.10.pot
-}
-addtask common_update after do_unpack before do_patch
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-require mips-only.inc
+++ /dev/null
-DEPENDS := "${@oe_filter_out('^(gconf|pulseaudio)$', '${DEPENDS}', d)}"
-PR .= "-vuplus0"
-
-SRC_URI += "file://audioparser-raise-ranks.patch \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch"
-
-EXTRA_OECONF += "--enable-orc"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+++ /dev/null
-gst-plugins-ugly-0.10.19
\ No newline at end of file
+++ /dev/null
-From: Fraxinas <andreas.frisch@multimedia-labs.de>
-Subject: [PATCH] dvdsubdec: add singlebuffer property (fixes bug 619136)
-
-diff -u a/gst/dvdsub/gstdvdsubdec.c b/gst/dvdsub/gstdvdsubdec.c
---- a/gst/dvdsub/gstdvdsubdec.c 2009-11-05 19:06:16.000000000 +0100
-+++ b/gst/dvdsub/gstdvdsubdec.c 2010-05-26 16:27:06.000000000 +0200
-@@ -41,6 +41,10 @@
- static GstClockTime gst_dvd_sub_dec_get_event_delay (GstDvdSubDec * dec);
- static gboolean gst_dvd_sub_dec_sink_event (GstPad * pad, GstEvent * event);
- static gboolean gst_dvd_sub_dec_sink_setcaps (GstPad * pad, GstCaps * caps);
-+static void gst_dvd_sub_set_property (GObject * object, guint prop_id,
-+ const GValue * value, GParamSpec * pspec);
-+static void gst_dvd_sub_get_property (GObject * object, guint prop_id,
-+ GValue * value, GParamSpec * pspec);
-
- static GstFlowReturn gst_send_subtitle_frame (GstDvdSubDec * dec,
- GstClockTime end_ts);
-@@ -100,6 +104,9 @@
- }
- RLE_state;
-
-+#define ARG_SINGLEBUFFER 0x01
-+#define DEFAULT_SINGLEBUFFER FALSE
-+
- static void
- gst_dvd_sub_dec_base_init (gpointer klass)
- {
-@@ -123,6 +130,13 @@
-
- gobject_class = (GObjectClass *) klass;
-
-+ gobject_class->set_property = gst_dvd_sub_set_property;
-+ gobject_class->get_property = gst_dvd_sub_get_property;
-+
-+ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SINGLEBUFFER,
-+ g_param_spec_boolean ("singlebuffer", "Single Buffer", "invoke only one single buffer upon changed dvd subpicture. false will output continuous video stream",
-+ DEFAULT_SINGLEBUFFER, G_PARAM_READWRITE));
-+
- gobject_class->finalize = gst_dvd_sub_dec_finalize;
- }
-
-@@ -167,6 +181,40 @@
- dec->out_buffer = NULL;
- dec->buf_dirty = TRUE;
- dec->use_ARGB = FALSE;
-+
-+ dec->singlebuffer = DEFAULT_SINGLEBUFFER;
-+}
-+
-+static void
-+gst_dvd_sub_set_property (GObject * object, guint prop_id,
-+ const GValue * value, GParamSpec * pspec)
-+{
-+ GstDvdSubDec *src;
-+
-+ src = GST_DVD_SUB_DEC (object);
-+
-+ switch (prop_id) {
-+ case ARG_SINGLEBUFFER:
-+ src->singlebuffer = g_value_get_boolean (value);
-+ break;
-+ default:
-+ break;
-+ }
-+}
-+
-+static void
-+gst_dvd_sub_get_property (GObject * object, guint prop_id, GValue * value,
-+ GParamSpec * pspec)
-+{
-+ GstDvdSubDec *src;
-+
-+ src = GST_DVD_SUB_DEC (object);
-+
-+ switch (prop_id) {
-+ case ARG_SINGLEBUFFER:
-+ g_value_set_boolean (value, src->singlebuffer);
-+ break;
-+ }
- }
-
- static void
-@@ -697,6 +745,8 @@
- dec->out_buffer = out_buf;
- dec->buf_dirty = FALSE;
- }
-+ else if (dec->singlebuffer)
-+ goto out;
-
- out_buf = gst_buffer_create_sub (dec->out_buffer, 0,
- GST_BUFFER_SIZE (dec->out_buffer));
-diff -u a/gst/dvdsub/gstdvdsubdec.h b/gst/dvdsub/gstdvdsubdec.h
---- a/gst/dvdsub//gstdvdsubdec.h 2009-05-21 20:45:29.000000000 +0200
-+++ b/gst/dvdsub/gstdvdsubdec.h 2010-05-26 13:39:32.000000000 +0200
-@@ -91,6 +91,8 @@
-
- GstBuffer *out_buffer;
- gboolean buf_dirty;
-+
-+ gboolean singlebuffer;
- };
-
- struct _GstDvdSubDecClass
+++ /dev/null
-Upstream-Status: Backport
-
-From 593ddf4bb9dc3c4d97bdde8d087db42147511274 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
-Date: Sat, 3 Mar 2012 16:56:13 +0000
-Subject: [PATCH 1/2] configure: get rid of non-pkg-config ways to check for
- opencore-amr
-
----
- configure.ac | 22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e5be3ed..3c2e341 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -250,12 +250,11 @@ AG_GST_CHECK_FEATURE(A52DEC, [a52dec], a52dec, [
- dnl *** amr-nb ***
- translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
- AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
-- PKG_CHECK_MODULES(AMRNB, opencore-amrnb, HAVE_AMRNB="yes",
-- [ AG_GST_CHECK_LIBHEADER(AMRNB, opencore-amrnb,
-- Decoder_Interface_init, $LIBM,
-- opencore-amrnb/interf_dec.h,
-- AMRNB_LIBS="-lopencore-amrnb")
-- ])
-+ PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [
-+ HAVE_AMRNB="yes"
-+ ], [
-+ HAVE_AMRNB="no"
-+ ])
- AC_SUBST(AMRNB_CFLAGS)
- AC_SUBST(AMRNB_LIBS)
- ])
-@@ -263,12 +262,11 @@ AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
- dnl *** amr-wb dec ***
- translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
- AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
-- PKG_CHECK_MODULES(AMRWB, opencore-amrwb, HAVE_AMRWB="yes",
-- [ AG_GST_CHECK_LIBHEADER(AMRWB, opencore-amrwb,
-- D_IF_decode, ,
-- opencore-amrwb/dec_if.h,
-- AMRWB_LIBS="-lopencore-amrwb")
-- ])
-+ PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [
-+ HAVE_AMRWB="yes"
-+ ], [
-+ HAVE_AMRWB="no"
-+ ])
- AC_SUBST(AMRWB_CFLAGS)
- AC_SUBST(AMRWB_LIBS)
- ])
---
-1.7.9.5
-
+++ /dev/null
-Upstream-Status: Backport
-
-From 425e6e395f6bcaff77d0393126e1253066ddcd8a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
-Date: Sat, 3 Mar 2012 17:17:31 +0000
-Subject: [PATCH 2/2] amrnb, amrwbdec: fix build with opencore-amr >= 0.1.3
-
-In previous versions, the opencore-amr include sub-directory
-would be specified in the include path in the CFLAGS, but this
-is no longer the case in newer versions, so we need to add those
-to our include directives.
-
-Based on patch by: Christian Morales Vega
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671123
----
- configure.ac | 6 ++++++
- ext/amrnb/amrnbdec.h | 5 +++++
- ext/amrnb/amrnbenc.h | 7 ++++++-
- ext/amrwbdec/amrwbdec.h | 6 ++++++
- 4 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3c2e341..18f2904 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -251,6 +251,9 @@ dnl *** amr-nb ***
- translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
- AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
- PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [
-+ if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrnb; then
-+ AC_DEFINE(HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrnb])
-+ fi
- HAVE_AMRNB="yes"
- ], [
- HAVE_AMRNB="no"
-@@ -263,6 +266,9 @@ dnl *** amr-wb dec ***
- translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
- AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
- PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [
-+ if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrwb; then
-+ AC_DEFINE(HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrwb])
-+ fi
- HAVE_AMRWB="yes"
- ], [
- HAVE_AMRWB="no"
-diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h
-index 1e81839..5fe6982 100644
---- a/ext/amrnb/amrnbdec.h
-+++ b/ext/amrnb/amrnbdec.h
-@@ -22,7 +22,12 @@
-
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
-+
-+#ifdef HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
-+#include <opencore-amrnb/interf_dec.h>
-+#else
- #include <interf_dec.h>
-+#endif
-
- G_BEGIN_DECLS
-
-diff --git a/ext/amrnb/amrnbenc.h b/ext/amrnb/amrnbenc.h
-index 7f673ac..48a8fe8 100644
---- a/ext/amrnb/amrnbenc.h
-+++ b/ext/amrnb/amrnbenc.h
-@@ -21,9 +21,14 @@
- #define __GST_AMRNBENC_H__
-
- #include <gst/gst.h>
--#include <interf_enc.h>
- #include <gst/audio/gstaudioencoder.h>
-
-+#ifdef HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER
-+#include <opencore-amrnb/interf_enc.h>
-+#else
-+#include <interf_enc.h>
-+#endif
-+
- G_BEGIN_DECLS
-
- #define GST_TYPE_AMRNBENC \
-diff --git a/ext/amrwbdec/amrwbdec.h b/ext/amrwbdec/amrwbdec.h
-index c3528fc..6b82ae9 100644
---- a/ext/amrwbdec/amrwbdec.h
-+++ b/ext/amrwbdec/amrwbdec.h
-@@ -22,8 +22,14 @@
-
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
-+
-+#ifdef HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER
-+#include <opencore-amrwb/dec_if.h>
-+#include <opencore-amrwb/if_rom.h>
-+#else
- #include <dec_if.h>
- #include <if_rom.h>
-+#endif
-
- G_BEGIN_DECLS
-
---
-1.7.9.5
-
+++ /dev/null
-From 114ec19a882192dfcb5f71bb12c811d0a3b7f324 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Tue, 8 May 2012 17:27:55 +0200
-Subject: [PATCH] orc.m4: fix location of orcc when cross-compiling
-
-* Prepend PKG_CONFIG_SYSROOT to orcc, so configure doesn't
- accidentially use an incompatible version of orcc installed
- on the build system.
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- m4/orc.m4 | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/common/m4/orc.m4 b/common/m4/orc.m4
-index 26b2459..81b111e 100644
---- a/common/m4/orc.m4
-+++ b/common/m4/orc.m4
-@@ -3,6 +3,8 @@ dnl pkg-config-based checks for Orc
- dnl specific:
- dnl ORC_CHECK([REQUIRED_VERSION])
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([ORC_CHECK],
- [
- ORC_REQ=ifelse([$1], , "0.4.6", [$1])
-@@ -24,7 +26,7 @@ AC_DEFUN([ORC_CHECK],
- HAVE_ORC=yes
- if test "x$ORCC" = "x" ; then
- AC_MSG_CHECKING(for usable orcc)
-- ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
-+ ORCC=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=orcc orc-0.4`
- dnl check whether the orcc found by pkg-config can be run from the build environment
- dnl if this is not the case (e.g. when cross-compiling) fall back to orcc from PATH
- AS_IF([$ORCC --version 1> /dev/null 2> /dev/null], [], [ORCC=`which orcc`])
---
-1.7.9.5
-
+++ /dev/null
-require recipes-multimedia/gstreamer/gst-plugins.inc
-
-LICENSE = "GPLv2+ & LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
- file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f"
-
-DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame libcdio opencore-amr"
-
-EXTRA_OECONF += "--enable-orc"
-
-PR = "r1"
-GIT_PV = ""
-
-SRCREV = "9afc696e5fa9fb980e02df5637f022796763216f"
-
-inherit autotools pkgconfig gettext git-project
-
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN};branch=0.10"
-
-SRC_URI += " \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch \
-"
-
-do_common_update() {
- cd ${S}
- # Make sure we have common
- if test ! -f common/gst-autogen.sh;
- then
- echo "+ Setting up common submodule"
- git submodule init
- fi
- git submodule update
-
- # source helper functions
- if test ! -f common/gst-autogen.sh;
- then
- echo There is something wrong with your source tree.
- echo You are missing common/gst-autogen.sh
- exit 1
- fi
- . common/gst-autogen.sh
- # install pre-commit hook for doing clean commits
- if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
- then
- rm -f .git/hooks/pre-commit
- ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit
- fi
-
- # GNU gettext automake support doesn't get along with git.
- # https://bugzilla.gnome.org/show_bug.cgi?id=661128
- autopoint || touch config.rpath
- touch -t 200001010000 po/gst-plugins-base-0.10.pot
-}
-addtask common_update after do_unpack before do_patch
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-require mips-only.inc
+++ /dev/null
-DEPENDS += "libcdio opencore-amr"
-PR .= "-vuplus0"
-
-SRC_URI += "file://dvdsubdec-addproperty-singlebuffer.patch \
- file://fix-opencore-amr-1.patch \
- file://fix-opencore-amr-2.patch \
- file://orc.m4-fix-location-of-orcc-when-cross-compiling.patch"
-
-EXTRA_OECONF += "--enable-orc --with-plugins="
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
+++ /dev/null
-# gstreamer: Fix a problem with configure if check has already been built
-# Richard Purdie <rpurdie@linux.intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -urN gstreamer-0.10.29-orig/configure.ac gstreamer-0.10.29/configure.ac
---- gstreamer-0.10.29-orig/configure.ac 2010-06-26 12:49:27.774930773 +0800
-+++ gstreamer-0.10.29/configure.ac 2010-06-26 12:51:12.899200233 +0800
-@@ -543,8 +543,10 @@
- *) BUILD_CHECK=yes ;;
- esac
- ])
-+
- dnl bit of a misnomer, but keep the conditional named like this so we don't
- dnl have to change too much elsewhere
-+HAVE_CHECK=no
- AM_CONDITIONAL(HAVE_CHECK, test "x$BUILD_CHECK" = "xyes")
-
- dnl configure the desired buffer alignment
+++ /dev/null
-# Fix crash with gst-inspect
-# Chris Lord <chris@openedhand.com>
-
-Upstream-Status: Pending
-
---- gstreamer-0.10.9/tools/gst-inspect.c.old 2006-09-12 11:56:53.000000000 +0100
-+++ gstreamer-0.10.9/tools/gst-inspect.c 2006-09-12 11:57:27.000000000 +0100
-@@ -1123,7 +1123,7 @@
- g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
- g_option_context_add_group (ctx, gst_init_get_option_group ());
- if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
-- g_print ("Error initializing: %s\n", err->message);
-+ g_print ("Error initializing: %s\n", err ? err->message : "(null)");
- exit (1);
- }
- g_option_context_free (ctx);
+++ /dev/null
-diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c
-index 114a458..5c47b83 100644
---- a/plugins/elements/gstinputselector.c
-+++ b/plugins/elements/gstinputselector.c
-@@ -965,7 +965,7 @@ gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
- "checking if buffer %p running time=%" GST_TIME_FORMAT
- " >= stream time=%" GST_TIME_FORMAT, buffer,
- GST_TIME_ARGS (running_time), GST_TIME_ARGS (cur_running_time));
-- if (running_time >= cur_running_time) {
-+ if ( GST_CLOCK_TIME_IS_VALID(running_time) && (running_time >= cur_running_time) ) {
- break;
- }
-
+++ /dev/null
-diff -Naur git.org/plugins/elements/gstmultiqueue.c git/plugins/elements/gstmultiqueue.c
---- git.org/plugins/elements/gstmultiqueue.c 2013-04-22 23:33:43.840120880 +0200
-+++ git/plugins/elements/gstmultiqueue.c 2013-04-22 23:37:47.728118492 +0200
-@@ -161,6 +161,7 @@
- GstDataQueueSize max_size, extra_size;
- GstClockTime cur_time;
- gboolean is_eos;
-+ gboolean is_sparse;
- gboolean flushing;
-
- /* Protected by global lock */
-@@ -801,6 +802,12 @@
- return result;
- }
-
-+static gboolean
-+is_sparse (GstSingleQueue * sq)
-+{
-+ return sq->is_sparse;
-+}
-+
- static void
- update_buffering (GstMultiQueue * mq, GstSingleQueue * sq)
- {
-@@ -822,6 +829,8 @@
- /* get bytes and time percentages and take the max */
- if (sq->is_eos) {
- percent = 100;
-+ } else if (is_sparse (sq)) {
-+ percent = 100;
- } else {
- percent = 0;
- if (sq->max_size.time > 0) {
-@@ -1609,11 +1618,24 @@
-
- otherpad = (pad == sq->srcpad) ? sq->sinkpad : sq->srcpad;
-
-- GST_LOG_OBJECT (otherpad, "Getting caps from the peer of this pad");
--
- result = gst_pad_peer_get_caps (otherpad);
- if (result == NULL)
- result = gst_caps_new_any ();
-+ else
-+ {
-+ GstStructure* str;
-+ const gchar *g_type;
-+ str = gst_caps_get_structure(result, 0);
-+ g_type = str ? gst_structure_get_name(str) : (const gchar*)"unknown";
-+
-+ GST_LOG_OBJECT (otherpad, "Got caps from the peer of this pad: %s", g_type);
-+
-+ if ( !g_strcmp0(g_type, "video/x-dvd-subpicture") || !g_strcmp0(g_type, "text/x-pango-markup") || !g_strcmp0(g_type, "text/plain") || !g_strcmp0(g_type, "subpicture/x-pgs") || !g_strcmp0(g_type, "subpicture/x-ass") )
-+ {
-+ GST_INFO_OBJECT (otherpad, "subtitle stream discovered --> set is_sparse to true");
-+ sq->is_sparse = TRUE;
-+ }
-+ }
-
- return result;
- }
-@@ -1841,7 +1863,7 @@
-
- GST_LOG_OBJECT (mq, "Checking Queue %d", oq->id);
-
-- if (gst_data_queue_is_empty (oq->queue)) {
-+ if (gst_data_queue_is_empty (oq->queue) && !is_sparse (oq)) {
- GST_LOG_OBJECT (mq, "Queue %d is empty", oq->id);
- if (IS_FILLED (sq, visible, size.visible)) {
- sq->max_size.visible = size.visible + 1;
-@@ -1868,7 +1890,7 @@
- * we are checking here.
- */
- if (sq->is_eos || IS_FILLED (sq, bytes, ssize.bytes) ||
-- IS_FILLED (sq, time, sq->cur_time)) {
-+ IS_FILLED (sq, time, sq->cur_time) || is_sparse (oq)) {
- GST_LOG_OBJECT (mq, "Queue %d is filled", oq->id);
- filled = TRUE;
- }
-@@ -1911,7 +1933,7 @@
- gst_data_queue_limits_changed (oq->queue);
- }
- }
-- if (!gst_data_queue_is_empty (oq->queue))
-+ if (!gst_data_queue_is_empty (oq->queue) || is_sparse (oq))
- empty = FALSE;
- }
- GST_MULTI_QUEUE_MUTEX_UNLOCK (mq);
-@@ -2011,6 +2033,7 @@
- (GstDataQueueFullCallback) single_queue_overrun_cb,
- (GstDataQueueEmptyCallback) single_queue_underrun_cb, sq);
- sq->is_eos = FALSE;
-+ sq->is_sparse = FALSE;
- sq->flushing = FALSE;
- gst_segment_init (&sq->sink_segment, GST_FORMAT_TIME);
- gst_segment_init (&sq->src_segment, GST_FORMAT_TIME);
+++ /dev/null
-SUMMARY = "GStreamer multimedia framework"
-DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
-It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
-HOMEPAGE = "http://gstreamer.freedesktop.org/"
-BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
-SECTION = "multimedia"
-LICENSE = "LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
- file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
-DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
-
-PR = "r4"
-GIT_PV = ""
-
-SRCREV = "1bcabb9a23afb25dcd059bd827aa35b8ee7e5043"
-
-RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
-RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
-
-FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
-FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
-FILES_${PN}-dbg += " ${libdir}/gstreamer-0.10/.debug/ ${libexecdir}/gstreamer-0.10/.debug/"
-
-GSTREAMER_DEBUG ?= "--disable-debug"
-EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG}"
-
-inherit autotools pkgconfig gettext git-project
-
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/${PN};branch=0.10"
-
-SRC_URI += " \
- file://check_fix.patch \
- file://gst-inspect-check-error.patch \
- file://multiqueue-sparsestreams.patch \
- file://inputselector-cache-fix.patch \
-"
-
-do_common_update() {
- cd ${S}
- # Make sure we have common
- if test ! -f common/gst-autogen.sh;
- then
- echo "+ Setting up common submodule"
- git submodule init
- fi
- git submodule update
-
- # source helper functions
- if test ! -f common/gst-autogen.sh;
- then
- echo There is something wrong with your source tree.
- echo You are missing common/gst-autogen.sh
- exit 1
- fi
- . common/gst-autogen.sh
- # install pre-commit hook for doing clean commits
- if test ! \( -x .git/hooks/pre-commit -a -L .git/hooks/pre-commit \);
- then
- rm -f .git/hooks/pre-commit
- ln -s ../../common/hooks/pre-commit.hook .git/hooks/pre-commit
- fi
-
- # GNU gettext automake support doesn't get along with git.
- # https://bugzilla.gnome.org/show_bug.cgi?id=661128
- autopoint || touch config.rpath
- touch -t 200001010000 po/gst-plugins-base-0.10.pot
-}
-addtask common_update after do_unpack before do_patch
-
-do_configure_prepend() {
- # This m4 file contains nastiness which conflicts with libtool 2.2.2
- rm ${S}/m4/lib-link.m4 || true
-}
-
-require mips-only.inc
+++ /dev/null
-COMPATIBLE_HOST = '(mips.*)-(linux)'
projects / vuplus_openvuplus_3.0 / commitdiff