mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-12 06:42:00 +00:00
qtmux: Don't error out if downstream is not seekable for non-fragmented variants
Doing so would be a regression over 1.0 and breaks the unit test. However the result will be most likely unusable, so let's post a warning message on the bus.
This commit is contained in:
parent
97f4674655
commit
4a91a93d4e
1 changed files with 5 additions and 10 deletions
|
@ -1653,7 +1653,11 @@ gst_qt_mux_start_file (GstQTMux * qtmux)
|
||||||
if (!seekable) {
|
if (!seekable) {
|
||||||
if (qtmux_klass->format != GST_QT_MUX_FORMAT_ISML) {
|
if (qtmux_klass->format != GST_QT_MUX_FORMAT_ISML) {
|
||||||
if (!qtmux->fast_start) {
|
if (!qtmux->fast_start) {
|
||||||
goto not_seekable_error;
|
GST_ELEMENT_WARNING (qtmux, STREAM, FAILED,
|
||||||
|
("Downstream is not seekable and headers can't be rewritten"),
|
||||||
|
(NULL));
|
||||||
|
/* FIXME: Is there something better we can do? */
|
||||||
|
qtmux->streamable = TRUE;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
GST_WARNING_OBJECT (qtmux, "downstream is not seekable, but "
|
GST_WARNING_OBJECT (qtmux, "downstream is not seekable, but "
|
||||||
|
@ -1774,15 +1778,6 @@ gst_qt_mux_start_file (GstQTMux * qtmux)
|
||||||
exit:
|
exit:
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
not_seekable_error:
|
|
||||||
{
|
|
||||||
GST_ELEMENT_ERROR (qtmux, STREAM, FAILED,
|
|
||||||
("Downstream is not seekable and headers can't be rewritten"),
|
|
||||||
GST_ERROR_SYSTEM);
|
|
||||||
GST_OBJECT_UNLOCK (qtmux);
|
|
||||||
return GST_FLOW_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ERRORS */
|
/* ERRORS */
|
||||||
open_failed:
|
open_failed:
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue