summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-05-10 22:48:23 +0200
committerSebastian Dröge <sebastian@centricular.com>2014-05-10 22:48:23 +0200
commit14af0f266e2b686a61519907b4832ac4c4187073 (patch)
treebac9b5718efbf19ffb53a6ba39d53545457783df
parentcfbf5bf16db213ff2149d61d517b79a192ca16c5 (diff)
omxaudioenc: Drain encoder on NULL buffer and don't drain on flushing
-rw-r--r--omx/gstomxaudioenc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c
index 2c99664..b27bd33 100644
--- a/omx/gstomxaudioenc.c
+++ b/omx/gstomxaudioenc.c
@@ -846,8 +846,6 @@ gst_omx_audio_enc_flush (GstAudioEncoder * encoder)
GST_DEBUG_OBJECT (self, "Resetting encoder");
- gst_omx_audio_enc_drain (self);
-
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);
@@ -893,7 +891,7 @@ gst_omx_audio_enc_handle_frame (GstAudioEncoder * encoder, GstBuffer * inbuf)
}
if (inbuf == NULL)
- return GST_FLOW_OK;
+ return gst_omx_audio_enc_drain (self);
GST_DEBUG_OBJECT (self, "Handling frame");