diff options
Diffstat (limited to 'media-libs/gst-plugins-bad')
8 files changed, 1378 insertions, 0 deletions
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest new file mode 100644 index 000000000000..27ae38cbc557 --- /dev/null +++ b/media-libs/gst-plugins-bad/Manifest @@ -0,0 +1,14 @@ +AUX 1.10.3-CVE-2017-5848.patch 33932 SHA256 5912dc093e307e42a590b09eaabca7c3f5a2cf050a5c63e22d0cc2dd89cf155c SHA512 5b28d80ceeb6a3b4ae1fdfe115cd90c39277ca28003b7b70ca6b452a00139cf22f3b83af6715f9f238b443ea13f21a6d03ff6a7f6e930b9c4a803a76b68a74d8 WHIRLPOOL 8ef22f7545bbf3d68239aee1af98329d10d0b3df2e323c3c467bdb72fc74b2a24794cee8577d02db23002f25b674aac7fcc367f0bfdf2082de934293ad37271f +AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 SHA256 cc5b11dcab8c984d3e24b81bfa2dad6cc3617552826faacd48fdd84b3777e31f SHA512 cbe01dd53450cffb4cddf9313e78f2b61b27a8e1c35da13ab9429fa0de6cfce2585a4bbe1d3a9f6aac503c79a5a9d661420001b0196683a3c8b778685844c969 WHIRLPOOL 126961360e7157b8ade138f901ba0b34f291ad3d7fa776b68dad390751e0364576143b0cb54008499d8d8b6bb5ef4fb38eba04a9a693e4afae5d6403035c525a +DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 SHA256 40890e4d7792d1b4e18c21204be57d71c34a9add20ef84f8de88c4037ba90858 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1 WHIRLPOOL f48af056d50df855e1281d3c1026c420f1158c3a007416f54bd690ce781089bacf71f0c6a90cece7bb64341c450fb9f6a6bab9a41cf9bd893c96440a0be1c33c +DIST gst-plugins-bad-0.10.23.tar.xz 3155044 SHA256 03cf0786391c64625569072e904082a08861f05a63d64b2f8e8dad3f26d81bf9 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4 WHIRLPOOL dd657100909c32ab75cb8aada8db24d68ddf7a10dc0eb055982d7e4d9ae7a50c364eeac9017cea8b176734fc09cf7f8e4e8f52d24e3173806633ddb8a7acd93c +DIST gst-plugins-bad-1.10.3.tar.xz 4734656 SHA256 24099351fb6984c9e7560de06e072ff2e33d0b2db38b8fcc7afefb536e5094e7 SHA512 028e2c579d6e41fed2a3b7de91f3e0eac08fecd52bd67f198437909025aa41dbf4fd7ddd76decd989f8c4ca7664fad3517b403b326d8ef297bfdd006b5d79944 WHIRLPOOL 744f76c10fc534156abb49d71b4f01c663d8c14b3eb4ced988a41b0b3e1e455b988a2b2064af96f5e75f65622f6e5077c08016e29d68b12864f33fea664a613c +DIST gst-plugins-bad-1.10.5.tar.xz 4737820 SHA256 c5806040bb83b43be86ce592e6a19c5d83d7776f7d9f434eb4b911c4efff3573 SHA512 03a1b712084ace16b933b708e19922aef4f9b5f7ba0408c35865e699d70bd19e73121594449355b6252a31d9085602d8bef581fe14cfdf6c9fdcf2ddcea21e1a WHIRLPOOL 4828818d6f2a18d38b35e6b6ab3dcc5ad2465b22e2e505d84d2665cd4fc6838391d47d79256e57cc52522fa459cd0949060182aa02baa6e9ec22160335380d3b +DIST gst-plugins-bad-1.12.3.tar.xz 4707000 SHA256 36d059761852bed0f1a7fcd3ef64a8aeecab95d2bca53cd6aa0f08054b1cbfec SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661 WHIRLPOOL b4c1262a0ca63331f5cb38fecc6a26830234712d6d4409aed495b05e7cfe13760bf056767e54e17cb9899c3671f0a05b90199d80d0b47bacb2ee6d27b89a5457 +EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 SHA256 9f8b93315fed3baf4b2fc16b482819f84792692859fdb467016e32a4347cc5ff SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492 WHIRLPOOL b126e9adda14114abc266e388699035bb7a8d2d1b54a981399bc429013228c685fedef1f4fc1b090d906f2b52385127fed2ce8cdd099136a20961581f9b96d00 +EBUILD gst-plugins-bad-1.10.3.ebuild 2938 SHA256 e5d9eb1da9cf958ca66a4d29c1b1df24fed8309ff47181c60975e26930d6fce8 SHA512 0c951c010174d1a514c9e5b378ff36ddbd08ce104261f8080157fd0650e13e7baab1aaaafee389068d97cd5701bbd2da57267fa872798c644ae0063812065654 WHIRLPOOL 93036a9336df1f2cb2f907e39f744003be5ce20675f4e50149e8dddca725bc37e6787b9a4bc8381db6dc6916bb77be094a61b4fb4e911b358c3834f8f55d1100 +EBUILD gst-plugins-bad-1.10.5.ebuild 2699 SHA256 6a02682ca250d2e239d533bb09d65767f5b1f00e87431804a0dd652c09421cbb SHA512 3f8a5b76cc444a01f3ac9806448edb335f622ab393c5db900131472827f4f84d379f6590cfe6e063537ad1b4d9fc617712553a09ca3e4da697be597d266038b8 WHIRLPOOL 3ea1e045a64edec28e690ac9d1fa246a701d30b85aac240299d24a2548359450d09865a15d367a59a2c13d38ca511e6f2f3b8d756095e1915b9c0a261ea1e725 +EBUILD gst-plugins-bad-1.12.3.ebuild 2788 SHA256 cce76ecbbdf22c273b1a822d0df06788feccd6f1705c9bc0e57870c0f5b71327 SHA512 a7a039d11dcd6aa371cbc1f61afde96e243f7e435c2139d0d8e89ff63486e5f4f4f2109cbd0681036ae9f05c82372d46e570d10aa647b7b8159bcc0195f3bbaf WHIRLPOOL 06176ceef03808e9045e72878bbb7915f7cdb7494bf7a4ce043122e398702cc3e0d1358f221729f9f445f012c8ddb5d2f31b4036b805dd01e04b13c7135f0f4d +MISC ChangeLog 14215 SHA256 b13d5ffbe7b8417513ac12c75adbab4dab0ea365c903469100500d6a26d02b1c SHA512 70f8df7a2140dd23bc290e6eccdcde7c68d69cb3246d7e8211ac25cd48a7953aa91a45af9faf0898e7f03a356c846e57881cd7b3c8b9790da54d34068db9824a WHIRLPOOL 0af8b5d8cb5f77baa87943c61e760f13aae84a1b93af4c188220a830e50446880325506b59e8d0d17f68e22bb4bbd526b3f843777221cda71e03619fbca68f70 +MISC ChangeLog-2015 26431 SHA256 a6991e05a4fc40b12ffddbe2e7aace9ac94c587889a11e07981c23920cbc15cd SHA512 6c68700e7de319e6a14ee7bd14392a17a91a717d4845b97a2095b72169d1e10e4826261356ba83e809b7414c8ca38a96f763ed0354ccd8200238019ec1c0ac61 WHIRLPOOL d6185195dd65e36bfe279ecfbdefe1b3303afded07d26313fa89261affdeaf5ecb3bf52df484fb3581b5e6a2c142eb9ae17f4e8db3afe40c9130384f48123e25 +MISC metadata.xml 439 SHA256 0d47c088a91721e575fc97e2f70ec0e4d12f4c1b05715d6969b35aad2b2daa47 SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e WHIRLPOOL 859dd6b40cc1b91489142eb45e40e178968cd534a6fac416fcd2e6078b45cc2c2fa445dc628f94f08c9b5ffa40356a11fd8696546b0b1e38fa1049c84ec9a6c4 diff --git a/media-libs/gst-plugins-bad/files/1.10.3-CVE-2017-5848.patch b/media-libs/gst-plugins-bad/files/1.10.3-CVE-2017-5848.patch new file mode 100644 index 000000000000..fdc604ada9d3 --- /dev/null +++ b/media-libs/gst-plugins-bad/files/1.10.3-CVE-2017-5848.patch @@ -0,0 +1,951 @@ +From 96f9b83eed617886fefa0ec5682e072f65eafc8b Mon Sep 17 00:00:00 2001 +From: Jan Schmidt <jan@centricular.com> +Date: Wed, 1 Feb 2017 14:25:32 +1100 +Subject: [PATCH] psdemux: Rewrite PSM parsing using GstByteReader + +Avoid possible buffer overflows and ignore invalid PSM packets better +by using GstByteReader. + +https://bugzilla.gnome.org/show_bug.cgi?id=777957 +--- + gst/mpegdemux/Makefile.am | 2 +- + gst/mpegdemux/gstmpegdemux.c | 322 ++++++++++++++++--------------------------- + 2 files changed, 117 insertions(+), 207 deletions(-) + +diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am +index df59955..dd43134 100644 +--- a/gst/mpegdemux/Makefile.am ++++ b/gst/mpegdemux/Makefile.am +@@ -11,7 +11,7 @@ libgstmpegpsdemux_la_CFLAGS = \ + libgstmpegpsdemux_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \ + -lgstpbutils-$(GST_API_VERSION) \ +- $(GST_BASE_LIBS) $(GST_LIBS) ++ $(GST_BASE_LIBS) -lgstbase-$(GST_API_VERSION) $(GST_LIBS) + libgstmpegpsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + libgstmpegpsdemux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) + +diff --git a/gst/mpegdemux/gstmpegdemux.c b/gst/mpegdemux/gstmpegdemux.c +index b608db8..755e8e6 100644 +--- a/gst/mpegdemux/gstmpegdemux.c ++++ b/gst/mpegdemux/gstmpegdemux.c +@@ -50,6 +50,7 @@ + + #include <gst/tag/tag.h> + #include <gst/pbutils/pbutils.h> ++#include <gst/base/gstbytereader.h> + + #include "gstmpegdefs.h" + #include "gstmpegdemux.h" +@@ -2062,42 +2063,48 @@ need_more_data: + static GstFlowReturn + gst_ps_demux_parse_psm (GstPsDemux * demux) + { +- guint16 length = 0, info_length = 0, es_map_length = 0; ++ guint16 psm_length, info_length = 0, es_map_length = 0; + guint8 psm_version = 0; +- const guint8 *data, *es_map_base; ++ GstByteReader br; + #ifndef GST_DISABLE_GST_DEBUG + gboolean applicable; + #endif + ++ /* Need at least 6 bytes for start code + length */ + if (gst_adapter_available (demux->adapter) < 6) + goto need_more_data; + +- /* start code + length */ +- data = gst_adapter_map (demux->adapter, 6); +- +- /* skip start code */ +- data += 4; ++ { ++ const guint8 *data; + +- length = GST_READ_UINT16_BE (data); +- GST_DEBUG_OBJECT (demux, "length %u", length); ++ /* start code + length */ ++ data = gst_adapter_map (demux->adapter, 6); ++ /* skip start code */ ++ data += 4; ++ psm_length = GST_READ_UINT16_BE (data); ++ GST_DEBUG_OBJECT (demux, "PSM length %u", psm_length); + +- if (G_UNLIKELY (length > 0x3FA)) +- goto psm_len_error; ++ if (G_UNLIKELY (psm_length > 0x3FA)) ++ goto psm_len_error; ++ psm_length += 6; /* Add start code + size to length */ + +- length += 6; ++ gst_adapter_unmap (demux->adapter); + +- gst_adapter_unmap (demux->adapter); ++ if (gst_adapter_available (demux->adapter) < psm_length) ++ goto need_more_data; + +- if (gst_adapter_available (demux->adapter) < length) +- goto need_more_data; ++ data = gst_adapter_map (demux->adapter, psm_length); + +- data = gst_adapter_map (demux->adapter, length); ++ gst_byte_reader_init (&br, data, psm_length); ++ } + + /* skip start code and length */ +- data += 6; ++ if (!gst_byte_reader_skip (&br, 6)) ++ goto fail_invalid; + + /* Read PSM applicable bit together with version */ +- psm_version = GST_READ_UINT8 (data); ++ if (!gst_byte_reader_get_uint8 (&br, &psm_version)) ++ goto fail_invalid; + #ifndef GST_DISABLE_GST_DEBUG + applicable = (psm_version & 0x80) >> 7; + #endif +@@ -2105,62 +2112,70 @@ gst_ps_demux_parse_psm (GstPsDemux * demux) + GST_DEBUG_OBJECT (demux, "PSM version %u (applicable now %u)", psm_version, + applicable); + +- /* Jump over version and marker bit */ +- data += 2; ++ /* Jump over the next byte (marker bit) */ ++ if (!gst_byte_reader_skip (&br, 1)) ++ goto fail_invalid; + + /* Read PS info length */ +- info_length = GST_READ_UINT16_BE (data); +- /* Cap it to PSM length - needed bytes for ES map length and CRC */ +- info_length = MIN (length - 16, info_length); ++ if (!gst_byte_reader_get_uint16_be (&br, &info_length)) ++ goto fail_invalid; + GST_DEBUG_OBJECT (demux, "PS info length %u bytes", info_length); +- +- /* Jump over that section */ +- data += (2 + info_length); ++ /* Skip the PS info, we don't use it */ ++ if (!gst_byte_reader_skip (&br, info_length)) ++ goto fail_invalid; + + /* Read ES map length */ +- es_map_length = GST_READ_UINT16_BE (data); +- /* Cap it to PSM remaining length - CRC */ +- es_map_length = MIN (length - (16 + info_length), es_map_length); ++ if (!gst_byte_reader_get_uint16_be (&br, &es_map_length)) ++ goto fail_invalid; + GST_DEBUG_OBJECT (demux, "ES map length %u bytes", es_map_length); + +- /* Jump over the size */ +- data += 2; +- + /* Now read the ES map */ +- es_map_base = data; +- while (es_map_base + 4 <= data + es_map_length) { +- guint8 stream_type = 0, stream_id = 0; +- guint16 stream_info_length = 0; +- +- stream_type = GST_READ_UINT8 (es_map_base); +- es_map_base++; +- stream_id = GST_READ_UINT8 (es_map_base); +- es_map_base++; +- stream_info_length = GST_READ_UINT16_BE (es_map_base); +- es_map_base += 2; +- /* Cap stream_info_length */ +- stream_info_length = MIN (data + es_map_length - es_map_base, +- stream_info_length); +- +- GST_DEBUG_OBJECT (demux, "Stream type %02X with id %02X and %u bytes info", +- stream_type, stream_id, stream_info_length); +- if (G_LIKELY (stream_id != 0xbd)) +- demux->psm[stream_id] = stream_type; +- else { +- /* Ignore stream type for private_stream_1 and discover it looking at +- * the stream data. +- * Fixes demuxing some clips with lpcm that was wrongly declared as +- * mpeg audio */ +- GST_DEBUG_OBJECT (demux, "stream type for private_stream_1 ignored"); ++ { ++ GstByteReader es_map_br; ++ if (!gst_byte_reader_get_sub_reader (&br, &es_map_br, es_map_length)) ++ goto fail_invalid; ++ ++ while (gst_byte_reader_get_remaining (&es_map_br) >= 4) { ++ guint8 stream_type = 0, stream_id = 0; ++ guint16 stream_info_length = 0; ++ ++ if (!gst_byte_reader_get_uint8 (&es_map_br, &stream_type) || ++ !gst_byte_reader_get_uint8 (&es_map_br, &stream_id) || ++ !gst_byte_reader_get_uint16_be (&es_map_br, &stream_info_length)) ++ break; ++ ++ GST_DEBUG_OBJECT (demux, ++ "Stream type %02X with id %02X and %u bytes info", stream_type, ++ stream_id, stream_info_length); ++ ++ if (G_LIKELY (stream_id != 0xbd)) ++ demux->psm[stream_id] = stream_type; ++ else { ++ /* Ignore stream type for private_stream_1 and discover it looking at ++ * the stream data. ++ * Fixes demuxing some clips with lpcm that was wrongly declared as ++ * mpeg audio */ ++ GST_DEBUG_OBJECT (demux, "stream type for private_stream_1 ignored"); ++ } ++ ++ /* FIXME: We could use the descriptors instead of skipping them */ ++ if (!gst_byte_reader_skip (&es_map_br, stream_info_length)) ++ break; + } +- es_map_base += stream_info_length; + } ++ /* We ignore the 4-byte CRC at the end */ + + gst_adapter_unmap (demux->adapter); +- gst_adapter_flush (demux->adapter, length); +- ADAPTER_OFFSET_FLUSH (length); ++ gst_adapter_flush (demux->adapter, psm_length); ++ ADAPTER_OFFSET_FLUSH (psm_length); + return GST_FLOW_OK; + ++fail_invalid: ++ GST_DEBUG_OBJECT (demux, "Failed to parse PSM. Skipping"); ++ gst_adapter_unmap (demux->adapter); ++ gst_adapter_flush (demux->adapter, psm_length); ++ ADAPTER_OFFSET_FLUSH (psm_length); ++ return GST_FLOW_LOST_SYNC; + psm_len_error: + { + GST_DEBUG_OBJECT (demux, "error in PSM length"); +@@ -2191,13 +2206,10 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + GstMapInfo map; + gsize datalen; + guint offset = 0; +- + gst_buffer_map (buffer, &map, GST_MAP_READ); + datalen = map.size; +- + start_code = filter->start_code; + id = filter->id; +- + if (first) { + /* find the stream type */ + stream_type = demux->psm[id]; +@@ -2208,7 +2220,6 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + * (see ftp://ftp.mplayerhq.hu/MPlayer/samples/MPEG-VOB/vdr-AC3) */ + if (datalen >= 4) { + guint hdr = GST_READ_UINT32_BE (map.data); +- + if (G_UNLIKELY ((hdr & 0xffff0000) == AC3_SYNC_WORD)) { + id = 0x80; + stream_type = demux->psm[id] = ST_GST_AUDIO_RAWA52; +@@ -2220,10 +2231,8 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + /* new id is in the first byte */ + id = map.data[offset++]; + datalen--; +- + /* and remap */ + stream_type = demux->psm[id]; +- + /* Now, if it's a subpicture stream - no more, otherwise + * take the first byte too, since it's the frame count in audio + * streams and our backwards compat convention is to strip it off */ +@@ -2231,7 +2240,6 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + /* Number of audio frames in this packet */ + #ifndef GST_DISABLE_GST_DEBUG + guint8 nframes; +- + nframes = map.data[offset]; + GST_LOG_OBJECT (demux, "private type 0x%02x, %d frames", id, + nframes); +@@ -2239,8 +2247,8 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + offset++; + datalen--; + } else { +- GST_LOG_OBJECT (demux, "private type 0x%02x, stream type %d", id, +- stream_type); ++ GST_LOG_OBJECT (demux, "private type 0x%02x, stream type %d", ++ id, stream_type); + } + } + } +@@ -2253,7 +2261,6 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + " (%" G_GUINT64_FORMAT ")", id, filter->pts, demux->next_pts); + } else + demux->next_pts = G_MAXUINT64; +- + if (filter->dts != -1) { + demux->next_dts = filter->dts + demux->scr_adjust; + GST_LOG_OBJECT (demux, "stream 0x%02x DTS = orig %" G_GUINT64_FORMAT +@@ -2290,7 +2297,6 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + if (demux->current_stream->notlinked == FALSE) { + out_buf = + gst_buffer_copy_region (buffer, GST_BUFFER_COPY_ALL, offset, datalen); +- + ret = gst_ps_demux_send_data (demux, demux->current_stream, out_buf); + if (ret == GST_FLOW_NOT_LINKED) { + demux->current_stream->notlinked = TRUE; +@@ -2300,9 +2306,7 @@ gst_ps_demux_data_cb (GstPESFilter * filter, gboolean first, + done: + gst_buffer_unmap (buffer, &map); + gst_buffer_unref (buffer); +- + return ret; +- + /* ERRORS */ + unknown_stream_type: + { +@@ -2320,17 +2324,13 @@ gst_ps_demux_resync (GstPsDemux * demux, gboolean save) + guint32 code; + gint offset; + gboolean found; +- + avail = gst_adapter_available (demux->adapter); + if (G_UNLIKELY (avail < 4)) + goto need_data; +- + /* Common case, read 4 bytes an check it */ + data = gst_adapter_map (demux->adapter, 4); +- + /* read currect code */ + code = GST_READ_UINT32_BE (data); +- + /* The common case is that the sync code is at 0 bytes offset */ + if (G_LIKELY ((code & 0xffffff00) == 0x100L)) { + GST_LOG_OBJECT (demux, "Found resync code %08x after 0 bytes", code); +@@ -2344,16 +2344,12 @@ gst_ps_demux_resync (GstPsDemux * demux, gboolean save) + offset = 4; + if (offset >= avail) + goto need_data; /* Not enough data to find sync */ +- + data = gst_adapter_map (demux->adapter, avail); +- + do { + code = (code << 8) | data[offset++]; + found = (code & 0xffffff00) == 0x100L; + } while (offset < avail && !found); +- + gst_adapter_unmap (demux->adapter); +- + if (!save || demux->sink_segment.rate >= 0.0) { + GST_LOG_OBJECT (demux, "flushing %d bytes", offset - 4); + /* forward playback, we can discard and flush the skipped bytes */ +@@ -2384,7 +2380,6 @@ gst_ps_demux_resync (GstPsDemux * demux, gboolean save) + } + + return found; +- + need_data: + { + GST_LOG_OBJECT (demux, "we need more data for resync %d", avail); +@@ -2409,42 +2404,32 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + guint64 pts, dts; + guint32 code; + guint16 len; +- + /* read the 4 bytes for the sync code */ + code = GST_READ_UINT32_BE (data); + if (G_LIKELY (code != ID_PS_PACK_START_CODE)) + goto beach; +- + /* skip start code */ + data += 4; +- + scr1 = GST_READ_UINT32_BE (data); + scr2 = GST_READ_UINT32_BE (data + 4); +- + /* start parsing the stream */ + if ((*data & 0xc0) == 0x40) { + /* MPEG-2 PACK header */ + guint32 scr_ext; + guint32 next32; + guint8 stuffing_bytes; +- + /* :2=01 ! scr:3 ! marker:1==1 ! scr:15 ! marker:1==1 ! scr:15 */ +- + /* check markers */ + if ((scr1 & 0xc4000400) != 0x44000400) + goto beach; +- + scr = ((guint64) scr1 & 0x38000000) << 3; + scr |= ((guint64) scr1 & 0x03fff800) << 4; + scr |= ((guint64) scr1 & 0x000003ff) << 5; + scr |= ((guint64) scr2 & 0xf8000000) >> 27; +- + /* marker:1==1 ! scr_ext:9 ! marker:1==1 */ + if ((scr2 & 0x04010000) != 0x04010000) + goto beach; +- + scr_ext = (scr2 & 0x03fe0000) >> 17; +- + if (scr_ext) { + scr = (scr * 300 + scr_ext % 300) / 300; + } +@@ -2455,7 +2440,6 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + next32 = GST_READ_UINT32_BE (data); + if ((next32 & 0x00000300) != 0x00000300) + goto beach; +- + stuffing_bytes = (next32 & 0x07); + data += 4; + while (stuffing_bytes--) { +@@ -2467,10 +2451,8 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + /* check markers */ + if ((scr1 & 0xf1000100) != 0x21000100) + goto beach; +- + if ((scr2 & 0x01800001) != 0x01800001) + goto beach; +- + /* :4=0010 ! scr:3 ! marker:1==1 ! scr:15 ! marker:1==1 ! scr:15 ! marker:1==1 */ + scr = ((guint64) scr1 & 0x0e000000) << 5; + scr |= ((guint64) scr1 & 0x00fffe00) << 6; +@@ -2488,7 +2470,6 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + /* Possible optional System header here */ + code = GST_READ_UINT32_BE (data); + len = GST_READ_UINT16_BE (data + 4); +- + if (code == ID_PS_SYSTEM_HEADER_START_CODE) { + /* Found a system header, skip it */ + /* Check for sufficient data - system header, plus enough +@@ -2496,7 +2477,6 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + if (data + 6 + len + 6 > end) + return FALSE; + data += len + 6; +- + /* read the 4 bytes for the PES sync code */ + code = GST_READ_UINT32_BE (data); + len = GST_READ_UINT16_BE (data + 4); +@@ -2505,10 +2485,8 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + /* Check we have enough data left for reading the PES packet */ + if (data + 6 + len > end) + return FALSE; +- + if (!gst_ps_demux_is_pes_sync (code)) + goto beach; +- + switch (code) { + case ID_PS_PROGRAM_STREAM_MAP: + case ID_PRIVATE_STREAM_2: +@@ -2525,9 +2503,7 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + + /* skip sync code and size */ + data += 6; +- + pts = dts = -1; +- + /* stuffing bits, first two bits are '10' for mpeg2 pes so this code is + * not triggered. */ + while (TRUE) { +@@ -2539,7 +2515,6 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + /* STD buffer size, never for mpeg2 */ + if ((*data & 0xc0) == 0x40) + data += 2; +- + /* PTS but no DTS, never for mpeg2 */ + if ((*data & 0xf0) == 0x20) { + READ_TS (data, pts, beach); +@@ -2551,7 +2526,6 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + } else if ((*data & 0xc0) == 0x80) { + /* mpeg2 case */ + guchar flags; +- + /* 2: '10' + * 2: PES_scrambling_control + * 1: PES_priority +@@ -2560,10 +2534,8 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + * 1: original_or_copy + */ + flags = *data++; +- + if ((flags & 0xc0) != 0x80) + goto beach; +- + /* 2: PTS_DTS_flags + * 1: ESCR_flag + * 1: ES_rate_flag +@@ -2573,14 +2545,11 @@ gst_ps_demux_scan_ts (GstPsDemux * demux, const guint8 * data, + * 1: PES_extension_flag + */ + flags = *data++; +- + /* 8: PES_header_data_length */ + data++; +- + /* only DTS: this is invalid */ + if ((flags & 0xc0) == 0x40) + goto beach; +- + /* check for PTS */ + if ((flags & 0x80)) { + READ_TS (data, pts, beach); +@@ -2617,26 +2586,21 @@ gst_ps_demux_scan_forward_ts (GstPsDemux * demux, guint64 * pos, + guint cursor, to_read = BLOCK_SZ; + guint end_scan; + GstMapInfo map; +- + do { + /* Check we can get at least scan_sz bytes */ + if (offset + scan_sz > demux->sink_segment.stop) + return FALSE; +- + /* Don't go further than 'limit' bytes */ + if (limit && offset > *pos + limit) + return FALSE; +- + if (offset + to_read > demux->sink_segment.stop) + to_read = demux->sink_segment.stop - offset; +- + /* read some data */ + buffer = NULL; + ret = gst_pad_pull_range (demux->sinkpad, offset, to_read, &buffer); + if (G_UNLIKELY (ret != GST_FLOW_OK)) + return FALSE; + gst_buffer_map (buffer, &map, GST_MAP_READ); +- + /* may get a short buffer at the end of the file */ + if (G_UNLIKELY (map.size <= scan_sz)) { + gst_buffer_unmap (buffer, &map); +@@ -2645,7 +2609,6 @@ gst_ps_demux_scan_forward_ts (GstPsDemux * demux, guint64 * pos, + } + + end_scan = map.size - scan_sz; +- + /* scan the block */ + for (cursor = 0; !found && cursor <= end_scan; cursor++) { + found = gst_ps_demux_scan_ts (demux, map.data + cursor, mode, &ts, +@@ -2655,7 +2618,6 @@ gst_ps_demux_scan_forward_ts (GstPsDemux * demux, guint64 * pos, + /* done with the buffer, unref it */ + gst_buffer_unmap (buffer, &map); + gst_buffer_unref (buffer); +- + if (found) { + *rts = ts; + *pos = offset + cursor - 1; +@@ -2663,7 +2625,6 @@ gst_ps_demux_scan_forward_ts (GstPsDemux * demux, guint64 * pos, + offset += cursor; + } + } while (!found && offset < demux->sink_segment.stop); +- + return found; + } + +@@ -2681,16 +2642,13 @@ gst_ps_demux_scan_backward_ts (GstPsDemux * demux, guint64 * pos, + guint start_scan; + guint8 *data; + GstMapInfo map; +- + do { + /* Check we have at least scan_sz bytes available */ + if (offset < scan_sz - 1) + return FALSE; +- + /* Don't go backward past the start or 'limit' bytes */ + if (limit && offset + limit < *pos) + return FALSE; +- + if (offset > BLOCK_SZ) + offset -= BLOCK_SZ; + else { +@@ -2702,9 +2660,7 @@ gst_ps_demux_scan_backward_ts (GstPsDemux * demux, guint64 * pos, + ret = gst_pad_pull_range (demux->sinkpad, offset, to_read, &buffer); + if (G_UNLIKELY (ret != GST_FLOW_OK)) + return FALSE; +- + gst_buffer_map (buffer, &map, GST_MAP_READ); +- + /* may get a short buffer at the end of the file */ + if (G_UNLIKELY (map.size <= scan_sz)) { + gst_buffer_unmap (buffer, &map); +@@ -2714,7 +2670,6 @@ gst_ps_demux_scan_backward_ts (GstPsDemux * demux, guint64 * pos, + + start_scan = map.size - scan_sz; + data = map.data + start_scan; +- + /* scan the block */ + for (cursor = (start_scan + 1); !found && cursor > 0; cursor--) { + found = gst_ps_demux_scan_ts (demux, data--, mode, &ts, +@@ -2724,14 +2679,12 @@ gst_ps_demux_scan_backward_ts (GstPsDemux * demux, guint64 * pos, + /* done with the buffer, unref it */ + gst_buffer_unmap (buffer, &map); + gst_buffer_unref (buffer); +- + if (found) { + *rts = ts; + *pos = offset + cursor; + } + + } while (!found && offset > 0); +- + return found; + } + +@@ -2745,54 +2698,47 @@ gst_ps_sink_get_duration (GstPsDemux * demux) + guint64 offset; + guint i; + guint64 scr = 0; +- + /* init the sink segment */ + gst_segment_init (&demux->sink_segment, format); +- + /* get peer to figure out length */ + if ((peer = gst_pad_get_peer (demux->sinkpad)) == NULL) + goto beach; +- + res = gst_pad_query_duration (peer, format, &length); + gst_object_unref (peer); +- + if (!res || length <= 0) + goto beach; +- + GST_DEBUG_OBJECT (demux, "file length %" G_GINT64_FORMAT, length); +- + /* update the sink segment */ + demux->sink_segment.stop = length; + gst_segment_set_duration (&demux->sink_segment, format, length); + gst_segment_set_position (&demux->sink_segment, format, 0); +- + /* Scan for notorious SCR and PTS to calculate the duration */ + /* scan for first SCR in the stream */ + offset = demux->sink_segment.start; +- gst_ps_demux_scan_forward_ts (demux, &offset, SCAN_SCR, &demux->first_scr, +- DURATION_SCAN_LIMIT); +- GST_DEBUG_OBJECT (demux, "First SCR: %" G_GINT64_FORMAT " %" GST_TIME_FORMAT +- " in packet starting at %" G_GUINT64_FORMAT, +- demux->first_scr, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->first_scr)), +- offset); ++ gst_ps_demux_scan_forward_ts (demux, &offset, SCAN_SCR, ++ &demux->first_scr, DURATION_SCAN_LIMIT); ++ GST_DEBUG_OBJECT (demux, ++ "First SCR: %" G_GINT64_FORMAT " %" GST_TIME_FORMAT ++ " in packet starting at %" G_GUINT64_FORMAT, demux->first_scr, ++ GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->first_scr)), offset); + demux->first_scr_offset = offset; + /* scan for last SCR in the stream */ + offset = demux->sink_segment.stop; +- gst_ps_demux_scan_backward_ts (demux, &offset, SCAN_SCR, &demux->last_scr, +- DURATION_SCAN_LIMIT); +- GST_DEBUG_OBJECT (demux, "Last SCR: %" G_GINT64_FORMAT " %" GST_TIME_FORMAT +- " in packet starting at %" G_GUINT64_FORMAT, +- demux->last_scr, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->last_scr)), +- offset); ++ gst_ps_demux_scan_backward_ts (demux, &offset, SCAN_SCR, ++ &demux->last_scr, DURATION_SCAN_LIMIT); ++ GST_DEBUG_OBJECT (demux, ++ "Last SCR: %" G_GINT64_FORMAT " %" GST_TIME_FORMAT ++ " in packet starting at %" G_GUINT64_FORMAT, demux->last_scr, ++ GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->last_scr)), offset); + demux->last_scr_offset = offset; + /* scan for first PTS in the stream */ + offset = demux->sink_segment.start; +- gst_ps_demux_scan_forward_ts (demux, &offset, SCAN_PTS, &demux->first_pts, +- DURATION_SCAN_LIMIT); +- GST_DEBUG_OBJECT (demux, "First PTS: %" G_GINT64_FORMAT " %" GST_TIME_FORMAT +- " in packet starting at %" G_GUINT64_FORMAT, +- demux->first_pts, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->first_pts)), +- offset); ++ gst_ps_demux_scan_forward_ts (demux, &offset, SCAN_PTS, ++ &demux->first_pts, DURATION_SCAN_LIMIT); ++ GST_DEBUG_OBJECT (demux, ++ "First PTS: %" G_GINT64_FORMAT " %" GST_TIME_FORMAT ++ " in packet starting at %" G_GUINT64_FORMAT, demux->first_pts, ++ GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->first_pts)), offset); + if (demux->first_pts != G_MAXUINT64) { + /* scan for last PTS in the stream */ + offset = demux->sink_segment.stop; +@@ -2817,8 +2763,8 @@ gst_ps_sink_get_duration (GstPsDemux * demux) + /* Start demuxing from the right place */ + demux->sink_segment.position = offset; + GST_DEBUG_OBJECT (demux, "Replaced First SCR: %" G_GINT64_FORMAT +- " %" GST_TIME_FORMAT " in packet starting at %" G_GUINT64_FORMAT, +- demux->first_scr, ++ " %" GST_TIME_FORMAT " in packet starting at %" ++ G_GUINT64_FORMAT, demux->first_scr, + GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (demux->first_scr)), offset); + break; + } +@@ -2828,7 +2774,6 @@ gst_ps_sink_get_duration (GstPsDemux * demux) + demux->base_time = MPEGTIME_TO_GSTTIME (demux->first_scr); + demux->scr_rate_n = demux->last_scr_offset - demux->first_scr_offset; + demux->scr_rate_d = demux->last_scr - demux->first_scr; +- + if (G_LIKELY (demux->first_pts != G_MAXUINT64 && + demux->last_pts != G_MAXUINT64)) { + /* update the src segment */ +@@ -2845,9 +2790,7 @@ gst_ps_sink_get_duration (GstPsDemux * demux) + &demux->sink_segment); + GST_INFO_OBJECT (demux, "src segment configured %" GST_SEGMENT_FORMAT, + &demux->src_segment); +- + res = TRUE; +- + beach: + return res; + } +@@ -2858,7 +2801,6 @@ gst_ps_demux_pull_block (GstPad * pad, GstPsDemux * demux, + { + GstFlowReturn ret; + GstBuffer *buffer = NULL; +- + ret = gst_pad_pull_range (pad, offset, size, &buffer); + if (G_UNLIKELY (ret != GST_FLOW_OK)) { + GST_DEBUG_OBJECT (demux, "pull range at %" G_GUINT64_FORMAT +@@ -2867,13 +2809,11 @@ gst_ps_demux_pull_block (GstPad * pad, GstPsDemux * demux, + } else + GST_LOG_OBJECT (demux, "pull range at %" G_GUINT64_FORMAT + " size %u done", offset, size); +- + if (demux->sink_segment.rate < 0) { + GST_LOG_OBJECT (demux, "setting discont flag on backward rate"); + GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT); + } + ret = gst_ps_demux_chain (pad, GST_OBJECT (demux), buffer); +- + beach: + return ret; + } +@@ -2884,9 +2824,7 @@ gst_ps_demux_loop (GstPad * pad) + GstPsDemux *demux; + GstFlowReturn ret = GST_FLOW_OK; + guint64 offset = 0; +- + demux = GST_PS_DEMUX (gst_pad_get_parent (pad)); +- + if (G_UNLIKELY (demux->flushing)) { + ret = GST_FLOW_FLUSHING; + goto pause; +@@ -2894,7 +2832,6 @@ gst_ps_demux_loop (GstPad * pad) + + if (G_UNLIKELY (demux->sink_segment.format == GST_FORMAT_UNDEFINED)) + gst_ps_sink_get_duration (demux); +- + offset = demux->sink_segment.position; + if (demux->sink_segment.rate >= 0) { + guint size = BLOCK_SZ; +@@ -2903,24 +2840,22 @@ gst_ps_demux_loop (GstPad * pad) + } + /* pull in data */ + ret = gst_ps_demux_pull_block (pad, demux, offset, size); +- + /* pause if something went wrong */ + if (G_UNLIKELY (ret != GST_FLOW_OK)) + goto pause; +- + /* update our position */ + offset += size; + gst_segment_set_position (&demux->sink_segment, GST_FORMAT_BYTES, offset); +- + /* check EOS condition */ + if ((demux->src_segment.flags & GST_SEEK_FLAG_SEGMENT) && + ((demux->sink_segment.position >= demux->sink_segment.stop) || + (demux->src_segment.stop != (guint64) - 1 && + demux->src_segment.position >= demux->src_segment.stop))) { +- GST_DEBUG_OBJECT (demux, "forward mode using segment reached end of " +- "segment pos %" GST_TIME_FORMAT " stop %" GST_TIME_FORMAT +- " pos in bytes %" G_GUINT64_FORMAT " stop in bytes %" +- G_GUINT64_FORMAT, GST_TIME_ARGS (demux->src_segment.position), ++ GST_DEBUG_OBJECT (demux, ++ "forward mode using segment reached end of " "segment pos %" ++ GST_TIME_FORMAT " stop %" GST_TIME_FORMAT " pos in bytes %" ++ G_GUINT64_FORMAT " stop in bytes %" G_GUINT64_FORMAT, ++ GST_TIME_ARGS (demux->src_segment.position), + GST_TIME_ARGS (demux->src_segment.stop), + demux->sink_segment.position, demux->sink_segment.stop); + ret = GST_FLOW_EOS; +@@ -2928,25 +2863,22 @@ gst_ps_demux_loop (GstPad * pad) + } + } else { /* Reverse playback */ + guint64 size = MIN (offset, BLOCK_SZ); +- + /* pull in data */ + ret = gst_ps_demux_pull_block (pad, demux, offset - size, size); +- + /* pause if something went wrong */ + if (G_UNLIKELY (ret != GST_FLOW_OK)) + goto pause; +- + /* update our position */ + offset -= size; + gst_segment_set_position (&demux->sink_segment, GST_FORMAT_BYTES, offset); +- + /* check EOS condition */ + if (demux->sink_segment.position <= demux->sink_segment.start || + demux->src_segment.position <= demux->src_segment.start) { +- GST_DEBUG_OBJECT (demux, "reverse mode using segment reached end of " +- "segment pos %" GST_TIME_FORMAT " stop %" GST_TIME_FORMAT +- " pos in bytes %" G_GUINT64_FORMAT " stop in bytes %" +- G_GUINT64_FORMAT, GST_TIME_ARGS (demux->src_segment.position), ++ GST_DEBUG_OBJECT (demux, ++ "reverse mode using segment reached end of " "segment pos %" ++ GST_TIME_FORMAT " stop %" GST_TIME_FORMAT " pos in bytes %" ++ G_GUINT64_FORMAT " stop in bytes %" G_GUINT64_FORMAT, ++ GST_TIME_ARGS (demux->src_segment.position), + GST_TIME_ARGS (demux->src_segment.start), + demux->sink_segment.position, demux->sink_segment.start); + ret = GST_FLOW_EOS; +@@ -2955,27 +2887,21 @@ gst_ps_demux_loop (GstPad * pad) + } + + gst_object_unref (demux); +- + return; +- + pause: + { + const gchar *reason = gst_flow_get_name (ret); +- + GST_LOG_OBJECT (demux, "pausing task, reason %s", reason); + gst_pad_pause_task (pad); +- + if (ret == GST_FLOW_EOS) { + /* perform EOS logic */ + gst_element_no_more_pads (GST_ELEMENT_CAST (demux)); + if (demux->src_segment.flags & GST_SEEK_FLAG_SEGMENT) { + gint64 stop; +- + /* for segment playback we need to post when (in stream time) + * we stopped, this is either stop (when set) or the duration. */ + if ((stop = demux->src_segment.stop) == -1) + stop = demux->src_segment.duration; +- + if (demux->sink_segment.rate >= 0) { + GST_LOG_OBJECT (demux, "Sending segment done, at end of segment"); + gst_element_post_message (GST_ELEMENT_CAST (demux), +@@ -2984,8 +2910,8 @@ pause: + gst_ps_demux_send_event (demux, + gst_event_new_segment_done (GST_FORMAT_TIME, stop)); + } else { /* Reverse playback */ +- GST_LOG_OBJECT (demux, "Sending segment done, at beginning of " +- "segment"); ++ GST_LOG_OBJECT (demux, ++ "Sending segment done, at beginning of " "segment"); + gst_element_post_message (GST_ELEMENT_CAST (demux), + gst_message_new_segment_done (GST_OBJECT_CAST (demux), + GST_FORMAT_TIME, demux->src_segment.start)); +@@ -3020,7 +2946,6 @@ gst_ps_demux_sink_activate (GstPad * sinkpad, GstObject * parent) + { + gboolean res = FALSE; + GstQuery *query = gst_query_new_scheduling (); +- + if (gst_pad_peer_query (sinkpad, query)) { + if (gst_query_has_scheduling_mode_with_flags (query, + GST_PAD_MODE_PULL, GST_SCHEDULING_FLAG_SEEKABLE)) { +@@ -3033,7 +2958,6 @@ gst_ps_demux_sink_activate (GstPad * sinkpad, GstObject * parent) + } + + gst_query_unref (query); +- + return res; + } + +@@ -3043,9 +2967,7 @@ gst_ps_demux_sink_activate_push (GstPad * sinkpad, GstObject * parent, + gboolean active) + { + GstPsDemux *demux = GST_PS_DEMUX (parent); +- + demux->random_access = FALSE; +- + return TRUE; + } + +@@ -3057,12 +2979,11 @@ gst_ps_demux_sink_activate_pull (GstPad * sinkpad, GstObject * parent, + gboolean active) + { + GstPsDemux *demux = GST_PS_DEMUX (parent); +- + if (active) { + GST_DEBUG ("pull mode activated"); + demux->random_access = TRUE; +- return gst_pad_start_task (sinkpad, (GstTaskFunction) gst_ps_demux_loop, +- sinkpad, NULL); ++ return gst_pad_start_task (sinkpad, ++ (GstTaskFunction) gst_ps_demux_loop, sinkpad, NULL); + } else { + demux->random_access = FALSE; + return gst_pad_stop_task (sinkpad); +@@ -3090,12 +3011,9 @@ static GstFlowReturn + gst_ps_demux_combine_flows (GstPsDemux * demux, GstFlowReturn ret) + { + GST_LOG_OBJECT (demux, "flow return: %s", gst_flow_get_name (ret)); +- + ret = gst_flow_combiner_update_flow (demux->flowcombiner, ret); +- + if (G_UNLIKELY (demux->need_no_more_pads && ret == GST_FLOW_NOT_LINKED)) + ret = GST_FLOW_OK; +- + GST_LOG_OBJECT (demux, "combined flow return: %s", gst_flow_get_name (ret)); + return ret; + } +@@ -3107,32 +3025,28 @@ gst_ps_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) + GstFlowReturn ret = GST_FLOW_OK; + guint32 avail; + gboolean save, discont; +- + discont = GST_BUFFER_IS_DISCONT (buffer); +- + if (discont) { +- GST_LOG_OBJECT (demux, "Received buffer with discont flag and" +- " offset %" G_GUINT64_FORMAT, GST_BUFFER_OFFSET (buffer)); +- ++ GST_LOG_OBJECT (demux, ++ "Received buffer with discont flag and" " offset %" ++ G_GUINT64_FORMAT, GST_BUFFER_OFFSET (buffer)); + gst_pes_filter_drain (&demux->filter); + gst_ps_demux_mark_discont (demux, TRUE, FALSE); +- + /* mark discont on all streams */ + if (demux->sink_segment.rate >= 0.0) { + demux->current_scr = G_MAXUINT64; + demux->bytes_since_scr = 0; + } + } else { +- GST_LOG_OBJECT (demux, "Received buffer with offset %" G_GUINT64_FORMAT, ++ GST_LOG_OBJECT (demux, ++ "Received buffer with offset %" G_GUINT64_FORMAT, + GST_BUFFER_OFFSET (buffer)); + } + + /* We keep the offset to interpolate SCR */ + demux->adapter_offset = GST_BUFFER_OFFSET (buffer); +- + gst_adapter_push (demux->adapter, buffer); + demux->bytes_since_scr += gst_buffer_get_size (buffer); +- + avail = gst_adapter_available (demux->rev_adapter); + if (avail > 0) { + GST_LOG_OBJECT (demux, "appending %u saved bytes", avail); +@@ -3145,7 +3059,6 @@ gst_ps_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) + + avail = gst_adapter_available (demux->adapter); + GST_LOG_OBJECT (demux, "avail now: %d, state %d", avail, demux->filter.state); +- + switch (demux->filter.state) { + case STATE_DATA_SKIP: + case STATE_DATA_PUSH: +@@ -3215,7 +3128,6 @@ gst_ps_demux_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) + * saved up to the next ps sync. */ + if (ps_sync) + save = FALSE; +- + switch (ret) { + case GST_FLOW_NEED_MORE_DATA: + GST_DEBUG_OBJECT (demux, "need more data"); +@@ -3249,7 +3161,6 @@ gst_ps_demux_change_state (GstElement * element, GstStateChange transition) + { + GstPsDemux *demux = GST_PS_DEMUX (element); + GstStateChangeReturn result; +- + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: + gst_pes_filter_init (&demux->filter, demux->adapter, +@@ -3266,7 +3177,6 @@ gst_ps_demux_change_state (GstElement * element, GstStateChange transition) + } + + result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); +- + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: + gst_ps_demux_reset (demux); +-- +2.10.1 + diff --git a/media-libs/gst-plugins-bad/files/gst-plugins-bad-0.10.23-CVE-2015-0797.patch b/media-libs/gst-plugins-bad/files/gst-plugins-bad-0.10.23-CVE-2015-0797.patch new file mode 100644 index 000000000000..b1e323b9c0ec --- /dev/null +++ b/media-libs/gst-plugins-bad/files/gst-plugins-bad-0.10.23-CVE-2015-0797.patch @@ -0,0 +1,30 @@ +From: Ralph Giles <giles@mozilla.com> +Subject: Fix buffer overflow in mp4 parsing + +--- gst-plugins-bad0.10-0.10.23.orig/gst/videoparsers/gsth264parse.c ++++ gst-plugins-bad0.10-0.10.23/gst/videoparsers/gsth264parse.c +@@ -384,6 +384,11 @@ gst_h264_parse_wrap_nal (GstH264Parse * + + GST_DEBUG_OBJECT (h264parse, "nal length %d", size); + ++ if (size > G_MAXUINT32 - nl) { ++ GST_ELEMENT_ERROR (h264parse, STREAM, FAILED, (NULL), ++ ("overflow in nal size")); ++ return NULL; ++ } + buf = gst_buffer_new_and_alloc (size + nl + 4); + if (format == GST_H264_PARSE_FORMAT_AVC) { + GST_WRITE_UINT32_BE (GST_BUFFER_DATA (buf), size << (32 - 8 * nl)); +@@ -452,6 +457,11 @@ gst_h264_parse_process_nal (GstH264Parse + GST_DEBUG_OBJECT (h264parse, "not processing nal size %u", nalu->size); + return; + } ++ if (G_UNLIKELY (nalu->size > 20 * 1024 * 1024)) { ++ GST_DEBUG_OBJECT (h264parse, "not processing nal size %u (too big)", ++ nalu->size); ++ return; ++ } + + /* we have a peek as well */ + nal_type = nalu->type; + diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild new file mode 100644 index 000000000000..aeb407b8379d --- /dev/null +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-0.10.23-r4.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +GST_ORG_MODULE="gst-plugins-bad" +inherit eutils flag-o-matic gstreamer + +DESCRIPTION="Less plugins for GStreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" +SRC_URI+=" https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}-h264-patches.tar.xz" + +LICENSE="LGPL-2" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="+orc" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=media-libs/gst-plugins-base-0.10.36:${SLOT}[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-0.10.36:${SLOT}[${MULTILIB_USEDEP}] + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + !<media-plugins/gst-plugins-farsight-0.12.11:${SLOT}" + +src_prepare() { + # Patches from 0.10 branch fixing h264 baseline decoding; bug #446384 + epatch "${WORKDIR}/${P}-h264-patches"/*.patch + # Fix CVE-2015-0797, bug #553742 + epatch "${FILESDIR}"/${P}-CVE-2015-0797.patch +} + +src_configure() { + strip-flags + replace-flags "-O3" "-O2" + filter-flags "-fprefetch-loop-arrays" # (Bug #22249) + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # Disable vnmc and nsf plugins due to security bug 600142 + gstreamer_multilib_src_configure \ + --disable-nsf \ + --disable-vmnc \ + $(use_enable orc) \ + --disable-examples \ + --disable-debug \ + --disable-static +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild new file mode 100644 index 000000000000..d96dd6e58c09 --- /dev/null +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.3.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GST_ORG_MODULE="gst-plugins-bad" + +inherit eutils flag-o-matic gstreamer virtualx autotools + +DESCRIPTION="Less plugins for GStreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" + +LICENSE="LGPL-2" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + +IUSE="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland" +REQUIRED_USE=" + gles2? ( !opengl ) + opengl? ( X ) + wayland? ( egl ) +" + +# X11 is automagic for now, upstream #709530 +RDEPEND=" + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) + + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) + gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + opengl? ( + >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}] ) + + gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] ) + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PV}-CVE-2017-5848.patch ) # Remove eautoreconf from src_prepare when removing + +src_prepare() { + default + addpredict /dev # Prevent sandbox violations bug #570624 + eautoreconf # For CVE-2017-5848.patch updating Makefile.am to add a -base helper library link; remove autotools inherit when removing +} + +multilib_src_configure() { + local myconf=() + if use opengl || use gles2 ; then + # Actually enable the gl element, not just libs + myconf+=( --enable-gl ) + fi + + # Always enable gsettings (no extra dependency) + # and shm (need a switch for winnt ?) + gstreamer_multilib_src_configure \ + $(multilib_native_use_enable introspection) \ + $(use_enable bzip2 bz2) \ + $(use_enable egl) \ + $(use_enable gles2) \ + $(use_enable gtk gtk3) \ + $(use_enable opengl) \ + $(use_enable opengl glx) \ + $(use_enable orc) \ + $(use_enable vcd) \ + $(use_enable vnc librfb) \ + $(use_enable wayland) \ + $(use_enable X x11) \ + --disable-examples \ + --disable-debug \ + --disable-cocoa \ + --without-player-tests \ + --disable-wgl \ + --enable-shm \ + ${myconf[$@]} + # not ported + # --enable-gsettings + + if multilib_is_native_abi; then + local x + for x in libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_test() { + unset DISPLAY + # Tests are slower than upstream expects + virtx emake check CK_DEFAULT_TIMEOUT=300 +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild new file mode 100644 index 000000000000..b2b22d8c9670 --- /dev/null +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.10.5.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GST_ORG_MODULE="gst-plugins-bad" + +inherit eutils flag-o-matic gstreamer virtualx + +DESCRIPTION="Less plugins for GStreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" + +LICENSE="LGPL-2" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + +IUSE="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland" +REQUIRED_USE=" + gles2? ( !opengl ) + opengl? ( X ) + wayland? ( egl ) +" + +# X11 is automagic for now, upstream #709530 +RDEPEND=" + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) + + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) + gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + opengl? ( + >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}] ) + + gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] ) + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +RESTRICT="test" + +src_prepare() { + default + addpredict /dev # Prevent sandbox violations bug #570624 +} + +multilib_src_configure() { + local myconf=() + if use opengl || use gles2 ; then + # Actually enable the gl element, not just libs + myconf+=( --enable-gl ) + fi + + # Always enable gsettings (no extra dependency) + # and shm (need a switch for winnt ?) + gstreamer_multilib_src_configure \ + $(multilib_native_use_enable introspection) \ + $(use_enable bzip2 bz2) \ + $(use_enable egl) \ + $(use_enable gles2) \ + $(use_enable gtk gtk3) \ + $(use_enable opengl) \ + $(use_enable opengl glx) \ + $(use_enable orc) \ + $(use_enable vcd) \ + $(use_enable vnc librfb) \ + $(use_enable wayland) \ + $(use_enable X x11) \ + --disable-examples \ + --disable-debug \ + --disable-cocoa \ + --without-player-tests \ + --disable-wgl \ + --enable-shm \ + ${myconf[$@]} + # not ported + # --enable-gsettings + + if multilib_is_native_abi; then + local x + for x in libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_test() { + unset DISPLAY + # Tests are slower than upstream expects + virtx emake check CK_DEFAULT_TIMEOUT=300 +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild new file mode 100644 index 000000000000..4856dce20a76 --- /dev/null +++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GST_ORG_MODULE="gst-plugins-bad" + +inherit eutils flag-o-matic gstreamer virtualx + +DESCRIPTION="Less plugins for GStreamer" +HOMEPAGE="https://gstreamer.freedesktop.org/" + +LICENSE="LGPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" + +IUSE="X bzip2 egl gles2 gtk +introspection opengl +orc vcd vnc wayland" +REQUIRED_USE=" + gles2? ( !opengl ) + opengl? ( X ) + wayland? ( egl ) +" + +# X11 is automagic for now, upstream #709530 +RDEPEND=" + >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}] + >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?] + introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) + + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) + gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) + opengl? ( + >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] ) + X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}] + >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.4 + ) + + gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] ) + orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.12 +" + +RESTRICT="test" + +src_prepare() { + default + addpredict /dev # Prevent sandbox violations bug #570624 +} + +multilib_src_configure() { + local myconf=() + if use opengl || use gles2 ; then + # Actually enable the gl element, not just libs + myconf+=( --enable-gl ) + fi + + # Always enable gsettings (no extra dependency) + # and shm (need a switch for winnt ?) + gstreamer_multilib_src_configure \ + $(multilib_native_use_enable introspection) \ + $(use_enable bzip2 bz2) \ + $(use_enable egl) \ + $(use_enable gles2) \ + $(use_enable gtk gtk3) \ + $(use_enable opengl) \ + $(use_enable opengl glx) \ + $(use_enable orc) \ + $(use_enable vcd) \ + $(use_enable vnc librfb) \ + $(use_enable wayland) \ + $(use_enable X x11) \ + --disable-examples \ + --disable-debug \ + --disable-cocoa \ + --without-player-tests \ + --disable-wgl \ + --enable-shm \ + ${myconf[$@]} + # not ported + # --enable-gsettings + + if multilib_is_native_abi; then + local x + for x in libs plugins; do + ln -s "${S}"/docs/${x}/html docs/${x}/html || die + done + fi +} + +multilib_src_test() { + unset DISPLAY + # Tests are slower than upstream expects + virtx emake check CK_DEFAULT_TIMEOUT=300 +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog NEWS README RELEASE" + einstalldocs + prune_libtool_files --modules +} diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml new file mode 100644 index 000000000000..c51baf610a15 --- /dev/null +++ b/media-libs/gst-plugins-bad/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>gstreamer@gentoo.org</email> + <name>GStreamer package maintainers</name> + </maintainer> + <use> + <flag name="bzip2">Enable bzip2 encoder/decoder plugin</flag> + <flag name="egl">Enable EGL support</flag> + <flag name="gles2">Enable GLES2 support</flag> + </use> +</pkgmetadata> |