mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264parse: use new gst_h264_video_calculate_framerate() to get framerate

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=723352
This commit is contained in:
Aurélien Zanelli 2014-05-19 17:52:38 +02:00 committed by Sebastian Dröge
parent 753701bf68
commit 2c3e7b6352
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/videoparsers/gsth264parse.c
View file

@ -1173,6 +1173,7 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
caps = gst_caps_copy (sink_caps);
} else {
gint crop_width, crop_height;
gint fps_num, fps_den;
if (sps->frame_cropping_flag) {
crop_width = sps->crop_rect_width;
@ -1193,12 +1194,13 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
/* 0/1 is set as the default in the codec parser, we will set
* it in case we have no info */
if (G_UNLIKELY (h264parse->fps_num != sps->fps_num
|| h264parse->fps_den != sps->fps_den)) {
GST_DEBUG_OBJECT (h264parse, "framerate changed %d/%d",
sps->fps_num, sps->fps_den);
h264parse->fps_num = sps->fps_num;
h264parse->fps_den = sps->fps_den;
gst_h264_video_calculate_framerate (sps, h264parse->field_pic_flag,
h264parse->sei_pic_struct, &fps_num, &fps_den);
if (G_UNLIKELY (h264parse->fps_num != fps_num
|| h264parse->fps_den != fps_den)) {
GST_DEBUG_OBJECT (h264parse, "framerate changed %d/%d", fps_num, fps_den);
h264parse->fps_num = fps_num;
h264parse->fps_den = fps_den;
modified = TRUE;
}
@ -1213,11 +1215,12 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
}
if (G_UNLIKELY (modified || h264parse->update_caps)) {
gint fps_num = h264parse->fps_num;
gint fps_den = h264parse->fps_den;
gint width, height;
GstClockTime latency;
fps_num = h264parse->fps_num;
fps_den = h264parse->fps_den;
caps = gst_caps_copy (sink_caps);
/* sps should give this but upstream overrides */