summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosep Torra <n770galaxy@gmail.com>2013-03-16 10:00:24 +0100
committerJosep Torra <n770galaxy@gmail.com>2013-03-16 15:45:48 +0100
commit8e66225ae48744e53a7220bd2c5d2633f1f4aa8f (patch)
tree4909dfdb85f744b1a8a33006a5096330a492d5a2
parentca59566774c7e7651f69f64a937e5eb9ca2571cb (diff)
downloadgst-omx-8e66225ae48744e53a7220bd2c5d2633f1f4aa8f.tar.gz
omx: Clarify that loop task is also paused in EOS
Conflicts: omx/gstomxaudioenc.c
-rw-r--r--omx/gstomxaudioenc.c2
-rw-r--r--omx/gstomxvideodec.c1
-rw-r--r--omx/gstomxvideoenc.c1
3 files changed, 3 insertions, 1 deletions
diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c
index 27d8fed..a5faa5a 100644
--- a/omx/gstomxaudioenc.c
+++ b/omx/gstomxaudioenc.c
@@ -529,9 +529,9 @@ eos:
flow_ret = GST_FLOW_UNEXPECTED;
}
g_mutex_unlock (self->drain_lock);
-
self->downstream_flow_ret = flow_ret;
+ /* Here we fallback and pause the task for the EOS case */
if (flow_ret != GST_FLOW_OK)
goto flow_error;
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 9515d99..e0ba41a 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -906,6 +906,7 @@ eos:
g_mutex_unlock (self->drain_lock);
self->downstream_flow_ret = flow_ret;
+ /* Here we fallback and pause the task for the EOS case */
if (flow_ret != GST_FLOW_OK)
goto flow_error;
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index f0f0f7f..09ed13d 100644
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -908,6 +908,7 @@ eos:
g_mutex_unlock (self->drain_lock);
self->downstream_flow_ret = flow_ret;
+ /* Here we fallback and pause the task for the EOS case */
if (flow_ret != GST_FLOW_OK)
goto flow_error;