mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 17:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegvideoparse: cope with new parser API.

Browse source 
Migrate the code to use the new parser API based on GstMpegVideoPacket.

Also try to optimize gst_mpegv_parse_process_config() by using more of
GstMpegVideoPacket and determining the extension_start_code_identifier
prior to calling the parser function for that extension packet.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
This commit is contained in:
Gwenole Beauchesne 2013-07-04 14:22:14 +02:00
parent 1a5265ef72
commit d10acd3879
1 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
gst/videoparsers/gstmpegvideoparse.c
View file

@ -266,10 +266,10 @@ static gboolean
gst_mpegv_parse_process_config (GstMpegvParse * mpvparse, GstBuffer * buf, gst_mpegv_parse_process_config (GstMpegvParse * mpvparse, GstBuffer * buf,
guint size) guint size)
{ {
guint8 *data; GstMpegVideoPacket packet;
guint8 *data_with_prefix; guint8 *data_with_prefix;
GstMapInfo map; GstMapInfo map;
gint i, offset; gint i;
if (mpvparse->seq_offset < 4) { if (mpvparse->seq_offset < 4) {
/* This shouldn't happen, but just in case... */ /* This shouldn't happen, but just in case... */
@ -278,11 +278,14 @@ gst_mpegv_parse_process_config (GstMpegvParse * mpvparse, GstBuffer * buf,
} }
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
data = map.data + mpvparse->seq_offset;
g_assert (size <= map.size); g_assert (size <= map.size);
packet.data = map.data;
packet.type = GST_MPEG_VIDEO_PACKET_SEQUENCE;
packet.offset = mpvparse->seq_offset;
packet.size = size - mpvparse->seq_offset;
/* pointer to sequence header data including the start code prefix - /* pointer to sequence header data including the start code prefix -
used for codec private data */ used for codec private data */
data_with_prefix = data - 4; data_with_prefix = (guint8 *) packet.data + packet.offset - 4;
/* only do stuff if something new; only compare first 11 bytes, changes in /* only do stuff if something new; only compare first 11 bytes, changes in
quantiser matrix doesn't matter here. Also changing the matrices in quantiser matrix doesn't matter here. Also changing the matrices in
@ -294,8 +297,8 @@ gst_mpegv_parse_process_config (GstMpegvParse * mpvparse, GstBuffer * buf,
return TRUE; return TRUE;
} }
if (!gst_mpeg_video_parse_sequence_header (&mpvparse->sequencehdr, data, if (!gst_mpeg_video_packet_parse_sequence_header (&packet,
size - mpvparse->seq_offset, 0)) { &mpvparse->sequencehdr)) {
GST_DEBUG_OBJECT (mpvparse, GST_DEBUG_OBJECT (mpvparse,
"failed to parse config data (size %d) at offset %d", "failed to parse config data (size %d) at offset %d",
size, mpvparse->seq_offset); size, mpvparse->seq_offset);
@ -310,23 +313,35 @@ gst_mpegv_parse_process_config (GstMpegvParse * mpvparse, GstBuffer * buf,
/* Set mpeg version, and parse sequence extension */ /* Set mpeg version, and parse sequence extension */
mpvparse->config_flags = FLAG_NONE; mpvparse->config_flags = FLAG_NONE;
for (i = 0; i < mpvparse->ext_count; ++i) { for (i = 0; i < mpvparse->ext_count; ++i) {
offset = mpvparse->ext_offsets[i]; packet.type = GST_MPEG_VIDEO_PACKET_EXTENSION;
packet.offset = mpvparse->ext_offsets[i];
packet.size = (gint) size - mpvparse->ext_offsets[i];
mpvparse->config_flags |= FLAG_MPEG2; mpvparse->config_flags |= FLAG_MPEG2;
if (offset < size) { if (packet.size > 1) {
if (gst_mpeg_video_parse_sequence_extension (&mpvparse->sequenceext, switch (packet.data[packet.offset] >> 4) {
map.data, size, offset)) { case GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE:
GST_LOG_OBJECT (mpvparse, "Read Sequence Extension"); if (gst_mpeg_video_packet_parse_sequence_extension (&packet,
mpvparse->config_flags |= FLAG_SEQUENCE_EXT; &mpvparse->sequenceext)) {
mpvparse->seqext_updated = TRUE; GST_LOG_OBJECT (mpvparse, "Read Sequence Extension");
} else if (gst_mpeg_video_parse_sequence_display_extension mpvparse->config_flags |= FLAG_SEQUENCE_EXT;
(&mpvparse->sequencedispext, map.data, size, offset)) { mpvparse->seqext_updated = TRUE;
GST_LOG_OBJECT (mpvparse, "Read Sequence Display Extension"); }
mpvparse->config_flags |= FLAG_SEQUENCE_DISPLAY_EXT; break;
mpvparse->seqdispext_updated = TRUE; case GST_MPEG_VIDEO_PACKET_EXT_SEQUENCE_DISPLAY:
} else if (gst_mpeg_video_parse_quant_matrix_extension if (gst_mpeg_video_packet_parse_sequence_display_extension (&packet,
(&mpvparse->quantmatrext, map.data, size, offset)) { &mpvparse->sequencedispext)) {
GST_LOG_OBJECT (mpvparse, "Read Quantization Matrix Extension"); GST_LOG_OBJECT (mpvparse, "Read Sequence Display Extension");
mpvparse->quantmatrext_updated = TRUE; mpvparse->config_flags |= FLAG_SEQUENCE_DISPLAY_EXT;
mpvparse->seqdispext_updated = TRUE;
}
break;
case GST_MPEG_VIDEO_PACKET_EXT_QUANT_MATRIX:
if (gst_mpeg_video_packet_parse_quant_matrix_extension (&packet,
&mpvparse->quantmatrext)) {
GST_LOG_OBJECT (mpvparse, "Read Quantization Matrix Extension");
mpvparse->quantmatrext_updated = TRUE;
}
break;
} }
} }
} }
@ -428,12 +443,18 @@ static void
parse_packet_extension (GstMpegvParse * mpvparse, GstBuffer * buf, guint off) parse_packet_extension (GstMpegvParse * mpvparse, GstBuffer * buf, guint off)
{ {
GstMapInfo map; GstMapInfo map;
GstMpegVideoPacket packet;
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
packet.data = map.data;
packet.type = GST_MPEG_VIDEO_PACKET_EXTENSION;
packet.offset = off;
packet.size = map.size - off;
/* FIXME : WE ARE ASSUMING IT IS A *PICTURE* EXTENSION */ /* FIXME : WE ARE ASSUMING IT IS A *PICTURE* EXTENSION */
if (gst_mpeg_video_parse_picture_extension (&mpvparse->picext, map.data, if (gst_mpeg_video_packet_parse_picture_extension (&packet,
map.size, off)) { &mpvparse->picext)) {
mpvparse->frame_repeat_count = 1; mpvparse->frame_repeat_count = 1;
if (mpvparse->picext.repeat_first_field) { if (mpvparse->picext.repeat_first_field) {
@ -521,10 +542,14 @@ gst_mpegv_parse_process_sc (GstMpegvParse * mpvparse,
/* extract some picture info if there is any in the frame being terminated */ /* extract some picture info if there is any in the frame being terminated */
if (ret && mpvparse->pic_offset >= 0 && mpvparse->pic_offset < off) { if (ret && mpvparse->pic_offset >= 0 && mpvparse->pic_offset < off) {
GstMapInfo map; GstMapInfo map;
GstMpegVideoPacket packet;
gst_buffer_map (buf, &map, GST_MAP_READ); gst_buffer_map (buf, &map, GST_MAP_READ);
if (gst_mpeg_video_parse_picture_header (&mpvparse->pichdr, packet.data = map.data;
map.data, map.size, mpvparse->pic_offset)) packet.type = GST_MPEG_VIDEO_PACKET_PICTURE;
packet.offset = mpvparse->pic_offset;
packet.size = map.size - mpvparse->pic_offset;
if (gst_mpeg_video_packet_parse_picture_header (&packet, &mpvparse->pichdr))
GST_LOG_OBJECT (mpvparse, "picture_coding_type %d (%s), ending" GST_LOG_OBJECT (mpvparse, "picture_coding_type %d (%s), ending"
"frame of size %d", mpvparse->pichdr.pic_type, "frame of size %d", mpvparse->pichdr.pic_type,
picture_type_name (mpvparse->pichdr.pic_type), off - 4); picture_type_name (mpvparse->pichdr.pic_type), off - 4);