summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2013-03-08 15:11:27 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2013-03-08 15:50:20 +0100
commitc014b1c9a3fbf3c6062debc58166ad77dae164db (patch)
tree902728e09c90df65d5c5a1814dbeeee0b227eed3
parent716adfa5be1b7c5fa10d40863132d2254f49a7a8 (diff)
downloadgst-omx-c014b1c9a3fbf3c6062debc58166ad77dae164db.tar.gz
omx: Flush and stop srcpad when configuring new caps
-rw-r--r--omx/gstomxaudioenc.c2
-rw-r--r--omx/gstomxvideodec.c2
-rw-r--r--omx/gstomxvideoenc.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c
index 8291b02..280187d 100644
--- a/omx/gstomxaudioenc.c
+++ b/omx/gstomxaudioenc.c
@@ -633,6 +633,8 @@ gst_omx_audio_enc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
if (needs_disable) {
GST_DEBUG_OBJECT (self, "Need to disable and drain encoder");
gst_omx_audio_enc_drain (self);
+ gst_omx_port_set_flushing (self->enc_out_port, 5 * GST_SECOND, TRUE);
+ gst_pad_stop_task (GST_AUDIO_ENCODER_SRC_PAD (encoder));
if (gst_omx_port_set_enabled (self->enc_in_port, FALSE) != OMX_ErrorNone)
return FALSE;
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 0a23908..2009426 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1982,6 +1982,8 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
GST_DEBUG_OBJECT (self, "Need to disable and drain decoder");
gst_omx_video_dec_drain (self, FALSE);
+ gst_omx_port_set_flushing (self->dec_out_port, 5 * GST_SECOND, TRUE);
+ gst_pad_stop_task (GST_VIDEO_DECODER_SRC_PAD (decoder));
if (klass->cdata.hacks & GST_OMX_HACK_NO_COMPONENT_RECONFIGURE) {
GST_VIDEO_DECODER_STREAM_UNLOCK (self);
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index 2d38a85..c9d32c3 100644
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -1101,6 +1101,8 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
if (needs_disable) {
GST_DEBUG_OBJECT (self, "Need to disable and drain encoder");
gst_omx_video_enc_drain (self, FALSE);
+ gst_omx_port_set_flushing (self->enc_out_port, 5 * GST_SECOND, TRUE);
+ gst_pad_stop_task (GST_VIDEO_ENCODER_SRC_PAD (encoder));
if (gst_omx_port_set_enabled (self->enc_in_port, FALSE) != OMX_ErrorNone)
return FALSE;