summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2018-05-25 14:44:16 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2018-08-30 10:59:30 +0200
commit3b92b225540c861131fad96730d4546460c2ede6 (patch)
tree07b145f90d33804ddde09982729d25979f9853a2
parent457e1b9a5ea17b1055ac153d213d5b9575311c06 (diff)
downloadgst-omx-3b92b225540c861131fad96730d4546460c2ede6.tar.gz
omxvideo{enc,dec}: stop calling shutdown() in change_state
This is no longer needed since we implemented close() vfuncs as the encoder/decoder base class already take care of calling close() (which is calling shutdown()) in its own change_state implementation. We also move the shut down of the component from PAUSED_TO_READY to READY_TO_NULL. By doing so upstream will have already deactivated the pool from the encoder and so won't be preventing the OMX state change as the buffers will all be released. https://bugzilla.gnome.org/show_bug.cgi?id=796918
-rw-r--r--omx/gstomxvideodec.c3
-rw-r--r--omx/gstomxvideoenc.c3
2 files changed, 0 insertions, 6 deletions
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 70e01f6..d2d6428 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -512,9 +512,6 @@ gst_omx_video_dec_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY:
self->downstream_flow_ret = GST_FLOW_FLUSHING;
self->started = FALSE;
-
- if (!gst_omx_video_dec_shutdown (self))
- ret = GST_STATE_CHANGE_FAILURE;
break;
case GST_STATE_CHANGE_READY_TO_NULL:
break;
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index c92468e..2e9498f 100644
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -1209,9 +1209,6 @@ gst_omx_video_enc_change_state (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_PAUSED_TO_READY:
self->downstream_flow_ret = GST_FLOW_FLUSHING;
self->started = FALSE;
-
- if (!gst_omx_video_enc_shutdown (self))
- ret = GST_STATE_CHANGE_FAILURE;
break;
case GST_STATE_CHANGE_READY_TO_NULL:
break;