mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Add a hack for not disabling the output port after set_format until the output format is known

Browse source 
Needed on some OMX implementations, e.g. the one from Atmel. It does
not send the settings-changed event on the output port if it is
disabled.
This commit is contained in:
Sebastian Dröge 2014-05-15 10:58:34 +02:00
parent e08540d969
commit 4e20116bc6
3 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omx/gstomx.c
View file

@ -2458,6 +2458,8 @@ gst_omx_parse_hacks (gchar ** hacks)
hacks_flags |= GST_OMX_HACK_DRAIN_MAY_NOT_RETURN; hacks_flags |= GST_OMX_HACK_DRAIN_MAY_NOT_RETURN;
else if (g_str_equal (*hacks, "no-component-role")) else if (g_str_equal (*hacks, "no-component-role"))
hacks_flags |= GST_OMX_HACK_NO_COMPONENT_ROLE; hacks_flags |= GST_OMX_HACK_NO_COMPONENT_ROLE;
else if (g_str_equal (*hacks, "no-disable-outport"))
hacks_flags |= GST_OMX_HACK_NO_DISABLE_OUTPORT;
else else
GST_WARNING ("Unknown hack: %s", *hacks); GST_WARNING ("Unknown hack: %s", *hacks);
hacks++; hacks++;

5
omx/gstomx.h
View file

@ -107,6 +107,11 @@ G_BEGIN_DECLS
*/ */
#define GST_OMX_HACK_NO_COMPONENT_ROLE G_GUINT64_CONSTANT (0x0000000000000080) #define GST_OMX_HACK_NO_COMPONENT_ROLE G_GUINT64_CONSTANT (0x0000000000000080)
/* If the component doesn't allow disabling the outport while
* when setting the format until the output format is known.
*/
#define GST_OMX_HACK_NO_DISABLE_OUTPORT G_GUINT64_CONSTANT (0x0000000000000100)
typedef struct _GstOMXCore GstOMXCore; typedef struct _GstOMXCore GstOMXCore;
typedef struct _GstOMXPort GstOMXPort; typedef struct _GstOMXPort GstOMXPort;
typedef enum _GstOMXPortDirection GstOMXPortDirection; typedef enum _GstOMXPortDirection GstOMXPortDirection;

47
omx/gstomxvideodec.c
View file

@ -1860,6 +1860,18 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
return FALSE; return FALSE;
if (gst_omx_port_allocate_buffers (self->dec_in_port) != OMX_ErrorNone) if (gst_omx_port_allocate_buffers (self->dec_in_port) != OMX_ErrorNone)
return FALSE; return FALSE;
if ((klass->cdata.hacks & GST_OMX_HACK_NO_DISABLE_OUTPORT)) {
if (gst_omx_port_set_enabled (self->dec_out_port, TRUE) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_allocate_buffers (self->dec_out_port) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_wait_enabled (self->dec_out_port,
5 * GST_SECOND) != OMX_ErrorNone)
return FALSE;
}
if (gst_omx_port_wait_enabled (self->dec_in_port, if (gst_omx_port_wait_enabled (self->dec_in_port,
5 * GST_SECOND) != OMX_ErrorNone) 5 * GST_SECOND) != OMX_ErrorNone)
return FALSE; return FALSE;
@ -1869,20 +1881,33 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
if (!gst_omx_video_dec_negotiate (self)) if (!gst_omx_video_dec_negotiate (self))
GST_LOG_OBJECT (self, "Negotiation failed, will get output format later"); GST_LOG_OBJECT (self, "Negotiation failed, will get output format later");
/* Disable output port */ if (!(klass->cdata.hacks & GST_OMX_HACK_NO_DISABLE_OUTPORT)) {
if (gst_omx_port_set_enabled (self->dec_out_port, FALSE) != OMX_ErrorNone) /* Disable output port */
return FALSE; if (gst_omx_port_set_enabled (self->dec_out_port, FALSE) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_wait_enabled (self->dec_out_port, if (gst_omx_port_wait_enabled (self->dec_out_port,
1 * GST_SECOND) != OMX_ErrorNone) 1 * GST_SECOND) != OMX_ErrorNone)
return FALSE; return FALSE;
if (gst_omx_component_set_state (self->dec, OMX_StateIdle) != OMX_ErrorNone) if (gst_omx_component_set_state (self->dec,
return FALSE; OMX_StateIdle) != OMX_ErrorNone)
return FALSE;
/* Need to allocate buffers to reach Idle state */ /* Need to allocate buffers to reach Idle state */
if (gst_omx_port_allocate_buffers (self->dec_in_port) != OMX_ErrorNone) if (gst_omx_port_allocate_buffers (self->dec_in_port) != OMX_ErrorNone)
return FALSE; return FALSE;
} else {
if (gst_omx_component_set_state (self->dec,
OMX_StateIdle) != OMX_ErrorNone)
return FALSE;
/* Need to allocate buffers to reach Idle state */
if (gst_omx_port_allocate_buffers (self->dec_in_port) != OMX_ErrorNone)
return FALSE;
if (gst_omx_port_allocate_buffers (self->dec_out_port) != OMX_ErrorNone)
return FALSE;
}
if (gst_omx_component_get_state (self->dec, if (gst_omx_component_get_state (self->dec,
GST_CLOCK_TIME_NONE) != OMX_StateIdle) GST_CLOCK_TIME_NONE) != OMX_StateIdle)