Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 973379 - GStreamerReader::ReadMetadata()'s element config loop should break on error to avoid timeout. r=edwin

Browse Source
This commit is contained in:
Alessandro Decina 2014-02-18 11:28:04 +13:00
parent fdaf36b04a
commit 3920571033
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
content/media/gstreamer/GStreamerReader.cpp
View File

@ -337,30 +337,40 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
}
LOG(PR_LOG_DEBUG, ("starting metadata pipeline"));
gst_element_set_state(mPlayBin, GST_STATE_PAUSED);
if (gst_element_set_state(mPlayBin, GST_STATE_PAUSED) == GST_STATE_CHANGE_FAILURE) {
LOG(PR_LOG_DEBUG, ("metadata pipeline state change failed"));
ret = NS_ERROR_FAILURE;
continue;
}
/* Wait for ASYNC_DONE, which is emitted when the pipeline is built,
* prerolled and ready to play. Also watch for errors.
*/
message = gst_bus_timed_pop_filtered(mBus, GST_CLOCK_TIME_NONE,
(GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
GError* error;
gchar* debug;
gst_message_parse_error(message, &error, &debug);
LOG(PR_LOG_ERROR, ("read metadata error: %s: %s", error->message,
debug));
g_error_free(error);
g_free(debug);
gst_element_set_state(mPlayBin, GST_STATE_NULL);
gst_message_unref(message);
ret = NS_ERROR_FAILURE;
} else {
(GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR | GST_MESSAGE_EOS));
if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ASYNC_DONE) {
LOG(PR_LOG_DEBUG, ("read metadata pipeline prerolled"));
gst_message_unref(message);
ret = NS_OK;
break;
} else {
LOG(PR_LOG_DEBUG, ("read metadata pipeline failed to preroll: %s",
gst_message_type_get_name (GST_MESSAGE_TYPE (message))));
if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_ERROR) {
GError* error;
gchar* debug;
gst_message_parse_error(message, &error, &debug);
LOG(PR_LOG_ERROR, ("read metadata error: %s: %s", error->message,
debug));
g_error_free(error);
g_free(debug);
}
/* Unexpected stream close/EOS or other error. We'll give up if all
* streams are in error/eos. */
gst_element_set_state(mPlayBin, GST_STATE_NULL);
gst_message_unref(message);
ret = NS_ERROR_FAILURE;
}
}
@ -379,12 +389,15 @@ nsresult GStreamerReader::ReadMetadata(MediaInfo* aInfo,
/* after a seek we need to wait again for ASYNC_DONE */
message = gst_bus_timed_pop_filtered(mBus, 5 * GST_SECOND,
(GstMessageType)(GST_MESSAGE_ASYNC_DONE | GST_MESSAGE_ERROR));
LOG(PR_LOG_DEBUG, ("matroskademux seek hack done"));
if (GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
if (message == NULL || GST_MESSAGE_TYPE(message) != GST_MESSAGE_ASYNC_DONE) {
LOG(PR_LOG_DEBUG, ("matroskademux seek hack failed: %p", message));
gst_element_set_state(mPlayBin, GST_STATE_NULL);
gst_message_unref(message);
if (message) {
gst_message_unref(message);
}
return NS_ERROR_FAILURE;
}
LOG(PR_LOG_DEBUG, ("matroskademux seek hack completed"));
} else {
LOG(PR_LOG_DEBUG, ("matroskademux seek hack failed (non fatal)"));
}