mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-31 11:32:38 +00:00
h264parser: Remove unused fps_num/fps_den fields
Instead the newly added function should be used to calculate the framerate properly. https://bugzilla.gnome.org/show_bug.cgi?id=723352
This commit is contained in:
parent
7d46d67c59
commit
b5f8b556e9
2 changed files with 0 additions and 22 deletions
|
@ -1498,7 +1498,6 @@ gst_h264_parse_sps_data (NalReader * nr, GstH264SPS * sps,
|
|||
gint width, height;
|
||||
guint subwc[] = { 1, 2, 2, 1 };
|
||||
guint subhc[] = { 1, 2, 1, 1 };
|
||||
GstH264VUIParams *vui = NULL;
|
||||
|
||||
memset (sps, 0, sizeof (*sps));
|
||||
|
||||
|
@ -1592,7 +1591,6 @@ gst_h264_parse_sps_data (NalReader * nr, GstH264SPS * sps,
|
|||
if (sps->vui_parameters_present_flag && parse_vui_params) {
|
||||
if (!gst_h264_parse_vui_parameters (sps, nr))
|
||||
goto error;
|
||||
vui = &sps->vui_parameters;
|
||||
}
|
||||
|
||||
/* calculate ChromaArrayType */
|
||||
|
@ -1631,26 +1629,7 @@ gst_h264_parse_sps_data (NalReader * nr, GstH264SPS * sps,
|
|||
GST_LOG ("crop_rectangle x=%u y=%u width=%u, height=%u", sps->crop_rect_x,
|
||||
sps->crop_rect_y, width, height);
|
||||
}
|
||||
sps->fps_num = 0;
|
||||
sps->fps_den = 1;
|
||||
|
||||
if (vui && vui->timing_info_present_flag) {
|
||||
/* derive framerate */
|
||||
/* FIXME verify / also handle other cases */
|
||||
GST_LOG ("Framerate: %u %u %u %u", parse_vui_params,
|
||||
vui->fixed_frame_rate_flag, sps->frame_mbs_only_flag,
|
||||
vui->pic_struct_present_flag);
|
||||
|
||||
if (parse_vui_params && vui->fixed_frame_rate_flag) {
|
||||
sps->fps_num = vui->time_scale;
|
||||
sps->fps_den = vui->num_units_in_tick;
|
||||
/* picture is a frame = 2 fields */
|
||||
sps->fps_den *= 2;
|
||||
GST_LOG ("framerate %d/%d", sps->fps_num, sps->fps_den);
|
||||
}
|
||||
} else {
|
||||
GST_LOG ("No VUI, unknown framerate");
|
||||
}
|
||||
return TRUE;
|
||||
|
||||
error:
|
||||
|
|
|
@ -710,7 +710,6 @@ struct _GstH264SPS
|
|||
gint width, height;
|
||||
gint crop_rect_width, crop_rect_height;
|
||||
gint crop_rect_x, crop_rect_y;
|
||||
gint fps_num, fps_den;
|
||||
gboolean valid;
|
||||
|
||||
/* Subset SPS extensions */
|
||||
|
|
Loading…
Reference in a new issue