mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxaudioenc: Use the base class' open/close vfuncs instead of calling them ourselves

Browse source
This commit is contained in:
Sebastian Dröge 2014-08-28 10:43:22 +03:00
parent d3d0a82ba4
commit 2c98a6ab7e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
omx/gstomxaudioenc.c
View file

@ -37,6 +37,8 @@ static GstStateChangeReturn
gst_omx_audio_enc_change_state (GstElement * element, gst_omx_audio_enc_change_state (GstElement * element,
GstStateChange transition); GstStateChange transition);
static gboolean gst_omx_audio_enc_open (GstAudioEncoder * encoder);
static gboolean gst_omx_audio_enc_close (GstAudioEncoder * encoder);
static gboolean gst_omx_audio_enc_start (GstAudioEncoder * encoder); static gboolean gst_omx_audio_enc_start (GstAudioEncoder * encoder);
static gboolean gst_omx_audio_enc_stop (GstAudioEncoder * encoder); static gboolean gst_omx_audio_enc_stop (GstAudioEncoder * encoder);
static gboolean gst_omx_audio_enc_set_format (GstAudioEncoder * encoder, static gboolean gst_omx_audio_enc_set_format (GstAudioEncoder * encoder,
@ -73,6 +75,8 @@ gst_omx_audio_enc_class_init (GstOMXAudioEncClass * klass)
element_class->change_state = element_class->change_state =
GST_DEBUG_FUNCPTR (gst_omx_audio_enc_change_state); GST_DEBUG_FUNCPTR (gst_omx_audio_enc_change_state);
audio_encoder_class->open = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_open);
audio_encoder_class->close = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_close);
audio_encoder_class->start = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_start); audio_encoder_class->start = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_start);
audio_encoder_class->stop = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_stop); audio_encoder_class->stop = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_stop);
audio_encoder_class->flush = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_flush); audio_encoder_class->flush = GST_DEBUG_FUNCPTR (gst_omx_audio_enc_flush);
@ -97,8 +101,9 @@ gst_omx_audio_enc_init (GstOMXAudioEnc * self)
} }
static gboolean static gboolean
gst_omx_audio_enc_open (GstOMXAudioEnc * self) gst_omx_audio_enc_open (GstAudioEncoder * encoder)
{ {
GstOMXAudioEnc *self = GST_OMX_AUDIO_ENC (encoder);
GstOMXAudioEncClass *klass = GST_OMX_AUDIO_ENC_GET_CLASS (self); GstOMXAudioEncClass *klass = GST_OMX_AUDIO_ENC_GET_CLASS (self);
gint in_port_index, out_port_index; gint in_port_index, out_port_index;
@ -175,8 +180,10 @@ gst_omx_audio_enc_shutdown (GstOMXAudioEnc * self)
} }
static gboolean static gboolean
gst_omx_audio_enc_close (GstOMXAudioEnc * self) gst_omx_audio_enc_close (GstAudioEncoder * encoder)
{ {
GstOMXAudioEnc *self = GST_OMX_AUDIO_ENC (encoder);
GST_DEBUG_OBJECT (self, "Closing encoder"); GST_DEBUG_OBJECT (self, "Closing encoder");
if (!gst_omx_audio_enc_shutdown (self)) if (!gst_omx_audio_enc_shutdown (self))
@ -214,8 +221,6 @@ gst_omx_audio_enc_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (!gst_omx_audio_enc_open (self))
ret = GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
self->downstream_flow_ret = GST_FLOW_OK; self->downstream_flow_ret = GST_FLOW_OK;
@ -261,8 +266,6 @@ gst_omx_audio_enc_change_state (GstElement * element, GstStateChange transition)
ret = GST_STATE_CHANGE_FAILURE; ret = GST_STATE_CHANGE_FAILURE;
break; break;
case GST_STATE_CHANGE_READY_TO_NULL: case GST_STATE_CHANGE_READY_TO_NULL:
if (!gst_omx_audio_enc_close (self))
ret = GST_STATE_CHANGE_FAILURE;
break; break;
default: default:
break; break;