diff options
| author | Brijesh Singh <brijeshkumar.singh@amd.com> | 2015-01-15 20:12:53 -0500 |
|---|---|---|
| committer | Leo Liu <leo.liu@amd.com> | 2015-01-15 21:22:50 -0500 |
| commit | b5379e83f90ab4adf8d6aa338d35c9392be13fdb (patch) | |
| tree | 0afceec927f9604c211619d72a787e353e982c50 | |
| parent | 8738d55ddcefd045fd65959000ab790f26c80948 (diff) | |
gstomxvideoenc: use scaling default macro's
* use #define macros instead of hardcoded value for default
* if omx failed to set the request scaling parameter then use default scaling value
Signed-off-by: Brijesh Singh <brijeshkumar.singh@amd.com>
| -rw-r--r-- | omx/gstomxvideoenc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c index f42ec13..1a0ecea 100644 --- a/omx/gstomxvideoenc.c +++ b/omx/gstomxvideoenc.c @@ -395,8 +395,8 @@ gst_omx_video_enc_open (GstVideoEncoder * encoder) } } - if (self->scaling_width != 0xffffffff || - self->scaling_height != 0xffffffff) { + if (self->scaling_width != GST_OMX_VIDEO_ENC_SCALING_WIDTH_DEFAULT || + self->scaling_height != GST_OMX_VIDEO_ENC_SCALING_HEIGHT_DEFAULT) { OMX_CONFIG_SCALEFACTORTYPE scale_factor; GST_OMX_INIT_STRUCT (&scale_factor); scale_factor.nPortIndex = self->enc_out_port->index; @@ -406,9 +406,9 @@ gst_omx_video_enc_open (GstVideoEncoder * encoder) if (err == OMX_ErrorNone) { - if (self->scaling_width != 0xffffffff) + if (self->scaling_width != GST_OMX_VIDEO_ENC_SCALING_WIDTH_DEFAULT) scale_factor.xWidth = self->scaling_width; - if (self->scaling_height != 0xffffffff) + if (self->scaling_height != GST_OMX_VIDEO_ENC_SCALING_HEIGHT_DEFAULT) scale_factor.xHeight = self->scaling_height; err = @@ -417,10 +417,14 @@ gst_omx_video_enc_open (GstVideoEncoder * encoder) if (err == OMX_ErrorUnsupportedIndex) { GST_WARNING_OBJECT (self, "Setting scale configuration not supported by the component"); + self->scaling_width = GST_OMX_VIDEO_ENC_SCALING_WIDTH_DEFAULT; + self->scaling_height = GST_OMX_VIDEO_ENC_SCALING_HEIGHT_DEFAULT; } else if (err == OMX_ErrorUnsupportedSetting) { GST_WARNING_OBJECT (self, "Setting scale configuration %u %u not supported by the component", self->scaling_width, self->scaling_height); + self->scaling_width = GST_OMX_VIDEO_ENC_SCALING_WIDTH_DEFAULT; + self->scaling_height = GST_OMX_VIDEO_ENC_SCALING_HEIGHT_DEFAULT; } else if (err != OMX_ErrorNone) { GST_ERROR_OBJECT (self, "Failed to set scale configuration: %s (0x%08x)", |