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

mpeg4videoparse: Reparse the config if the size changed

Browse source 
Also only re-issue the caps update if the part of the config that
changed is one we care about.
This commit is contained in:
Olivier Crête 2013-08-16 15:41:48 -04:00
parent b8f9d674be
commit 27bceba4ad
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/videoparsers/gstmpeg4videoparse.c
View file

@ -246,9 +246,11 @@ gst_mpeg4vparse_process_config (GstMpeg4VParse * mp4vparse,
const guint8 * data, guint offset, gsize size) const guint8 * data, guint offset, gsize size)
{ {
GstMpeg4VisualObject *vo; GstMpeg4VisualObject *vo;
GstMpeg4VideoObjectLayer vol = { 0 };
/* only do stuff if something new */ /* only do stuff if something new */
if (mp4vparse->config if (mp4vparse->config
&& gst_buffer_get_size (mp4vparse->config) == size
&& !gst_buffer_memcmp (mp4vparse->config, offset, data, size)) && !gst_buffer_memcmp (mp4vparse->config, offset, data, size))
return TRUE; return TRUE;
@ -262,12 +264,27 @@ gst_mpeg4vparse_process_config (GstMpeg4VParse * mp4vparse,
/* If the parsing fail, we accept the config only if we don't have /* If the parsing fail, we accept the config only if we don't have
* any config yet. */ * any config yet. */
if (gst_mpeg4_parse_video_object_layer (&mp4vparse->vol, if (gst_mpeg4_parse_video_object_layer (&vol,
vo, data + mp4vparse->vol_offset, vo, data + mp4vparse->vol_offset,
size - mp4vparse->vol_offset) != GST_MPEG4_PARSER_OK && size - mp4vparse->vol_offset) != GST_MPEG4_PARSER_OK &&
mp4vparse->config) mp4vparse->config)
return FALSE; return FALSE;
/* ignore update if nothing meaningful changed */
if (vol.height == mp4vparse->vol.height &&
vol.width == mp4vparse->vol.width &&
vol.vop_time_increment_resolution ==
mp4vparse->vol.vop_time_increment_resolution &&
vol.fixed_vop_time_increment == mp4vparse->vol.fixed_vop_time_increment &&
vol.par_width == mp4vparse->vol.par_width &&
vol.par_height == mp4vparse->vol.par_height &&
vol.sprite_enable == mp4vparse->vol.sprite_enable &&
vol.no_of_sprite_warping_points ==
mp4vparse->vol.no_of_sprite_warping_points)
return TRUE;
mp4vparse->vol = vol;
GST_LOG_OBJECT (mp4vparse, "Width/Height: %u/%u, " GST_LOG_OBJECT (mp4vparse, "Width/Height: %u/%u, "
"time increment resolution: %u fixed time increment: %u", "time increment resolution: %u fixed time increment: %u",
mp4vparse->vol.width, mp4vparse->vol.height, mp4vparse->vol.width, mp4vparse->vol.height,
@ -514,13 +531,13 @@ gst_mpeg4vparse_update_src_caps (GstMpeg4VParse * mp4vparse)
GstCaps *caps = NULL; GstCaps *caps = NULL;
GstStructure *s = NULL; GstStructure *s = NULL;
GST_LOG_OBJECT (mp4vparse, "Updating caps");
/* only update if no src caps yet or explicitly triggered */ /* only update if no src caps yet or explicitly triggered */
if (G_LIKELY (gst_pad_has_current_caps (GST_BASE_PARSE_SRC_PAD (mp4vparse)) && if (G_LIKELY (gst_pad_has_current_caps (GST_BASE_PARSE_SRC_PAD (mp4vparse)) &&
!mp4vparse->update_caps)) !mp4vparse->update_caps))
return; return;
GST_LOG_OBJECT (mp4vparse, "Updating caps");
/* carry over input caps as much as possible; override with our own stuff */ /* carry over input caps as much as possible; override with our own stuff */
caps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (mp4vparse)); caps = gst_pad_get_current_caps (GST_BASE_PARSE_SINK_PAD (mp4vparse));
if (caps) { if (caps) {