mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-13 01:35:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

h263parse: simplify valid_frame parsing

Browse source 
... considering that baseparse takes care of skipping etc
This commit is contained in:
Mark Nauwelaerts 2010-12-10 16:26:27 +01:00
parent b33b88e4bb
commit 0e6fbe2420
2 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/h263parse/gsth263parse.c
View file

@ -106,9 +106,6 @@ gst_h263_parse_start (GstBaseParse * parse)
GST_DEBUG ("Start"); GST_DEBUG ("Start");
h263parse->last_pos = 0;
h263parse->psc_pos = -1;
h263parse->bitrate = 0; h263parse->bitrate = 0;
h263parse->profile = -1; h263parse->profile = -1;
h263parse->level = -1; h263parse->level = -1;
@ -188,35 +185,32 @@ gst_h263_parse_check_valid_frame (GstBaseParse * parse, GstBuffer * buffer,
guint * framesize, gint * skipsize) guint * framesize, gint * skipsize)
{ {
GstH263Parse *h263parse; GstH263Parse *h263parse;
guint psc_pos; guint psc_pos, next_psc_pos;
h263parse = GST_H263PARSE (parse); h263parse = GST_H263PARSE (parse);
psc_pos = find_psc (buffer, h263parse->last_pos); psc_pos = find_psc (buffer, 0);
if (psc_pos == -1) { if (psc_pos == -1) {
/* PSC not found, need more data */ /* PSC not found, need more data */
if (GST_BUFFER_SIZE (buffer) > 3) if (GST_BUFFER_SIZE (buffer) > 3)
h263parse->last_pos = GST_BUFFER_SIZE (buffer) - 3; psc_pos = GST_BUFFER_SIZE (buffer) - 3;
else
psc_pos = 0;
goto more; goto more;
} }
if (h263parse->psc_pos == -1) {
/* Found the start of the frame, now try to find the end */ /* Found the start of the frame, now try to find the end */
next_psc_pos = psc_pos + 3;
next_psc_pos = find_psc (buffer, next_psc_pos);
h263parse->psc_pos = psc_pos; if (next_psc_pos == -1) {
h263parse->last_pos = psc_pos + 3;
psc_pos = find_psc (buffer, h263parse->last_pos);
if (psc_pos == -1) {
if (gst_base_parse_get_drain (GST_BASE_PARSE (h263parse))) if (gst_base_parse_get_drain (GST_BASE_PARSE (h263parse)))
/* FLUSH/EOS, it's okay if we can't find the next frame */ /* FLUSH/EOS, it's okay if we can't find the next frame */
psc_pos = GST_BUFFER_SIZE (buffer); next_psc_pos = GST_BUFFER_SIZE (buffer);
else else
goto more; goto more;
} }
}
/* We should now have a complete frame */ /* We should now have a complete frame */
@ -238,11 +232,8 @@ gst_h263_parse_check_valid_frame (GstBaseParse * parse, GstBuffer * buffer,
g_free (params); g_free (params);
} }
*skipsize = h263parse->psc_pos; *skipsize = psc_pos;
*framesize = psc_pos - h263parse->psc_pos; *framesize = next_psc_pos - psc_pos;
h263parse->psc_pos = -1;
h263parse->last_pos = 0;
/* XXX: After getting a keyframe, should we adjust min_frame_size to /* XXX: After getting a keyframe, should we adjust min_frame_size to
* something smaller so we don't end up collecting too many non-keyframes? */ * something smaller so we don't end up collecting too many non-keyframes? */
@ -255,8 +246,7 @@ more:
/* Ask for 1024 bytes more - this is an arbitrary choice */ /* Ask for 1024 bytes more - this is an arbitrary choice */
gst_base_parse_set_min_frame_size (parse, GST_BUFFER_SIZE (buffer) + 1024); gst_base_parse_set_min_frame_size (parse, GST_BUFFER_SIZE (buffer) + 1024);
/* Prevent baseparse from auto-skipping one byte */ *skipsize = psc_pos;
*skipsize = 0;
return FALSE; return FALSE;
} }

3
gst/h263parse/gsth263parse.h
View file

@ -65,9 +65,6 @@ struct _GstH263Parse
{ {
GstBaseParse baseparse; GstBaseParse baseparse;
gint psc_pos;
guint last_pos;
gint profile, level; gint profile, level;
guint bitrate; guint bitrate;