mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

omxvideo(enc): use GST_VIDEO_INFO_FIELD_RATE_N()

Browse source 
Does not change anything for now but will be needed when we'll support
interlace-mode=alternate as the field rate will be twice the frame rate.

Made the code safe from division by 0 while I was on it.
This commit is contained in:
Guillaume Desmottes 2020-02-06 09:57:48 +05:30
parent f14f5d9f70
commit e616094a53
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
omx/gstomxvideo.c
View file

@ -238,7 +238,13 @@ gst_omx_video_calculate_framerate_q16 (GstVideoInfo * info)
{ {
g_assert (info); g_assert (info);
return gst_util_uint64_scale_int (1 << 16, info->fps_n, info->fps_d); if (!info->fps_d)
return 0;
/* OMX API expects frame rate to actually be the field rate, so twice
* the frame rate in interlace mode. */
return gst_util_uint64_scale_int (1 << 16, GST_VIDEO_INFO_FIELD_RATE_N (info),
info->fps_d);
} }
gboolean gboolean

15
omx/gstomxvideoenc.c
View file

@ -2349,10 +2349,12 @@ gst_omx_video_enc_framerate_changed (GstOMXVideoEnc * self,
GST_OMX_INIT_STRUCT (&config); GST_OMX_INIT_STRUCT (&config);
config.nPortIndex = self->enc_in_port->index; config.nPortIndex = self->enc_in_port->index;
if (klass->cdata.hacks & GST_OMX_HACK_VIDEO_FRAMERATE_INTEGER) if (klass->cdata.hacks & GST_OMX_HACK_VIDEO_FRAMERATE_INTEGER) {
config.xEncodeFramerate = info->fps_n ? (info->fps_n) / (info->fps_d) : 0; config.xEncodeFramerate =
else info->fps_d ? GST_VIDEO_INFO_FIELD_RATE_N (info) / (info->fps_d) : 0;
} else {
config.xEncodeFramerate = gst_omx_video_calculate_framerate_q16 (info); config.xEncodeFramerate = gst_omx_video_calculate_framerate_q16 (info);
}
err = gst_omx_component_set_config (self->enc, err = gst_omx_component_set_config (self->enc,
OMX_IndexConfigVideoFramerate, &config); OMX_IndexConfigVideoFramerate, &config);
@ -2456,12 +2458,13 @@ gst_omx_video_enc_set_format (GstVideoEncoder * encoder,
port_def.format.video.nFrameWidth = info->width; port_def.format.video.nFrameWidth = info->width;
port_def.format.video.nFrameHeight = GST_VIDEO_INFO_FIELD_HEIGHT (info); port_def.format.video.nFrameHeight = GST_VIDEO_INFO_FIELD_HEIGHT (info);
if (G_UNLIKELY (klass->cdata.hacks & GST_OMX_HACK_VIDEO_FRAMERATE_INTEGER)) if (G_UNLIKELY (klass->cdata.hacks & GST_OMX_HACK_VIDEO_FRAMERATE_INTEGER)) {
port_def.format.video.xFramerate = port_def.format.video.xFramerate =
info->fps_n ? (info->fps_n) / (info->fps_d) : 0; info->fps_d ? GST_VIDEO_INFO_FIELD_RATE_N (info) / (info->fps_d) : 0;
else } else {
port_def.format.video.xFramerate = port_def.format.video.xFramerate =
gst_omx_video_calculate_framerate_q16 (info); gst_omx_video_calculate_framerate_q16 (info);
}
GST_DEBUG_OBJECT (self, "Setting inport port definition"); GST_DEBUG_OBJECT (self, "Setting inport port definition");
if (gst_omx_port_update_port_definition (self->enc_in_port, if (gst_omx_port_update_port_definition (self->enc_in_port,