projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a8cfcd
)
omxvideoenc: fix startup race condition
author
Christian König
<christian.koenig@amd.com>
Sat, 1 Mar 2014 17:49:41 +0000
(18:49 +0100)
committer
Sebastian Dröge
<sebastian@centricular.com>
Sun, 2 Mar 2014 11:08:09 +0000
(12:08 +0100)
The reset function shouldn't start the src pad
loop if it wasn't started before.
Signed-off-by: Christian König <christian.koenig@amd.com>
omx/gstomxvideoenc.c
patch
|
blob
|
history
diff --git
a/omx/gstomxvideoenc.c
b/omx/gstomxvideoenc.c
index
a85e815
..
90d4d22
100644
(file)
--- a/
omx/gstomxvideoenc.c
+++ b/
omx/gstomxvideoenc.c
@@
-1340,6
+1340,9
@@
gst_omx_video_enc_reset (GstVideoEncoder * encoder, gboolean hard)
GST_DEBUG_OBJECT (self, "Resetting encoder");
+ if (gst_omx_component_get_state (self->enc, 0) == OMX_StateLoaded)
+ return TRUE;
+
gst_omx_port_set_flushing (self->enc_in_port, 5 * GST_SECOND, TRUE);
gst_omx_port_set_flushing (self->enc_out_port, 5 * GST_SECOND, TRUE);