summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2013-03-07 17:38:40 +0100
committerJosep Torra <n770galaxy@gmail.com>2013-03-09 13:17:39 +0100
commit24b6705538de99361f1b99cf9f0e6d342b79c4e9 (patch)
tree792a337d32a1d4478855a666b4134101c5fbb097
parent508e0aa98bb99ae17121cfc3785ea981af6cefb9 (diff)
omxvideodec: Only negotiate a color format with downstream on the initial caps
-rw-r--r--omx/gstomxvideodec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index f50b5e2..11b3704 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1201,10 +1201,6 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
gst_buffer_replace (&self->codec_data, state->codec_data);
self->input_state = gst_video_codec_state_ref (state);
- if (!gst_omx_video_dec_negotiate (self)) {
- GST_LOG_OBJECT (self, "Negotiation failed, will get output format later");
- }
-
GST_DEBUG_OBJECT (self, "Enabling component");
if (needs_disable) {
@@ -1218,6 +1214,9 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
if (gst_omx_port_mark_reconfigured (self->dec_in_port) != OMX_ErrorNone)
return FALSE;
} else {
+ if (!gst_omx_video_dec_negotiate (self))
+ GST_LOG_OBJECT (self, "Negotiation failed, will get output format later");
+
if (gst_omx_component_set_state (self->dec, OMX_StateIdle) != OMX_ErrorNone)
return FALSE;