summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog24
-rw-r--r--gst/mpegvideoparse/mpegpacketiser.c181
-rw-r--r--gst/mpegvideoparse/mpegpacketiser.h35
-rw-r--r--gst/mpegvideoparse/mpegvideoparse.c238
-rw-r--r--gst/mpegvideoparse/mpegvideoparse.h13
5 files changed, 318 insertions, 173 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b1fea79..1e9467c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2007-03-16 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * gst/mpegvideoparse/mpegpacketiser.c: (mpeg_util_find_start_code),
+ (collect_packets), (set_par_from_dar), (set_fps_from_code),
+ (mpeg_util_parse_extension_packet), (mpeg_util_parse_sequence_hdr),
+ (mpeg_util_parse_picture_hdr):
+ * gst/mpegvideoparse/mpegpacketiser.h:
+ * gst/mpegvideoparse/mpegvideoparse.c:
+ (mpegvideoparse_handle_sequence), (mpegvideoparse_handle_picture),
+ (mpegvideoparse_drain_avail), (gst_mpegvideoparse_chain),
+ (mpv_parse_sink_event), (plugin_init):
+ * gst/mpegvideoparse/mpegvideoparse.h:
+ Move the MPEG specific byte parsing into the mpegpacketiser code.
+
+ Add parsing of picture types, that just feeds into a debug message
+ for now.
+
+ Fix some 64-bit format strings.
+
+2007-03-16 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * gst/mpegaudioparse:
+ Remove empty dir.
+
2007-03-16 Stefan Kost <ensonic@users.sf.net>
* gst/equalizer/gstiirequalizer10bands.c:
diff --git a/gst/mpegvideoparse/mpegpacketiser.c b/gst/mpegvideoparse/mpegpacketiser.c
index 5c054ed8..318805fd 100644
--- a/gst/mpegvideoparse/mpegpacketiser.c
+++ b/gst/mpegvideoparse/mpegpacketiser.c
@@ -87,7 +87,7 @@ mpeg_packetiser_flush (MPEGPacketiser * p)
}
guint8 *
-mpeg_find_start_code (guint32 * sync_word, guint8 * cur, guint8 * end)
+mpeg_util_find_start_code (guint32 * sync_word, guint8 * cur, guint8 * end)
{
guint32 code = *sync_word;
@@ -351,7 +351,7 @@ collect_packets (MPEGPacketiser * p, GstBuffer * buf)
guint8 *cur;
guint8 *end = GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf);
- cur = mpeg_find_start_code (&(p->sync_word), GST_BUFFER_DATA (buf), end);
+ cur = mpeg_util_find_start_code (&(p->sync_word), GST_BUFFER_DATA (buf), end);
while (cur != NULL) {
/* Calculate the offset as tracked since the last flush. Note that cur
* points to the last byte of the sync word, so we adjust by -3 to get the
@@ -359,7 +359,7 @@ collect_packets (MPEGPacketiser * p, GstBuffer * buf)
guint64 offset = p->tracked_offset + (cur - GST_BUFFER_DATA (buf) - 3);
handle_packet (p, offset, *cur);
- cur = mpeg_find_start_code (&(p->sync_word), cur, end);
+ cur = mpeg_util_find_start_code (&(p->sync_word), cur, end);
}
}
@@ -436,3 +436,178 @@ mpeg_packetiser_next_block (MPEGPacketiser * p)
else
p->first_block_idx = next;
}
+
+/* Set the Pixel Aspect Ratio in our hdr from a DAR code in the data */
+static void
+set_par_from_dar (MPEGSeqHdr * hdr, guint8 asr_code)
+{
+ /* Pixel_width = DAR_width * display_vertical_size */
+ /* Pixel_height = DAR_height * display_horizontal_size */
+ switch (asr_code) {
+ case 0x02: /* 3:4 DAR = 4:3 pixels */
+ hdr->par_w = 4 * hdr->height;
+ hdr->par_h = 3 * hdr->width;
+ break;
+ case 0x03: /* 9:16 DAR */
+ hdr->par_w = 16 * hdr->height;
+ hdr->par_h = 9 * hdr->width;
+ break;
+ case 0x04: /* 1:2.21 DAR */
+ hdr->par_w = 221 * hdr->height;
+ hdr->par_h = 100 * hdr->width;
+ break;
+ case 0x01: /* Square pixels */
+ default:
+ hdr->par_w = hdr->par_h = 1;
+ break;
+ }
+}
+
+static void
+set_fps_from_code (MPEGSeqHdr * hdr, guint8 fps_code)
+{
+ const gint framerates[][2] = {
+ {30, 1}, {24000, 1001}, {24, 1}, {25, 1},
+ {30000, 1001}, {30, 1}, {50, 1}, {60000, 1001},
+ {60, 1}, {30, 1}
+ };
+
+ if (fps_code < 10) {
+ hdr->fps_n = framerates[fps_code][0];
+ hdr->fps_d = framerates[fps_code][1];
+ } else {
+ /* Force a valid framerate */
+ hdr->fps_n = 30000;
+ hdr->fps_d = 1001;
+ }
+}
+
+static gboolean
+mpeg_util_parse_extension_packet (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
+{
+ guint8 ext_code;
+
+ if (G_UNLIKELY ((end - data - 1) < 1))
+ return FALSE; /* short extension packet */
+
+ ext_code = data[0] >> 4;
+
+ switch (ext_code) {
+ case MPEG_PACKET_EXT_SEQUENCE:
+ {
+ /* Parse a Sequence Extension */
+ guint8 horiz_size_ext, vert_size_ext;
+ guint8 fps_n_ext, fps_d_ext;
+
+ if ((end - data - 1) < 6)
+ /* need at least 10 bytes, minus 4 for the start code 000001b5 */
+ return FALSE;
+
+ horiz_size_ext = ((data[1] << 1) & 0x02) | ((data[2] >> 7) & 0x01);
+ vert_size_ext = (data[2] >> 5) & 0x03;
+ fps_n_ext = (data[5] >> 5) & 0x03;
+ fps_d_ext = data[5] & 0x1f;
+
+ hdr->fps_n *= (fps_n_ext + 1);
+ hdr->fps_d *= (fps_d_ext + 1);
+ hdr->width += (horiz_size_ext << 12);
+ hdr->height += (vert_size_ext << 12);
+ break;
+ }
+ default:
+ break;
+ }
+
+ return TRUE;
+}
+
+gboolean
+mpeg_util_parse_sequence_hdr (MPEGSeqHdr * hdr, guint8 * data, guint8 * end)
+{
+ guint32 code;
+ guint8 dar_idx, fps_idx;
+ guint32 sync_word = 0xffffffff;
+ gboolean constrained_flag;
+ gboolean load_intra_flag;
+ gboolean load_non_intra_flag;
+
+ if (G_UNLIKELY ((end - data - 1) < 12))
+ return FALSE; /* Too small to be a sequence header */
+
+ code = GST_READ_UINT32_BE (data);
+ if (G_UNLIKELY (code != (0x00000100 | MPEG_PACKET_SEQUENCE)))
+ return FALSE;
+
+ /* Skip the sync word */
+ data += 4;
+
+ /* Parse the MPEG 1 bits */
+ hdr->mpeg_version = 1;
+
+ code = GST_READ_UINT32_BE (data);
+ hdr->width = (code >> 20) & 0xfff;
+ hdr->height = (code >> 8) & 0xfff;
+
+ dar_idx = (code >> 4) & 0xf;
+ set_par_from_dar (hdr, dar_idx);
+ fps_idx = code & 0xf;
+ set_fps_from_code (hdr, fps_idx);
+
+ constrained_flag = (data[7] >> 2) & 0x01;
+ load_intra_flag = (data[7] >> 1) & 0x01;
+ if (load_intra_flag) {
+ if (G_UNLIKELY ((end - data - 1) < 64))
+ return FALSE;
+ data += 64;
+ }
+
+ load_non_intra_flag = data[7] & 0x01;
+ if (load_non_intra_flag) {
+ if (G_UNLIKELY ((end - data - 1) < 64))
+ return FALSE;
+ data += 64;
+ }
+
+ /* Advance past the rest of the MPEG-1 header */
+ data += 8;
+
+ /* Read MPEG-2 sequence extensions */
+ data = mpeg_util_find_start_code (&sync_word, data, end);
+ while (data != NULL) {
+ if (G_UNLIKELY ((end - data - 1) < 1))
+ return FALSE;
+
+ /* data points at the last byte of the start code */
+ if (data[0] == MPEG_PACKET_EXTENSION) {
+ if (!mpeg_util_parse_extension_packet (hdr, data + 1, end))
+ return FALSE;
+
+ hdr->mpeg_version = 2;
+ }
+ data = mpeg_util_find_start_code (&sync_word, data, end);
+ }
+
+ return TRUE;
+}
+
+gboolean
+mpeg_util_parse_picture_hdr (MPEGPictureHdr * hdr, guint8 * data, guint8 * end)
+{
+ guint32 code;
+
+ if (G_UNLIKELY ((end - data - 1) < 6))
+ return FALSE; /* Packet too small */
+
+ code = GST_READ_UINT32_BE (data);
+ if (G_UNLIKELY (code != (0x00000100 | MPEG_PACKET_PICTURE)))
+ return FALSE;
+
+ /* Skip the start code */
+ data += 4;
+
+ hdr->pic_type = (data[1] >> 3) & 0x07;
+ if (hdr->pic_type == 0 || hdr->pic_type > 4)
+ return FALSE; /* Corrupted picture packet */
+
+ return TRUE;
+}
diff --git a/gst/mpegvideoparse/mpegpacketiser.h b/gst/mpegvideoparse/mpegpacketiser.h
index 202c6d9c..426b13aa 100644
--- a/gst/mpegvideoparse/mpegpacketiser.h
+++ b/gst/mpegvideoparse/mpegpacketiser.h
@@ -24,6 +24,8 @@
typedef struct MPEGPacketiser MPEGPacketiser;
typedef struct MPEGBlockInfo MPEGBlockInfo;
+typedef struct MPEGSeqHdr MPEGSeqHdr;
+typedef struct MPEGPictureHdr MPEGPictureHdr;
/* Packet ID codes for different packet types we
* care about */
@@ -48,6 +50,11 @@ typedef struct MPEGBlockInfo MPEGBlockInfo;
#define MPEG_BLOCK_FLAG_PICTURE 0x02
#define MPEG_BLOCK_FLAG_GOP 0x04
+#define MPEG_PICTURE_TYPE_I 0x01
+#define MPEG_PICTURE_TYPE_P 0x02
+#define MPEG_PICTURE_TYPE_B 0x03
+#define MPEG_PICTURE_TYPE_D 0x04
+
struct MPEGBlockInfo {
guint8 first_pack_type;
guint8 flags;
@@ -58,6 +65,24 @@ struct MPEGBlockInfo {
GstClockTime ts;
};
+struct MPEGSeqHdr
+{
+ /* 0 for unknown, else 1 or 2 */
+ guint8 mpeg_version;
+
+ /* Pixel-Aspect Ratio from DAR code via set_par_from_dar */
+ gint par_w, par_h;
+ /* Width and Height of the video */
+ gint width, height;
+ /* Framerate */
+ gint fps_n, fps_d;
+};
+
+struct MPEGPictureHdr
+{
+ guint8 pic_type;
+};
+
struct MPEGPacketiser {
GstAdapter *adapter;
/* position in the adapter */
@@ -97,8 +122,6 @@ struct MPEGPacketiser {
MPEGBlockInfo *blocks;
};
-guint8 *mpeg_find_start_code (guint32 *sync_word, guint8 *cur, guint8 *end);
-
void mpeg_packetiser_init (MPEGPacketiser *p);
void mpeg_packetiser_free (MPEGPacketiser *p);
@@ -113,4 +136,12 @@ MPEGBlockInfo *mpeg_packetiser_get_block (MPEGPacketiser *p, GstBuffer **buf);
/* Advance to the next data block */
void mpeg_packetiser_next_block (MPEGPacketiser *p);
+/* Utility functions for parsing MPEG packets */
+guint8 *mpeg_util_find_start_code (guint32 *sync_word,
+ guint8 *cur, guint8 *end);
+gboolean mpeg_util_parse_sequence_hdr (MPEGSeqHdr *hdr,
+ guint8 *data, guint8 *end);
+gboolean mpeg_util_parse_picture_hdr (MPEGPictureHdr *hdr,
+ guint8 *data, guint8 *end);
+
#endif
diff --git a/gst/mpegvideoparse/mpegvideoparse.c b/gst/mpegvideoparse/mpegvideoparse.c
index 18464507..6c776c54 100644
--- a/gst/mpegvideoparse/mpegvideoparse.c
+++ b/gst/mpegvideoparse/mpegvideoparse.c
@@ -28,17 +28,18 @@
/* FIXME: there are still some things to do in this element.
* + Handle Sequence Display Extension to output the display size
* rather than the encoded size.
- * + Collect a list of regions and the sequence headers that apply
- * to each region so that we properly handle SEQUENCE_END followed
- * by a new sequence.
- * + At least detect when the sequence changes and error out instead.
* + Do all the other stuff (documentation, tests) to get it into
* ugly or good.
* + low priority:
* - handle seeking in raw elementary streams
* - calculate timestamps for all un-timestamped frames, taking into
* account frame re-ordering. Doing this probably requires introducing
- * an extra end-to-end delay, however so might not be really desirable.
+ * an extra end-to-end delay however, so might not be really desirable.
+ * - Collect a list of regions and the sequence headers that apply
+ * to each region so that we properly handle SEQUENCE_END followed
+ * by a new sequence. At the moment, the caps will change if the
+ * sequence changes, but if we then seek to a different spot it might
+ * be wrong. Fortunately almost every stream only has 1 sequence.
*/
GST_DEBUG_CATEGORY_STATIC (mpv_parse_debug);
#define GST_CAT_DEFAULT mpv_parse_debug
@@ -190,150 +191,22 @@ gst_mpegvideoparse_dispose (MpegVideoParse * mpegvideoparse)
gst_buffer_replace (&mpegvideoparse->seq_hdr_buf, NULL);
}
-/* Set the Pixel Aspect Ratio in our hdr from a DAR code in the data */
-static void
-set_par_from_dar (MPEGSeqHdr * hdr, guint8 asr_code)
-{
- /* Pixel_width = DAR_width * display_vertical_size */
- /* Pixel_height = DAR_height * display_horizontal_size */
- switch (asr_code) {
- case 0x02: /* 3:4 DAR = 4:3 pixels */
- hdr->par_w = 4 * hdr->height;
- hdr->par_h = 3 * hdr->width;
- break;
- case 0x03: /* 9:16 DAR */
- hdr->par_w = 16 * hdr->height;
- hdr->par_h = 9 * hdr->width;
- break;
- case 0x04: /* 1:2.21 DAR */
- hdr->par_w = 221 * hdr->height;
- hdr->par_h = 100 * hdr->width;
- break;
- case 0x01: /* Square pixels */
- default:
- hdr->par_w = hdr->par_h = 1;
- break;
- }
-}
-
-static void
-set_fps_from_code (MPEGSeqHdr * hdr, guint8 fps_code)
-{
- const gint framerates[][2] = {
- {30, 1}, {24000, 1001}, {24, 1}, {25, 1},
- {30000, 1001}, {30, 1}, {50, 1}, {60000, 1001},
- {60, 1}, {30, 1}
- };
-
- if (fps_code < 10) {
- hdr->fps_n = framerates[fps_code][0];
- hdr->fps_d = framerates[fps_code][1];
- } else {
- /* Force a valid framerate */
- hdr->fps_n = 30;
- hdr->fps_d = 1;
- }
-}
-
-static void
-mpegvideoparse_parse_seq (MpegVideoParse * mpegvideoparse, GstBuffer * buf)
+static gboolean
+mpegvideoparse_handle_sequence (MpegVideoParse * mpegvideoparse,
+ GstBuffer * buf)
{
MPEGSeqHdr new_hdr;
- guint32 code;
- guint8 dar_idx, fps_idx;
- gint seq_data_length;
- guint32 sync_word = 0xffffffff;
guint8 *cur, *end;
- gboolean constrained_flag;
- gboolean load_intra_flag;
- gboolean load_non_intra_flag;
cur = GST_BUFFER_DATA (buf);
end = GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf);
- if (GST_BUFFER_SIZE (buf) < 12)
- return; /* Too small to be a sequence header */
-
- seq_data_length = 12; /* minimum length. */
-
- /* Skip the sync word */
- cur += 4;
-
- /* Parse the MPEG 1 bits */
- new_hdr.mpeg_version = 1;
-
- code = GST_READ_UINT32_BE (cur);
- new_hdr.width = (code >> 20) & 0xfff;
- new_hdr.height = (code >> 8) & 0xfff;
-
- dar_idx = (code >> 4) & 0xf;
- set_par_from_dar (&new_hdr, dar_idx);
- fps_idx = code & 0xf;
- set_fps_from_code (&new_hdr, fps_idx);
-
- constrained_flag = (cur[7] >> 2) & 0x01;
- load_intra_flag = (cur[7] >> 1) & 0x01;
- if (load_intra_flag) {
- seq_data_length += 64; /* 8 rows of 8 bytes of intra matrix */
- if (GST_BUFFER_SIZE (buf) < seq_data_length)
- return;
- cur += 64;
- }
-
- load_non_intra_flag = cur[7] & 0x01;
- if (load_non_intra_flag) {
- seq_data_length += 64; /* 8 rows of 8 bytes of non-intra matrix */
- if (GST_BUFFER_SIZE (buf) < seq_data_length)
- return;
- cur += 64;
- }
-
- /* Skip the rest of the MPEG-1 header */
- cur += 8;
+ memset (&new_hdr, 0, sizeof (MPEGSeqHdr));
- /* Read MPEG-2 sequence extensions */
- cur = mpeg_find_start_code (&sync_word, cur, end);
- while (cur != NULL) {
- /* Cur points at the last byte of the start code */
- if (cur[0] == MPEG_PACKET_EXTENSION) {
- guint8 ext_code;
-
- if ((end - cur - 1) < 1)
- return; /* short extension packet extension */
-
- ext_code = cur[1] >> 4;
- if (ext_code == MPEG_PACKET_EXT_SEQUENCE) {
- /* Parse a Sequence Extension */
- guint8 horiz_size_ext, vert_size_ext;
- guint8 fps_n_ext, fps_d_ext;
-
- if ((end - cur - 1) < 7)
- /* need at least 10 bytes, minus 3 for the start code 000001 */
- return;
-
- horiz_size_ext = ((cur[2] << 1) & 0x02) | ((cur[3] >> 7) & 0x01);
- vert_size_ext = (cur[3] >> 5) & 0x03;
- fps_n_ext = (cur[6] >> 5) & 0x03;
- fps_d_ext = cur[6] & 0x1f;
-
- new_hdr.fps_n *= (fps_n_ext + 1);
- new_hdr.fps_d *= (fps_d_ext + 1);
- new_hdr.width += (horiz_size_ext << 12);
- new_hdr.height += (vert_size_ext << 12);
- }
-
- new_hdr.mpeg_version = 2;
- }
- cur = mpeg_find_start_code (&sync_word, cur, end);
- }
+ if (G_UNLIKELY (!mpeg_util_parse_sequence_hdr (&new_hdr, cur, end)))
+ return FALSE;
- if (new_hdr.par_w != mpegvideoparse->seq_hdr.par_w ||
- new_hdr.par_h != mpegvideoparse->seq_hdr.par_h ||
- new_hdr.fps_n != mpegvideoparse->seq_hdr.fps_n ||
- new_hdr.fps_d != mpegvideoparse->seq_hdr.fps_d ||
- new_hdr.width != mpegvideoparse->seq_hdr.width ||
- new_hdr.height != mpegvideoparse->seq_hdr.height ||
- new_hdr.mpeg_version != mpegvideoparse->seq_hdr.mpeg_version) {
+ if (memcmp (&mpegvideoparse, &new_hdr, sizeof (MPEGSeqHdr)) != 0) {
GstCaps *caps;
GstBuffer *seq_buf;
@@ -344,7 +217,7 @@ mpegvideoparse_parse_seq (MpegVideoParse * mpegvideoparse, GstBuffer * buf)
gst_buffer_unref (seq_buf);
/* And update the new_hdr into our stored version */
- memcpy (&mpegvideoparse->seq_hdr, &new_hdr, sizeof (MPEGSeqHdr));
+ mpegvideoparse->seq_hdr = new_hdr;
caps = gst_caps_new_simple ("video/mpeg",
"systemstream", G_TYPE_BOOLEAN, FALSE,
@@ -357,8 +230,41 @@ mpegvideoparse_parse_seq (MpegVideoParse * mpegvideoparse, GstBuffer * buf)
"codec_data", GST_TYPE_BUFFER, seq_buf, NULL);
GST_DEBUG ("New mpegvideoparse caps: %" GST_PTR_FORMAT, caps);
- gst_pad_set_caps (mpegvideoparse->srcpad, caps);
+ if (!gst_pad_set_caps (mpegvideoparse->srcpad, caps))
+ return FALSE;
}
+
+ return TRUE;
+}
+
+static gboolean
+mpegvideoparse_handle_picture (MpegVideoParse * mpegvideoparse, GstBuffer * buf)
+{
+ guint8 *cur, *end;
+ guint32 sync_word = 0xffffffff;
+
+ cur = GST_BUFFER_DATA (buf);
+ end = GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf);
+
+ cur = mpeg_util_find_start_code (&sync_word, cur, end);
+ while (cur != NULL) {
+ /* Cur points at the last byte of the start code */
+ if (cur[0] == MPEG_PACKET_PICTURE) {
+ guint8 *pic_data = cur - 3;
+ MPEGPictureHdr hdr;
+
+ /* pic_data points to the first byte of the sync word now */
+ if (!mpeg_util_parse_picture_hdr (&hdr, pic_data, end))
+ return FALSE;
+
+ GST_LOG_OBJECT (mpegvideoparse, "Picture type is %u", hdr.pic_type);
+ /* FIXME: Can use the picture type and number of fields to track a
+ * timestamp */
+ }
+ cur = mpeg_util_find_start_code (&sync_word, cur, end);
+ }
+
+ return TRUE;
}
#if 0
@@ -392,11 +298,11 @@ static GstFlowReturn
mpegvideoparse_drain_avail (MpegVideoParse * mpegvideoparse)
{
MPEGBlockInfo *cur;
- GstBuffer *buf;
+ GstBuffer *buf = NULL;
GstFlowReturn res = GST_FLOW_OK;
cur = mpeg_packetiser_get_block (&mpegvideoparse->packer, &buf);
- while (cur != NULL) {
+ while ((cur != NULL) && (res == GST_FLOW_OK)) {
/* Handle the block */
GST_LOG_OBJECT (mpegvideoparse,
"Have block of size %u with pack_type 0x%02x and flags 0x%02x\n",
@@ -404,7 +310,11 @@ mpegvideoparse_drain_avail (MpegVideoParse * mpegvideoparse)
/* Don't start pushing out buffers until we've seen a sequence header */
if (mpegvideoparse->seq_hdr.mpeg_version == 0) {
- if ((cur->flags & MPEG_BLOCK_FLAG_SEQUENCE) == 0) {
+ if (cur->flags & MPEG_BLOCK_FLAG_SEQUENCE) {
+ /* Found a sequence header */
+ if (!mpegvideoparse_handle_sequence (mpegvideoparse, buf))
+ goto error;
+ } else {
if (buf) {
GST_DEBUG_OBJECT (mpegvideoparse,
"No sequence header yet. Dropping buffer of %u bytes",
@@ -412,9 +322,22 @@ mpegvideoparse_drain_avail (MpegVideoParse * mpegvideoparse)
gst_buffer_unref (buf);
buf = NULL;
}
- } else {
- /* Found a sequence header */
- mpegvideoparse_parse_seq (mpegvideoparse, buf);
+ }
+ }
+
+ if (buf != NULL) {
+ /* If outputting a PICTURE packet, we can calculate the duration
+ and possibly the timestamp */
+ if (cur->flags & MPEG_BLOCK_FLAG_PICTURE) {
+ if (!mpegvideoparse_handle_picture (mpegvideoparse, buf)) {
+ /* Corrupted picture. Drop it. */
+ GST_DEBUG_OBJECT (mpegvideoparse,
+ "Corrupted picture header. Dropping buffer of %u bytes",
+ GST_BUFFER_SIZE (buf));
+ mpegvideoparse->need_discont = TRUE;
+ gst_buffer_unref (buf);
+ buf = NULL;
+ }
}
}
@@ -423,7 +346,9 @@ mpegvideoparse_drain_avail (MpegVideoParse * mpegvideoparse)
"mpegvideoparse: pushing buffer of %u bytes with ts %"
GST_TIME_FORMAT, GST_BUFFER_SIZE (buf),
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
+
gst_buffer_set_caps (buf, GST_PAD_CAPS (mpegvideoparse->srcpad));
+
if (mpegvideoparse->need_discont) {
GST_DEBUG_OBJECT (mpegvideoparse,
"setting discont flag on outgoing buffer");
@@ -431,8 +356,6 @@ mpegvideoparse_drain_avail (MpegVideoParse * mpegvideoparse)
mpegvideoparse->need_discont = FALSE;
}
res = gst_pad_push (mpegvideoparse->srcpad, buf);
- if (res != GST_FLOW_OK)
- break;
}
/* Advance to the next data block */
@@ -441,6 +364,10 @@ mpegvideoparse_drain_avail (MpegVideoParse * mpegvideoparse)
};
return res;
+error:
+ if (buf != NULL)
+ gst_buffer_unref (buf);
+ return GST_FLOW_ERROR;
}
static GstFlowReturn
@@ -459,8 +386,8 @@ gst_mpegvideoparse_chain (GstPad * pad, GstBuffer * buf)
GST_DEBUG_OBJECT (mpegvideoparse,
"mpegvideoparse: received buffer of %u bytes with ts %"
- GST_TIME_FORMAT, GST_BUFFER_SIZE (buf),
- GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)));
+ GST_TIME_FORMAT " and offset %" G_GINT64_FORMAT, GST_BUFFER_SIZE (buf),
+ GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buf)), GST_BUFFER_OFFSET (buf));
/* If we have an offset, and the incoming offset doesn't match,
or we have a discont, handle it first by flushing out data
@@ -477,6 +404,7 @@ gst_mpegvideoparse_chain (GstPad * pad, GstBuffer * buf)
}
}
+ /* Clear out any existing stuff if the new buffer is discontinuous */
if (have_discont) {
GST_DEBUG_OBJECT (mpegvideoparse, "Have discont packet, draining data");
mpegvideoparse->need_discont = TRUE;
@@ -557,9 +485,10 @@ mpv_parse_sink_event (GstPad * pad, GstEvent * event)
gst_event_parse_new_segment_full (event, &update, &rate, &applied_rate,
&format, &start, &stop, &pos);
+
GST_DEBUG_OBJECT (mpegvideoparse,
- "Pushing newseg rate %g, applied rate %g, "
- "format %d, start %lld, stop %lld, pos %lld\n",
+ "Pushing newseg rate %g, applied rate %g, format %d, start %"
+ G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT ", pos %" G_GINT64_FORMAT,
rate, applied_rate, format, start, stop, pos);
res = gst_pad_event_default (pad, event);
@@ -570,7 +499,6 @@ mpv_parse_sink_event (GstPad * pad, GstEvent * event)
res = gst_pad_event_default (pad, event);
break;
case GST_EVENT_EOS:
-
/* Push any remaining buffers out, then flush. */
mpeg_packetiser_handle_eos (&mpegvideoparse->packer);
mpegvideoparse_drain_avail (mpegvideoparse);
diff --git a/gst/mpegvideoparse/mpegvideoparse.h b/gst/mpegvideoparse/mpegvideoparse.h
index 99c6722c..c0212658 100644
--- a/gst/mpegvideoparse/mpegvideoparse.h
+++ b/gst/mpegvideoparse/mpegvideoparse.h
@@ -39,19 +39,6 @@ G_BEGIN_DECLS
typedef struct _MpegVideoParse MpegVideoParse;
typedef struct _MpegVideoParseClass MpegVideoParseClass;
-typedef struct MPEGSeqHdr
-{
- /* 0 for unknown, else 1 or 2 */
- guint8 mpeg_version;
-
- /* Pixel-Aspect Ratio from DAR code via set_par_from_dar */
- gint par_w, par_h;
- /* Width and Height of the video */
- gint width, height;
- /* Framerate */
- gint fps_n, fps_d;
-} MPEGSeqHdr;
-
struct _MpegVideoParse {
GstElement element;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 18:20:11 +0000