mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 15:08:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpeg4videoparse: also consider user_data pieces when parsing VO(S)

Browse source
This commit is contained in:
Mark Nauwelaerts 2009-09-07 16:20:23 +02:00
parent 503091ae0e
commit 5b1ed7d42c
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/mpeg4videoparse/mpeg4videoparse.c
View file

@ -129,6 +129,7 @@ gst_mpeg4vparse_set_new_caps (GstMpeg4VParse * parse,
#define START_MARKER 0x000001 #define START_MARKER 0x000001
#define VISUAL_OBJECT_STARTCODE_MARKER ((START_MARKER << 8) + VISUAL_OBJECT_STARTCODE) #define VISUAL_OBJECT_STARTCODE_MARKER ((START_MARKER << 8) + VISUAL_OBJECT_STARTCODE)
#define USER_DATA_STARTCODE_MARKER ((START_MARKER << 8) + USER_DATA_STARTCODE)
typedef struct typedef struct
{ {
@ -327,6 +328,24 @@ failed:
} }
} }
static inline gboolean
skip_user_data (bitstream_t * bs, guint32 * bits)
{
while (*bits == USER_DATA_STARTCODE_MARKER) {
guint32 b;
do {
GET_BITS (bs, 8, &b);
*bits = (*bits << 8) | b;
} while ((*bits >> 8) != START_MARKER);
}
return TRUE;
failed:
return FALSE;
}
/* Returns whether we successfully set the caps downstream if needed */ /* Returns whether we successfully set the caps downstream if needed */
static gboolean static gboolean
gst_mpeg4vparse_handle_vos (GstMpeg4VParse * parse, const guint8 * data, gst_mpeg4vparse_handle_vos (GstMpeg4VParse * parse, const guint8 * data,
@ -373,6 +392,10 @@ gst_mpeg4vparse_handle_vos (GstMpeg4VParse * parse, const guint8 * data,
/* Expect Visual Object startcode */ /* Expect Visual Object startcode */
GET_BITS (&bs, 32, &bits); GET_BITS (&bs, 32, &bits);
/* but skip optional user data */
if (!skip_user_data (&bs, &bits))
goto failed;
if (bits != VISUAL_OBJECT_STARTCODE_MARKER) if (bits != VISUAL_OBJECT_STARTCODE_MARKER)
goto failed; goto failed;
@ -404,6 +427,13 @@ gst_mpeg4vparse_handle_vos (GstMpeg4VParse * parse, const guint8 * data,
if (!next_start_code (&bs)) if (!next_start_code (&bs))
goto failed; goto failed;
/* skip optional user data */
GET_BITS (&bs, 32, &bits);
if (!skip_user_data (&bs, &bits))
goto failed;
/* rewind to start code */
bs.offset -= 4;
data = &bs.data[bs.offset]; data = &bs.data[bs.offset];
size -= bs.offset; size -= bs.offset;