mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 18:22:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Don't access the port's buffers array if it wasn't allocated yet

Browse source
This commit is contained in:
Sebastian Dröge 2013-02-12 11:45:40 +01:00
parent dd3ad9e6d5
commit 4399c0b96b
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
omx/gstomx.c
View file

@ -1359,6 +1359,7 @@ gst_omx_port_set_flushing (GstOMXPort * port, gboolean flush)
last_error = OMX_ErrorNone; last_error = OMX_ErrorNone;
gst_omx_component_handle_messages (comp); gst_omx_component_handle_messages (comp);
while (signalled && last_error == OMX_ErrorNone && !port->flushed while (signalled && last_error == OMX_ErrorNone && !port->flushed
&& port->buffers
&& port->buffers->len > g_queue_get_length (&port->pending_buffers)) { && port->buffers->len > g_queue_get_length (&port->pending_buffers)) {
g_mutex_lock (&comp->messages_lock); g_mutex_lock (&comp->messages_lock);
g_mutex_unlock (&comp->lock); g_mutex_unlock (&comp->lock);
@ -2148,12 +2149,15 @@ done:
return err; return err;
} }
static const GType (*types[]) (void) = { typedef GType (*GGetTypeFunction) (void);
gst_omx_mpeg2_dec_get_type, gst_omx_mpeg4_video_dec_get_type,
gst_omx_h264_dec_get_type, gst_omx_h263_dec_get_type, static const GGetTypeFunction types[] = {
gst_omx_wmv_dec_get_type, gst_omx_mpeg4_video_enc_get_type, gst_omx_mpeg2_dec_get_type, gst_omx_mpeg4_video_dec_get_type,
gst_omx_h264_enc_get_type, gst_omx_h263_enc_get_type, gst_omx_h264_dec_get_type, gst_omx_h263_dec_get_type,
gst_omx_aac_enc_get_type}; gst_omx_wmv_dec_get_type, gst_omx_mpeg4_video_enc_get_type,
gst_omx_h264_enc_get_type, gst_omx_h263_enc_get_type,
gst_omx_aac_enc_get_type
};
struct TypeOffest struct TypeOffest
{ {
@ -2161,7 +2165,7 @@ struct TypeOffest
glong offset; glong offset;
}; };
static struct TypeOffest base_types[] = { static const struct TypeOffest base_types[] = {
{gst_omx_video_dec_get_type, G_STRUCT_OFFSET (GstOMXVideoDecClass, cdata)}, {gst_omx_video_dec_get_type, G_STRUCT_OFFSET (GstOMXVideoDecClass, cdata)},
{gst_omx_video_enc_get_type, G_STRUCT_OFFSET (GstOMXVideoEncClass, cdata)}, {gst_omx_video_enc_get_type, G_STRUCT_OFFSET (GstOMXVideoEncClass, cdata)},
{gst_omx_audio_enc_get_type, G_STRUCT_OFFSET (GstOMXAudioEncClass, cdata)}, {gst_omx_audio_enc_get_type, G_STRUCT_OFFSET (GstOMXAudioEncClass, cdata)},