diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-06-29 19:04:54 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-06-29 19:04:54 +0200 |
| commit | 0a60770a289318ba842c69ecb38ece86e16697dd (patch) | |
| tree | 1f5c415eb39c8aa18e7d239f35e9504656d2d443 | |
| parent | d08002841be789fe4cf86bc18cea42f9da502906 (diff) | |
| download | gst-omx-0a60770a289318ba842c69ecb38ece86e16697dd.tar.gz | |
omxvideoenc: Implement flush() instead of the deprecated reset()
| -rw-r--r-- | omx/gstomxvideoenc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c index ed7d08f..0f64a02 100644 --- a/omx/gstomxvideoenc.c +++ b/omx/gstomxvideoenc.c @@ -74,8 +74,7 @@ static gboolean gst_omx_video_enc_start (GstVideoEncoder * encoder); static gboolean gst_omx_video_enc_stop (GstVideoEncoder * encoder); static gboolean gst_omx_video_enc_set_format (GstVideoEncoder * encoder, GstVideoCodecState * state); -static gboolean gst_omx_video_enc_reset (GstVideoEncoder * encoder, - gboolean hard); +static gboolean gst_omx_video_enc_flush (GstVideoEncoder * encoder); static GstFlowReturn gst_omx_video_enc_handle_frame (GstVideoEncoder * encoder, GstVideoCodecFrame * frame); static gboolean gst_omx_video_enc_finish (GstVideoEncoder * encoder); @@ -171,7 +170,7 @@ gst_omx_video_enc_class_init (GstOMXVideoEncClass * klass) video_encoder_class->close = GST_DEBUG_FUNCPTR (gst_omx_video_enc_close); video_encoder_class->start = GST_DEBUG_FUNCPTR (gst_omx_video_enc_start); video_encoder_class->stop = GST_DEBUG_FUNCPTR (gst_omx_video_enc_stop); - video_encoder_class->reset = GST_DEBUG_FUNCPTR (gst_omx_video_enc_reset); + video_encoder_class->flush = GST_DEBUG_FUNCPTR (gst_omx_video_enc_flush); video_encoder_class->set_format = GST_DEBUG_FUNCPTR (gst_omx_video_enc_set_format); video_encoder_class->handle_frame = @@ -734,7 +733,7 @@ gst_omx_video_enc_loop (GstOMXVideoEnc * self) g_assert (acq_return == GST_OMX_ACQUIRE_BUFFER_OK); /* This prevents a deadlock between the srcpad stream - * lock and the videocodec stream lock, if ::reset() + * lock and the videocodec stream lock, if ::flush() * is called at the wrong time */ if (gst_omx_port_is_flushing (self->enc_out_port)) { @@ -1179,13 +1178,13 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder, } static gboolean -gst_omx_video_enc_reset (GstVideoEncoder * encoder, gboolean hard) +gst_omx_video_enc_flush (GstVideoEncoder * encoder) { GstOMXVideoEnc *self; self = GST_OMX_VIDEO_ENC (encoder); - GST_DEBUG_OBJECT (self, "Resetting encoder"); + GST_DEBUG_OBJECT (self, "Flushing encoder"); if (gst_omx_component_get_state (self->enc, 0) == OMX_StateLoaded) return TRUE; |