summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2013-02-28 15:48:53 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2013-02-28 15:49:14 +0100
commitaeec430261d7c58bf1433360dc7a1ac12760934a (patch)
treef34f9d39380539a1a70c79ea12a33b198a15d77e
parentdc0385d7629f4358388512cc4e6f0a6fce0e8386 (diff)
downloadgst-omx-aeec430261d7c58bf1433360dc7a1ac12760934a.tar.gz
omx: Return the OMX_ERRORTYPE from gst_omx_port_update_port_definition
-rw-r--r--omx/gstomx.c4
-rw-r--r--omx/gstomx.h2
-rw-r--r--omx/gstomxaudioenc.c6
-rw-r--r--omx/gstomxh263dec.c2
-rw-r--r--omx/gstomxh264dec.c2
-rw-r--r--omx/gstomxmpeg2dec.c2
-rw-r--r--omx/gstomxmpeg4videodec.c2
-rw-r--r--omx/gstomxvideodec.c6
-rw-r--r--omx/gstomxwmvdec.c2
9 files changed, 16 insertions, 12 deletions
diff --git a/omx/gstomx.c b/omx/gstomx.c
index c4a9c01..c05f978 100644
--- a/omx/gstomx.c
+++ b/omx/gstomx.c
@@ -1149,7 +1149,7 @@ gst_omx_port_get_port_definition (GstOMXPort * port,
port_def->nBufferCountMin = port->min_buffer_count;
}
-gboolean
+OMX_ERRORTYPE
gst_omx_port_update_port_definition (GstOMXPort * port,
OMX_PARAM_PORTDEFINITIONTYPE * port_def)
{
@@ -1173,7 +1173,7 @@ gst_omx_port_update_port_definition (GstOMXPort * port,
GST_DEBUG_OBJECT (comp->parent, "Updated port %u definition: %s (0x%08x)",
port->index, gst_omx_error_to_string (err), err);
- return (err == OMX_ErrorNone);
+ return err;
}
/* NOTE: Uses comp->lock and comp->messages_lock */
diff --git a/omx/gstomx.h b/omx/gstomx.h
index 5a572e4..b040cb4 100644
--- a/omx/gstomx.h
+++ b/omx/gstomx.h
@@ -297,7 +297,7 @@ OMX_ERRORTYPE gst_omx_component_close_tunnel (GstOMXComponent * comp1, GstOM
void gst_omx_port_get_port_definition (GstOMXPort * port, OMX_PARAM_PORTDEFINITIONTYPE * port_def);
-gboolean gst_omx_port_update_port_definition (GstOMXPort *port, OMX_PARAM_PORTDEFINITIONTYPE *port_definition);
+OMX_ERRORTYPE gst_omx_port_update_port_definition (GstOMXPort *port, OMX_PARAM_PORTDEFINITIONTYPE *port_definition);
GstOMXAcquireBufferReturn gst_omx_port_acquire_buffer (GstOMXPort *port, GstOMXBuffer **buf);
OMX_ERRORTYPE gst_omx_port_release_buffer (GstOMXPort *port, GstOMXBuffer *buf);
diff --git a/omx/gstomxaudioenc.c b/omx/gstomxaudioenc.c
index 6b087cc..250ef39 100644
--- a/omx/gstomxaudioenc.c
+++ b/omx/gstomxaudioenc.c
@@ -650,11 +650,13 @@ gst_omx_audio_enc_set_format (GstAudioEncoder * encoder, GstAudioInfo * info)
port_def.format.audio.eEncoding = OMX_AUDIO_CodingPCM;
GST_DEBUG_OBJECT (self, "Setting inport port definition");
- if (!gst_omx_port_update_port_definition (self->enc_in_port, &port_def))
+ if (gst_omx_port_update_port_definition (self->enc_in_port,
+ &port_def) != OMX_ErrorNone)
return FALSE;
GST_DEBUG_OBJECT (self, "Setting outport port definition");
- if (!gst_omx_port_update_port_definition (self->enc_out_port, NULL))
+ if (gst_omx_port_update_port_definition (self->enc_out_port,
+ NULL) != OMX_ErrorNone)
return FALSE;
GST_OMX_INIT_STRUCT (&pcm_param);
diff --git a/omx/gstomxh263dec.c b/omx/gstomxh263dec.c
index 8cc5fd6..5db50c3 100644
--- a/omx/gstomxh263dec.c
+++ b/omx/gstomxh263dec.c
@@ -92,7 +92,7 @@ gst_omx_h263_dec_set_format (GstOMXVideoDec * dec, GstOMXPort * port,
gst_omx_port_get_port_definition (port, &port_def);
port_def.format.video.eCompressionFormat = OMX_VIDEO_CodingH263;
- ret = gst_omx_port_update_port_definition (port, &port_def);
+ ret = gst_omx_port_update_port_definition (port, &port_def) == OMX_ErrorNone;
return ret;
}
diff --git a/omx/gstomxh264dec.c b/omx/gstomxh264dec.c
index b9e560f..b760d20 100644
--- a/omx/gstomxh264dec.c
+++ b/omx/gstomxh264dec.c
@@ -93,7 +93,7 @@ gst_omx_h264_dec_set_format (GstOMXVideoDec * dec, GstOMXPort * port,
gst_omx_port_get_port_definition (port, &port_def);
port_def.format.video.eCompressionFormat = OMX_VIDEO_CodingAVC;
- ret = gst_omx_port_update_port_definition (port, &port_def);
+ ret = gst_omx_port_update_port_definition (port, &port_def) == OMX_ErrorNone;
return ret;
}
diff --git a/omx/gstomxmpeg2dec.c b/omx/gstomxmpeg2dec.c
index d6e26fc..92bafc5 100644
--- a/omx/gstomxmpeg2dec.c
+++ b/omx/gstomxmpeg2dec.c
@@ -93,7 +93,7 @@ gst_omx_mpeg2_dec_set_format (GstOMXVideoDec * dec, GstOMXPort * port,
gst_omx_port_get_port_definition (port, &port_def);
port_def.format.video.eCompressionFormat = OMX_VIDEO_CodingMPEG2;
- ret = gst_omx_port_update_port_definition (port, &port_def);
+ ret = gst_omx_port_update_port_definition (port, &port_def) == OMX_ErrorNone;
return ret;
}
diff --git a/omx/gstomxmpeg4videodec.c b/omx/gstomxmpeg4videodec.c
index 456c628..04ddc78 100644
--- a/omx/gstomxmpeg4videodec.c
+++ b/omx/gstomxmpeg4videodec.c
@@ -95,7 +95,7 @@ gst_omx_mpeg4_video_dec_set_format (GstOMXVideoDec * dec, GstOMXPort * port,
gst_omx_port_get_port_definition (port, &port_def);
port_def.format.video.eCompressionFormat = OMX_VIDEO_CodingMPEG4;
- ret = gst_omx_port_update_port_definition (port, &port_def);
+ ret = gst_omx_port_update_port_definition (port, &port_def) == OMX_ErrorNone;
return ret;
}
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
index 332d0b3..e8e8e03 100644
--- a/omx/gstomxvideodec.c
+++ b/omx/gstomxvideodec.c
@@ -1171,11 +1171,13 @@ gst_omx_video_dec_set_format (GstVideoDecoder * decoder,
GST_DEBUG_OBJECT (self, "Setting inport port definition");
- if (!gst_omx_port_update_port_definition (self->dec_in_port, &port_def))
+ if (gst_omx_port_update_port_definition (self->dec_in_port,
+ &port_def) != OMX_ErrorNone)
return FALSE;
GST_DEBUG_OBJECT (self, "Setting outport port definition");
- if (!gst_omx_port_update_port_definition (self->dec_out_port, NULL))
+ if (gst_omx_port_update_port_definition (self->dec_out_port,
+ NULL) != OMX_ErrorNone)
return FALSE;
if (klass->set_format) {
diff --git a/omx/gstomxwmvdec.c b/omx/gstomxwmvdec.c
index f443d75..28c60f7 100644
--- a/omx/gstomxwmvdec.c
+++ b/omx/gstomxwmvdec.c
@@ -92,7 +92,7 @@ gst_omx_wmv_dec_set_format (GstOMXVideoDec * dec, GstOMXPort * port,
gst_omx_port_get_port_definition (port, &port_def);
port_def.format.video.eCompressionFormat = OMX_VIDEO_CodingWMV;
- ret = gst_omx_port_update_port_definition (port, &port_def);
+ ret = gst_omx_port_update_port_definition (port, &port_def) == OMX_ErrorNone;
return ret;
}