diff options
author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-25 15:40:39 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-25 15:56:30 +0000 |
commit | f4afccff5c8c8f4163544c40b6e671a5b98d54c3 (patch) | |
tree | 4f185ce9d145475a66bb5c730e8405066e6bd94d /gst/matroska | |
parent | f9207722ca8fd8dcc1e7215d8af85efe4debfdf4 (diff) |
matroskamux: create streamable output if downstream is not seekable
Ignore the "streamable" property setting and create streamable
output if downstream is known not to be seekable (as queried
via a SEEKABLE query).
Fixes pipelines like webmmux ! appsink creating seemingly
corrupted output if streamable has not been set to true.
Diffstat (limited to 'gst/matroska')
-rw-r--r-- | gst/matroska/matroska-mux.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index d79c2224d..fb86ef498 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -2355,6 +2355,29 @@ gst_matroska_mux_start (GstMatroskaMux * mux) guint32 segment_uid[4]; GTimeVal time = { 0, 0 }; + /* if not streaming, check if downstream is seekable */ + if (!mux->streamable) { + gboolean seekable; + GstQuery *query; + + query = gst_query_new_seeking (GST_FORMAT_BYTES); + if (gst_pad_peer_query (mux->srcpad, query)) { + gst_query_parse_seeking (query, NULL, &seekable, NULL, NULL); + GST_INFO_OBJECT (mux, "downstream is %sseekable", seekable ? "" : "not "); + if (!seekable) { + mux->streamable = TRUE; + g_object_notify (G_OBJECT (mux), "streamable"); + GST_WARNING_OBJECT (mux, "downstream is not seekable, but " + "streamable=false. Will ignore that and create streamable output " + "instead"); + } + } else { + /* have to assume seeking is supported if query not handled downstream */ + /* FIXME 0.11: change to query not handled => seeking not supported */ + GST_WARNING_OBJECT (mux, "downstream did not handle seeking query"); + } + } + if (!strcmp (mux->doctype, GST_MATROSKA_DOCTYPE_WEBM)) { ebml->caps = gst_caps_new_simple ("video/webm", NULL); } else { |