diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-25 17:50:52 +0200 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-10-25 18:02:38 +0200 |
commit | 0d1c7f6ea28b957c5df560208d88fa5cbb8beac0 (patch) | |
tree | 35958ef91f7e25773cfb0e6dd91dfba90a8cde72 | |
parent | 58441bf262fea75b70504beb0187260c39bdb266 (diff) |
videoparsers: use parsed or upstream fps to set some baseparse parameters
-rw-r--r-- | gst/videoparsers/gsth264parse.c | 19 | ||||
-rw-r--r-- | gst/videoparsers/gstmpeg4videoparse.c | 24 | ||||
-rw-r--r-- | gst/videoparsers/gstmpegvideoparse.c | 24 |
3 files changed, 45 insertions, 22 deletions
diff --git a/gst/videoparsers/gsth264parse.c b/gst/videoparsers/gsth264parse.c index b70dfb727..ecad2f6f8 100644 --- a/gst/videoparsers/gsth264parse.c +++ b/gst/videoparsers/gsth264parse.c @@ -1194,18 +1194,29 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps) } if (G_UNLIKELY (modified)) { + gint fps_num = h264parse->fps_num; + gint fps_den = h264parse->fps_den; + GstClockTime latency; + caps = gst_caps_copy (sink_caps); /* sps should give this */ gst_caps_set_simple (caps, "width", G_TYPE_INT, sps->width, "height", G_TYPE_INT, sps->height, NULL); + + /* upstream overrides */ + if (s && gst_structure_has_field (s, "framerate")) + gst_structure_get_fraction (s, "framerate", &fps_num, &fps_den); + /* but not necessarily or reliably this */ - if (h264parse->fps_num > 0 && h264parse->fps_den > 0 && - (!s || !gst_structure_has_field (s, "framerate"))) { + if (fps_num > 0 && fps_den > 0) { GST_INFO_OBJECT (h264parse, "setting framerate in caps"); gst_caps_set_simple (caps, "framerate", - GST_TYPE_FRACTION, h264parse->fps_num, h264parse->fps_den, NULL); + GST_TYPE_FRACTION, fps_num, fps_den, NULL); gst_base_parse_set_frame_rate (GST_BASE_PARSE (h264parse), - h264parse->fps_num, h264parse->fps_den, 0, 0); + fps_num, fps_den, 0, 0); + latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num); + gst_base_parse_set_latency (GST_BASE_PARSE (h264parse), latency, + latency); } } } diff --git a/gst/videoparsers/gstmpeg4videoparse.c b/gst/videoparsers/gstmpeg4videoparse.c index 94a6feb2d..9ca167a2b 100644 --- a/gst/videoparsers/gstmpeg4videoparse.c +++ b/gst/videoparsers/gstmpeg4videoparse.c @@ -589,17 +589,23 @@ gst_mpeg4vparse_update_src_caps (GstMpeg4VParse * mp4vparse) } /* perhaps we have a framerate */ - if (mp4vparse->vol.fixed_vop_time_increment != 0 && - (!s || !gst_structure_has_field (s, "framerate"))) { + { gint fps_num = mp4vparse->vol.vop_time_increment_resolution; gint fps_den = mp4vparse->vol.fixed_vop_time_increment; - GstClockTime latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num); - - gst_caps_set_simple (caps, "framerate", - GST_TYPE_FRACTION, fps_num, fps_den, NULL); - gst_base_parse_set_frame_rate (GST_BASE_PARSE (mp4vparse), - fps_num, fps_den, 0, 0); - gst_base_parse_set_latency (GST_BASE_PARSE (mp4vparse), latency, latency); + GstClockTime latency; + + /* upstream overrides */ + if (s && gst_structure_has_field (s, "framerate")) + gst_structure_get_fraction (s, "framerate", &fps_num, &fps_den); + + if (fps_den > 0 && fps_num > 0) { + gst_caps_set_simple (caps, "framerate", + GST_TYPE_FRACTION, fps_num, fps_den, NULL); + gst_base_parse_set_frame_rate (GST_BASE_PARSE (mp4vparse), + fps_num, fps_den, 0, 0); + latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num); + gst_base_parse_set_latency (GST_BASE_PARSE (mp4vparse), latency, latency); + } } /* or pixel-aspect-ratio */ diff --git a/gst/videoparsers/gstmpegvideoparse.c b/gst/videoparsers/gstmpegvideoparse.c index e3e6fa630..0143e6d47 100644 --- a/gst/videoparsers/gstmpegvideoparse.c +++ b/gst/videoparsers/gstmpegvideoparse.c @@ -659,17 +659,23 @@ gst_mpegv_parse_update_src_caps (GstMpegvParse * mpvparse) } /* perhaps we have a framerate */ - if (mpvparse->fps_num > 0 && mpvparse->fps_den > 0 && - (!s || !gst_structure_has_field (s, "framerate"))) { + { gint fps_num = mpvparse->fps_num; gint fps_den = mpvparse->fps_den; - GstClockTime latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num); - - gst_caps_set_simple (caps, "framerate", - GST_TYPE_FRACTION, fps_num, fps_den, NULL); - gst_base_parse_set_frame_rate (GST_BASE_PARSE (mpvparse), - fps_num, fps_den, 0, 0); - gst_base_parse_set_latency (GST_BASE_PARSE (mpvparse), latency, latency); + GstClockTime latency; + + /* upstream overrides */ + if (s && gst_structure_has_field (s, "framerate")) + gst_structure_get_fraction (s, "framerate", &fps_num, &fps_den); + + if (fps_den > 0 && fps_num > 0) { + gst_caps_set_simple (caps, "framerate", + GST_TYPE_FRACTION, fps_num, fps_den, NULL); + gst_base_parse_set_frame_rate (GST_BASE_PARSE (mpvparse), + fps_num, fps_den, 0, 0); + latency = gst_util_uint64_scale (GST_SECOND, fps_den, fps_num); + gst_base_parse_set_latency (GST_BASE_PARSE (mpvparse), latency, latency); + } } /* or pixel-aspect-ratio */ |