2002-03-20 21:45:04 +00:00
|
|
|
/* GStreamer
|
2001-12-28 01:47:47 +00:00
|
|
|
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Library General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Library General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Library General Public
|
|
|
|
* License along with this library; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
2003-11-07 12:47:02 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
|
|
|
#endif
|
|
|
|
|
2002-03-19 04:10:06 +00:00
|
|
|
/*#define GST_DEBUG_ENABLED */
|
2001-12-28 01:47:47 +00:00
|
|
|
#include "gstmp1videoparse.h"
|
|
|
|
|
|
|
|
/* Start codes. */
|
|
|
|
#define SEQ_START_CODE 0x000001b3
|
|
|
|
#define GOP_START_CODE 0x000001b8
|
|
|
|
#define PICTURE_START_CODE 0x00000100
|
|
|
|
#define SLICE_MIN_START_CODE 0x00000101
|
|
|
|
#define SLICE_MAX_START_CODE 0x000001af
|
|
|
|
#define EXT_START_CODE 0x000001b5
|
|
|
|
#define USER_START_CODE 0x000001b2
|
|
|
|
#define SEQUENCE_ERROR_CODE 0x000001b4
|
|
|
|
#define SEQ_END_CODE 0x000001b7
|
|
|
|
|
|
|
|
/* elementfactory information */
|
2006-04-25 21:56:38 +00:00
|
|
|
static const GstElementDetails mpeg1videoparse_details =
|
2006-04-06 11:35:26 +00:00
|
|
|
GST_ELEMENT_DETAILS ("MPEG-1 video parser",
|
2004-03-14 22:34:33 +00:00
|
|
|
"Codec/Parser/Video",
|
|
|
|
"Parses and frames MPEG 1 video streams, provides seek",
|
|
|
|
"Wim Taymans <wim.taymans@chello.be>");
|
|
|
|
|
|
|
|
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
|
|
|
|
GST_PAD_SRC,
|
|
|
|
GST_PAD_ALWAYS,
|
|
|
|
GST_STATIC_CAPS ("video/mpeg, "
|
2004-03-15 19:32:27 +00:00
|
|
|
"mpegversion = (int) 1, "
|
|
|
|
"systemstream = (boolean) false, "
|
|
|
|
"width = (int) [ 16, 4096 ], "
|
|
|
|
"height = (int) [ 16, 4096 ], "
|
|
|
|
"pixel_width = (int) [ 1, 255 ], "
|
|
|
|
"pixel_height = (int) [ 1, 255 ], " "framerate = (double) [ 0, MAX ]")
|
2004-03-14 22:34:33 +00:00
|
|
|
);
|
|
|
|
|
|
|
|
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
|
|
|
|
GST_PAD_SINK,
|
|
|
|
GST_PAD_ALWAYS,
|
|
|
|
GST_STATIC_CAPS ("video/mpeg, "
|
2004-03-15 19:32:27 +00:00
|
|
|
"mpegversion = (int) 1, " "systemstream = (boolean) false")
|
2004-03-14 22:34:33 +00:00
|
|
|
);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
|
|
|
/* Mp1VideoParse signals and args */
|
2004-03-14 22:34:33 +00:00
|
|
|
enum
|
|
|
|
{
|
2001-12-28 01:47:47 +00:00
|
|
|
/* FILL ME */
|
|
|
|
LAST_SIGNAL
|
|
|
|
};
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
enum
|
|
|
|
{
|
2004-05-21 22:39:30 +00:00
|
|
|
ARG_0
|
|
|
|
/* FILL ME */
|
2001-12-28 01:47:47 +00:00
|
|
|
};
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
static void gst_mp1videoparse_class_init (Mp1VideoParseClass * klass);
|
|
|
|
static void gst_mp1videoparse_base_init (Mp1VideoParseClass * klass);
|
|
|
|
static void gst_mp1videoparse_init (Mp1VideoParse * mp1videoparse);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
static void gst_mp1videoparse_chain (GstPad * pad, GstData * _data);
|
|
|
|
static void gst_mp1videoparse_real_chain (Mp1VideoParse * mp1videoparse,
|
|
|
|
GstBuffer * buf, GstPad * outpad);
|
|
|
|
static void gst_mp1videoparse_flush (Mp1VideoParse * mp1videoparse);
|
2005-09-05 17:20:29 +00:00
|
|
|
static GstStateChangeReturn
|
|
|
|
gst_mp1videoparse_change_state (GstElement * element,
|
|
|
|
GstStateChange transition);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
|
|
|
static GstElementClass *parent_class = NULL;
|
2004-03-14 22:34:33 +00:00
|
|
|
|
2002-03-19 04:10:06 +00:00
|
|
|
/*static guint gst_mp1videoparse_signals[LAST_SIGNAL] = { 0 }; */
|
2001-12-28 01:47:47 +00:00
|
|
|
|
|
|
|
GType
|
|
|
|
mp1videoparse_get_type (void)
|
|
|
|
{
|
|
|
|
static GType mp1videoparse_type = 0;
|
|
|
|
|
|
|
|
if (!mp1videoparse_type) {
|
|
|
|
static const GTypeInfo mp1videoparse_info = {
|
2004-03-14 22:34:33 +00:00
|
|
|
sizeof (Mp1VideoParseClass),
|
|
|
|
(GBaseInitFunc) gst_mp1videoparse_base_init,
|
2001-12-28 01:47:47 +00:00
|
|
|
NULL,
|
2004-03-14 22:34:33 +00:00
|
|
|
(GClassInitFunc) gst_mp1videoparse_class_init,
|
2001-12-28 01:47:47 +00:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2004-03-14 22:34:33 +00:00
|
|
|
sizeof (Mp1VideoParse),
|
2001-12-28 01:47:47 +00:00
|
|
|
0,
|
2004-03-14 22:34:33 +00:00
|
|
|
(GInstanceInitFunc) gst_mp1videoparse_init,
|
2001-12-28 01:47:47 +00:00
|
|
|
};
|
2004-03-15 19:32:27 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse_type =
|
2004-03-15 19:32:27 +00:00
|
|
|
g_type_register_static (GST_TYPE_ELEMENT, "Mp1VideoParse",
|
|
|
|
&mp1videoparse_info, 0);
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
return mp1videoparse_type;
|
|
|
|
}
|
|
|
|
|
2003-11-02 20:58:22 +00:00
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_base_init (Mp1VideoParseClass * klass)
|
2003-11-02 20:58:22 +00:00
|
|
|
{
|
|
|
|
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
|
|
|
|
|
|
|
|
gst_element_class_add_pad_template (element_class,
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_static_pad_template_get (&src_factory));
|
2003-11-02 20:58:22 +00:00
|
|
|
gst_element_class_add_pad_template (element_class,
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_static_pad_template_get (&sink_factory));
|
2003-11-02 20:58:22 +00:00
|
|
|
gst_element_class_set_details (element_class, &mpeg1videoparse_details);
|
|
|
|
}
|
|
|
|
|
2001-12-28 01:47:47 +00:00
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_class_init (Mp1VideoParseClass * klass)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
|
|
|
GstElementClass *gstelement_class;
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
gstelement_class = (GstElementClass *) klass;
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2006-04-08 21:48:01 +00:00
|
|
|
parent_class = g_type_class_peek_parent (klass);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2003-07-06 20:49:52 +00:00
|
|
|
gstelement_class->change_state = gst_mp1videoparse_change_state;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_init (Mp1VideoParse * mp1videoparse)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse->sinkpad =
|
|
|
|
gst_pad_new_from_template (gst_static_pad_template_get (&sink_factory),
|
|
|
|
"sink");
|
|
|
|
gst_element_add_pad (GST_ELEMENT (mp1videoparse), mp1videoparse->sinkpad);
|
|
|
|
gst_pad_set_chain_function (mp1videoparse->sinkpad, gst_mp1videoparse_chain);
|
|
|
|
|
|
|
|
mp1videoparse->srcpad =
|
|
|
|
gst_pad_new_from_template (gst_static_pad_template_get (&src_factory),
|
|
|
|
"src");
|
|
|
|
gst_element_add_pad (GST_ELEMENT (mp1videoparse), mp1videoparse->srcpad);
|
2004-01-02 07:09:23 +00:00
|
|
|
gst_pad_use_explicit_caps (mp1videoparse->srcpad);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
|
|
|
mp1videoparse->partialbuf = NULL;
|
|
|
|
mp1videoparse->need_resync = FALSE;
|
2004-04-10 22:40:51 +00:00
|
|
|
mp1videoparse->need_discont = TRUE;
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
mp1videoparse->last_pts = GST_CLOCK_TIME_NONE;
|
2001-12-28 01:47:47 +00:00
|
|
|
mp1videoparse->picture_in_buffer = 0;
|
2003-07-06 20:49:52 +00:00
|
|
|
mp1videoparse->width = mp1videoparse->height = -1;
|
|
|
|
mp1videoparse->fps = mp1videoparse->asr = 0.;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse_parse_seq (Mp1VideoParse * mp1videoparse, GstBuffer * buf)
|
2003-07-06 20:49:52 +00:00
|
|
|
{
|
|
|
|
gint width, height, asr_idx, fps_idx;
|
|
|
|
gfloat asr_table[] = { 0., 1.,
|
2004-03-14 22:34:33 +00:00
|
|
|
0.6735, 0.7031, 0.7615, 0.8055, 0.8437,
|
|
|
|
0.8935, 0.9157, 0.9815, 1.0255, 1.0695,
|
|
|
|
1.0950, 1.1575, 1.2015
|
|
|
|
};
|
|
|
|
gfloat fps_table[] = { 0., 24. / 1.001, 24., 25.,
|
|
|
|
30. / 1.001, 30.,
|
|
|
|
50., 60. / 1.001, 60.
|
|
|
|
};
|
configure.ac: bump required gstreamer version to 0.8.1.1 because of following changes [--ds]
Original commit message from CVS:
reviewed by David Schleef
* configure.ac: bump required gstreamer version to 0.8.1.1
because of following changes [--ds]
* gst-libs/gst/riff/riff-read.c: Include gst/gstutils.h.
(gst_riff_peek_head, gst_riff_peek_list, gst_riff_read_list)
(gst_riff_read_header): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/typefind/gsttypefindfunctions.c: Include gst/gstutils.h.
(mp3_type_find): Use GST_READ_UINT*
macros to access possibly unaligned memory.
(mp3_type_find, mpeg1_parse_header, qt_type_find)
(speex_type_find): Likewise
* gst/tags/gstvorbistag.c: (ADVANCE): Likewise
* gst/qtdemux/qtdemux.c: Include stdlib.h (needed by realloc).
(QTDEMUX_GUINT32_GET, QTDEMUX_GUINT16_GET, QTDEMUX_FP32_GET)
(QTDEMUX_FP16_GET, QTDEMUX_FOURCC_GET)
(gst_qtdemux_loop_header, gst_qtdemux_loop_header)
(qtdemux_node_dump_foreach, qtdemux_tree_get_child_by_type)
(qtdemux_tree_get_sibling_by_type): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/mpegstream/gstmpegpacketize.c: (parse_generic, parse_chunk):
Likewise.
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead)
(gst_mpeg_demux_parse_packet, gst_mpeg_demux_parse_pes): Likewise.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
Likewise.
* gst/mpeg2sub/gstmpeg2subt.c: (GST_BUFFER_DATA)
(gst_mpeg2subt_chain_subtitle): Likewise.
* gst/mpeg1videoparse/gstmp1videoparse.c: (mp1videoparse_parse_seq)
(gst_mp1videoparse_time_code, gst_mp1videoparse_real_chain):
Likewise.
* gst/mpeg1sys/buffer.c: (mpeg1mux_buffer_update_audio_info):
Likewise.
* gst/cdxaparse/gstcdxaparse.c: (gst_bytestream_peek_bytes):
Likewise.
* gst/asfdemux/gstasfdemux.c: (_read_var_length, _read_uint):
Likewise.
2004-04-20 21:04:22 +00:00
|
|
|
guint32 n = GST_READ_UINT32_BE (GST_BUFFER_DATA (buf));
|
2003-07-06 20:49:52 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
width = (n & 0xfff00000) >> 20;
|
|
|
|
height = (n & 0x000fff00) >> 8;
|
|
|
|
asr_idx = (n & 0x000000f0) >> 4;
|
|
|
|
fps_idx = (n & 0x0000000f) >> 0;
|
2003-07-06 20:49:52 +00:00
|
|
|
|
|
|
|
if (fps_idx >= 9 || fps_idx <= 0)
|
2004-03-15 19:32:27 +00:00
|
|
|
fps_idx = 3; /* well, we need a default */
|
2003-07-06 20:49:52 +00:00
|
|
|
if (asr_idx >= 15 || asr_idx <= 0)
|
2004-03-15 19:32:27 +00:00
|
|
|
asr_idx = 1; /* no aspect ratio */
|
2003-07-06 20:49:52 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
if (asr_table[asr_idx] != mp1videoparse->asr ||
|
|
|
|
fps_table[fps_idx] != mp1videoparse->fps ||
|
|
|
|
width != mp1videoparse->width || height != mp1videoparse->height) {
|
2003-07-06 20:49:52 +00:00
|
|
|
GstCaps *caps;
|
2003-08-05 06:15:19 +00:00
|
|
|
gint p_w, p_h;
|
2003-07-06 20:49:52 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse->asr = asr_table[asr_idx];
|
|
|
|
mp1videoparse->fps = fps_table[fps_idx];
|
|
|
|
mp1videoparse->width = width;
|
2003-07-06 20:49:52 +00:00
|
|
|
mp1videoparse->height = height;
|
|
|
|
|
2003-08-05 06:15:19 +00:00
|
|
|
p_w = (asr_table[asr_idx] < 1.0) ? (100 / asr_table[asr_idx]) : 1;
|
|
|
|
p_h = (asr_table[asr_idx] > 1.0) ? (100 * asr_table[asr_idx]) : 1;
|
|
|
|
|
2003-12-22 01:47:09 +00:00
|
|
|
caps = gst_caps_new_simple ("video/mpeg",
|
2004-03-15 19:32:27 +00:00
|
|
|
"systemstream", G_TYPE_BOOLEAN, FALSE,
|
|
|
|
"mpegversion", G_TYPE_INT, 1,
|
|
|
|
"width", G_TYPE_INT, width,
|
|
|
|
"height", G_TYPE_INT, height,
|
|
|
|
"framerate", G_TYPE_DOUBLE, fps_table[fps_idx],
|
|
|
|
"pixel_width", G_TYPE_INT, p_w, "pixel_height", G_TYPE_INT, p_h, NULL);
|
2003-12-22 01:47:09 +00:00
|
|
|
|
2004-02-04 19:45:31 +00:00
|
|
|
GST_DEBUG ("New mpeg1videoparse caps: " GST_PTR_FORMAT, caps);
|
2003-07-06 20:49:52 +00:00
|
|
|
|
2004-01-02 07:09:23 +00:00
|
|
|
gst_pad_set_explicit_caps (mp1videoparse->srcpad, caps);
|
2003-07-06 20:49:52 +00:00
|
|
|
}
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse_valid_sync (Mp1VideoParse * mp1videoparse, guint32 head,
|
|
|
|
GstBuffer * buf)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
2003-07-06 20:49:52 +00:00
|
|
|
switch (head) {
|
2004-03-14 22:34:33 +00:00
|
|
|
case SEQ_START_CODE:{
|
2003-08-05 06:15:19 +00:00
|
|
|
GstBuffer *subbuf = gst_buffer_create_sub (buf, 4,
|
2004-03-15 19:32:27 +00:00
|
|
|
GST_BUFFER_SIZE (buf) - 4);
|
2004-03-14 22:34:33 +00:00
|
|
|
|
|
|
|
mp1videoparse_parse_seq (mp1videoparse, subbuf);
|
2003-08-05 06:15:19 +00:00
|
|
|
gst_buffer_unref (subbuf);
|
2003-07-06 20:49:52 +00:00
|
|
|
return TRUE;
|
2003-08-05 06:15:19 +00:00
|
|
|
}
|
2003-07-06 20:49:52 +00:00
|
|
|
case GOP_START_CODE:
|
|
|
|
case PICTURE_START_CODE:
|
|
|
|
case USER_START_CODE:
|
|
|
|
case EXT_START_CODE:
|
|
|
|
return TRUE;
|
|
|
|
default:
|
2004-03-14 22:34:33 +00:00
|
|
|
if (head >= SLICE_MIN_START_CODE && head <= SLICE_MAX_START_CODE)
|
2004-03-15 19:32:27 +00:00
|
|
|
return TRUE;
|
2003-07-06 20:49:52 +00:00
|
|
|
}
|
2001-12-28 01:47:47 +00:00
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static gint
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse_find_next_gop (Mp1VideoParse * mp1videoparse, GstBuffer * buf)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
2004-03-14 22:34:33 +00:00
|
|
|
guchar *data = GST_BUFFER_DATA (buf);
|
|
|
|
gulong size = GST_BUFFER_SIZE (buf);
|
2001-12-28 01:47:47 +00:00
|
|
|
gulong offset = 0;
|
|
|
|
gint sync_zeros = 0;
|
|
|
|
gboolean have_sync = FALSE;
|
|
|
|
|
|
|
|
while (offset < size) {
|
2004-03-14 22:34:33 +00:00
|
|
|
guchar byte = *(data + offset);
|
|
|
|
|
2001-12-28 01:47:47 +00:00
|
|
|
offset++;
|
|
|
|
if (byte == 0) {
|
|
|
|
sync_zeros++;
|
2004-03-14 22:34:33 +00:00
|
|
|
} else if (byte == 1 && sync_zeros >= 2) {
|
2001-12-28 01:47:47 +00:00
|
|
|
sync_zeros = 0;
|
|
|
|
have_sync = TRUE;
|
2004-03-14 22:34:33 +00:00
|
|
|
} else if (have_sync) {
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
if (byte == (SEQ_START_CODE & 0xff) || byte == (GOP_START_CODE & 0xff)) {
|
2004-03-15 19:32:27 +00:00
|
|
|
return offset - 4;
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
} else {
|
2004-03-15 19:32:27 +00:00
|
|
|
sync_zeros = 0;
|
|
|
|
have_sync = FALSE;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
2004-03-14 22:34:33 +00:00
|
|
|
} else {
|
2001-12-28 01:47:47 +00:00
|
|
|
sync_zeros = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
|
|
|
|
static guint64
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_time_code (guchar * gop, gfloat fps)
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
{
|
configure.ac: bump required gstreamer version to 0.8.1.1 because of following changes [--ds]
Original commit message from CVS:
reviewed by David Schleef
* configure.ac: bump required gstreamer version to 0.8.1.1
because of following changes [--ds]
* gst-libs/gst/riff/riff-read.c: Include gst/gstutils.h.
(gst_riff_peek_head, gst_riff_peek_list, gst_riff_read_list)
(gst_riff_read_header): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/typefind/gsttypefindfunctions.c: Include gst/gstutils.h.
(mp3_type_find): Use GST_READ_UINT*
macros to access possibly unaligned memory.
(mp3_type_find, mpeg1_parse_header, qt_type_find)
(speex_type_find): Likewise
* gst/tags/gstvorbistag.c: (ADVANCE): Likewise
* gst/qtdemux/qtdemux.c: Include stdlib.h (needed by realloc).
(QTDEMUX_GUINT32_GET, QTDEMUX_GUINT16_GET, QTDEMUX_FP32_GET)
(QTDEMUX_FP16_GET, QTDEMUX_FOURCC_GET)
(gst_qtdemux_loop_header, gst_qtdemux_loop_header)
(qtdemux_node_dump_foreach, qtdemux_tree_get_child_by_type)
(qtdemux_tree_get_sibling_by_type): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/mpegstream/gstmpegpacketize.c: (parse_generic, parse_chunk):
Likewise.
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead)
(gst_mpeg_demux_parse_packet, gst_mpeg_demux_parse_pes): Likewise.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
Likewise.
* gst/mpeg2sub/gstmpeg2subt.c: (GST_BUFFER_DATA)
(gst_mpeg2subt_chain_subtitle): Likewise.
* gst/mpeg1videoparse/gstmp1videoparse.c: (mp1videoparse_parse_seq)
(gst_mp1videoparse_time_code, gst_mp1videoparse_real_chain):
Likewise.
* gst/mpeg1sys/buffer.c: (mpeg1mux_buffer_update_audio_info):
Likewise.
* gst/cdxaparse/gstcdxaparse.c: (gst_bytestream_peek_bytes):
Likewise.
* gst/asfdemux/gstasfdemux.c: (_read_var_length, _read_uint):
Likewise.
2004-04-20 21:04:22 +00:00
|
|
|
guint32 data = GST_READ_UINT32_BE (gop);
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
|
2004-03-15 19:32:27 +00:00
|
|
|
return ((((data & 0xfc000000) >> 26) * 3600 * GST_SECOND) + /* hours */
|
|
|
|
(((data & 0x03f00000) >> 20) * 60 * GST_SECOND) + /* minutes */
|
|
|
|
(((data & 0x0007e000) >> 13) * GST_SECOND) + /* seconds */
|
|
|
|
(((data & 0x00001f80) >> 7) * GST_SECOND / fps)); /* frames */
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
}
|
|
|
|
|
2001-12-28 01:47:47 +00:00
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_flush (Mp1VideoParse * mp1videoparse)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
2003-06-29 19:46:13 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: flushing");
|
2001-12-28 01:47:47 +00:00
|
|
|
if (mp1videoparse->partialbuf) {
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_buffer_unref (mp1videoparse->partialbuf);
|
|
|
|
mp1videoparse->partialbuf = NULL;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
mp1videoparse->need_resync = TRUE;
|
|
|
|
mp1videoparse->in_flush = TRUE;
|
|
|
|
mp1videoparse->picture_in_buffer = 0;
|
|
|
|
}
|
2003-07-06 20:49:52 +00:00
|
|
|
|
2001-12-28 01:47:47 +00:00
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_chain (GstPad * pad, GstData * _data)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
2003-10-08 16:08:19 +00:00
|
|
|
GstBuffer *buf = GST_BUFFER (_data);
|
2001-12-28 01:47:47 +00:00
|
|
|
Mp1VideoParse *mp1videoparse;
|
|
|
|
|
|
|
|
g_return_if_fail (pad != NULL);
|
|
|
|
g_return_if_fail (GST_IS_PAD (pad));
|
|
|
|
g_return_if_fail (buf != NULL);
|
|
|
|
|
|
|
|
mp1videoparse = GST_MP1VIDEOPARSE (GST_OBJECT_PARENT (pad));
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_real_chain (mp1videoparse, buf, mp1videoparse->srcpad);
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_real_chain (Mp1VideoParse * mp1videoparse, GstBuffer * buf,
|
|
|
|
GstPad * outpad)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
|
|
|
guchar *data;
|
|
|
|
gulong size, offset = 0;
|
|
|
|
GstBuffer *outbuf;
|
|
|
|
gint sync_state;
|
|
|
|
gboolean have_sync;
|
|
|
|
guchar sync_byte;
|
2003-04-07 18:43:25 +00:00
|
|
|
guint32 head;
|
2001-12-28 01:47:47 +00:00
|
|
|
gint sync_pos;
|
|
|
|
guint64 time_stamp;
|
|
|
|
GstBuffer *temp;
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
time_stamp = GST_BUFFER_TIMESTAMP (buf);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2003-07-06 20:49:52 +00:00
|
|
|
if (GST_IS_EVENT (buf)) {
|
|
|
|
GstEvent *event = GST_EVENT (buf);
|
|
|
|
|
|
|
|
switch (GST_EVENT_TYPE (event)) {
|
|
|
|
case GST_EVENT_DISCONTINUOUS:
|
2004-04-10 22:40:51 +00:00
|
|
|
mp1videoparse->need_discont = TRUE;
|
|
|
|
/* fall-through */
|
|
|
|
case GST_EVENT_FLUSH:
|
2004-03-15 19:32:27 +00:00
|
|
|
gst_mp1videoparse_flush (mp1videoparse);
|
|
|
|
break;
|
2003-07-06 20:49:52 +00:00
|
|
|
case GST_EVENT_EOS:
|
2004-03-15 19:32:27 +00:00
|
|
|
gst_mp1videoparse_flush (mp1videoparse);
|
|
|
|
gst_event_ref (event);
|
|
|
|
gst_pad_push (outpad, GST_DATA (event));
|
|
|
|
gst_element_set_eos (GST_ELEMENT (mp1videoparse));
|
|
|
|
break;
|
2003-07-06 20:49:52 +00:00
|
|
|
default:
|
2004-03-15 19:32:27 +00:00
|
|
|
GST_DEBUG ("Unhandled event type %d", GST_EVENT_TYPE (event));
|
|
|
|
break;
|
2003-07-06 20:49:52 +00:00
|
|
|
}
|
2004-03-14 22:34:33 +00:00
|
|
|
|
2003-07-06 20:49:52 +00:00
|
|
|
gst_event_unref (event);
|
|
|
|
return;
|
|
|
|
}
|
2004-03-14 22:34:33 +00:00
|
|
|
|
2001-12-28 01:47:47 +00:00
|
|
|
|
|
|
|
if (mp1videoparse->partialbuf) {
|
2002-07-08 19:42:06 +00:00
|
|
|
GstBuffer *merge;
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
offset = GST_BUFFER_SIZE (mp1videoparse->partialbuf);
|
|
|
|
merge = gst_buffer_merge (mp1videoparse->partialbuf, buf);
|
2002-07-08 19:42:06 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_buffer_unref (mp1videoparse->partialbuf);
|
|
|
|
gst_buffer_unref (buf);
|
2002-07-08 19:42:06 +00:00
|
|
|
|
|
|
|
mp1videoparse->partialbuf = merge;
|
2004-03-14 22:34:33 +00:00
|
|
|
} else {
|
2001-12-28 01:47:47 +00:00
|
|
|
mp1videoparse->partialbuf = buf;
|
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
data = GST_BUFFER_DATA (mp1videoparse->partialbuf);
|
|
|
|
size = GST_BUFFER_SIZE (mp1videoparse->partialbuf);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: received buffer of %ld bytes %" G_GINT64_FORMAT,
|
|
|
|
size, GST_BUFFER_TIMESTAMP (buf));
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-01-29 16:00:55 +00:00
|
|
|
do {
|
2004-03-14 22:34:33 +00:00
|
|
|
data = GST_BUFFER_DATA (mp1videoparse->partialbuf);
|
|
|
|
size = GST_BUFFER_SIZE (mp1videoparse->partialbuf);
|
2004-01-29 16:00:55 +00:00
|
|
|
|
configure.ac: bump required gstreamer version to 0.8.1.1 because of following changes [--ds]
Original commit message from CVS:
reviewed by David Schleef
* configure.ac: bump required gstreamer version to 0.8.1.1
because of following changes [--ds]
* gst-libs/gst/riff/riff-read.c: Include gst/gstutils.h.
(gst_riff_peek_head, gst_riff_peek_list, gst_riff_read_list)
(gst_riff_read_header): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/typefind/gsttypefindfunctions.c: Include gst/gstutils.h.
(mp3_type_find): Use GST_READ_UINT*
macros to access possibly unaligned memory.
(mp3_type_find, mpeg1_parse_header, qt_type_find)
(speex_type_find): Likewise
* gst/tags/gstvorbistag.c: (ADVANCE): Likewise
* gst/qtdemux/qtdemux.c: Include stdlib.h (needed by realloc).
(QTDEMUX_GUINT32_GET, QTDEMUX_GUINT16_GET, QTDEMUX_FP32_GET)
(QTDEMUX_FP16_GET, QTDEMUX_FOURCC_GET)
(gst_qtdemux_loop_header, gst_qtdemux_loop_header)
(qtdemux_node_dump_foreach, qtdemux_tree_get_child_by_type)
(qtdemux_tree_get_sibling_by_type): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/mpegstream/gstmpegpacketize.c: (parse_generic, parse_chunk):
Likewise.
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead)
(gst_mpeg_demux_parse_packet, gst_mpeg_demux_parse_pes): Likewise.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
Likewise.
* gst/mpeg2sub/gstmpeg2subt.c: (GST_BUFFER_DATA)
(gst_mpeg2subt_chain_subtitle): Likewise.
* gst/mpeg1videoparse/gstmp1videoparse.c: (mp1videoparse_parse_seq)
(gst_mp1videoparse_time_code, gst_mp1videoparse_real_chain):
Likewise.
* gst/mpeg1sys/buffer.c: (mpeg1mux_buffer_update_audio_info):
Likewise.
* gst/cdxaparse/gstcdxaparse.c: (gst_bytestream_peek_bytes):
Likewise.
* gst/asfdemux/gstasfdemux.c: (_read_var_length, _read_uint):
Likewise.
2004-04-20 21:04:22 +00:00
|
|
|
head = GST_READ_UINT32_BE (data);
|
2004-01-29 16:00:55 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: head is %08x", (unsigned int) head);
|
2004-01-29 16:00:55 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
if (!mp1videoparse_valid_sync (mp1videoparse, head,
|
2004-03-15 19:32:27 +00:00
|
|
|
mp1videoparse->partialbuf) || mp1videoparse->need_resync) {
|
2004-03-14 22:34:33 +00:00
|
|
|
sync_pos =
|
2004-03-15 19:32:27 +00:00
|
|
|
mp1videoparse_find_next_gop (mp1videoparse,
|
|
|
|
mp1videoparse->partialbuf);
|
2004-01-29 16:00:55 +00:00
|
|
|
if (sync_pos >= 0) {
|
2004-03-15 19:32:27 +00:00
|
|
|
mp1videoparse->need_resync = FALSE;
|
|
|
|
GST_DEBUG ("mp1videoparse: found new gop at %d", sync_pos);
|
|
|
|
|
|
|
|
if (sync_pos != 0) {
|
|
|
|
temp =
|
|
|
|
gst_buffer_create_sub (mp1videoparse->partialbuf, sync_pos,
|
|
|
|
size - sync_pos);
|
|
|
|
g_assert (temp != NULL);
|
|
|
|
gst_buffer_unref (mp1videoparse->partialbuf);
|
|
|
|
mp1videoparse->partialbuf = temp;
|
|
|
|
data = GST_BUFFER_DATA (mp1videoparse->partialbuf);
|
|
|
|
size = GST_BUFFER_SIZE (mp1videoparse->partialbuf);
|
|
|
|
offset = 0;
|
|
|
|
}
|
|
|
|
|
configure.ac: bump required gstreamer version to 0.8.1.1 because of following changes [--ds]
Original commit message from CVS:
reviewed by David Schleef
* configure.ac: bump required gstreamer version to 0.8.1.1
because of following changes [--ds]
* gst-libs/gst/riff/riff-read.c: Include gst/gstutils.h.
(gst_riff_peek_head, gst_riff_peek_list, gst_riff_read_list)
(gst_riff_read_header): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/typefind/gsttypefindfunctions.c: Include gst/gstutils.h.
(mp3_type_find): Use GST_READ_UINT*
macros to access possibly unaligned memory.
(mp3_type_find, mpeg1_parse_header, qt_type_find)
(speex_type_find): Likewise
* gst/tags/gstvorbistag.c: (ADVANCE): Likewise
* gst/qtdemux/qtdemux.c: Include stdlib.h (needed by realloc).
(QTDEMUX_GUINT32_GET, QTDEMUX_GUINT16_GET, QTDEMUX_FP32_GET)
(QTDEMUX_FP16_GET, QTDEMUX_FOURCC_GET)
(gst_qtdemux_loop_header, gst_qtdemux_loop_header)
(qtdemux_node_dump_foreach, qtdemux_tree_get_child_by_type)
(qtdemux_tree_get_sibling_by_type): Use GST_READ_UINT*
macros to access possibly unaligned memory.
* gst/mpegstream/gstmpegpacketize.c: (parse_generic, parse_chunk):
Likewise.
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_parse_syshead)
(gst_mpeg_demux_parse_packet, gst_mpeg_demux_parse_pes): Likewise.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain):
Likewise.
* gst/mpeg2sub/gstmpeg2subt.c: (GST_BUFFER_DATA)
(gst_mpeg2subt_chain_subtitle): Likewise.
* gst/mpeg1videoparse/gstmp1videoparse.c: (mp1videoparse_parse_seq)
(gst_mp1videoparse_time_code, gst_mp1videoparse_real_chain):
Likewise.
* gst/mpeg1sys/buffer.c: (mpeg1mux_buffer_update_audio_info):
Likewise.
* gst/cdxaparse/gstcdxaparse.c: (gst_bytestream_peek_bytes):
Likewise.
* gst/asfdemux/gstasfdemux.c: (_read_var_length, _read_uint):
Likewise.
2004-04-20 21:04:22 +00:00
|
|
|
head = GST_READ_UINT32_BE (data);
|
2004-03-15 19:32:27 +00:00
|
|
|
/* re-call this function so that if we hadn't already, we can
|
|
|
|
* now read the sequence header and parse video properties,
|
|
|
|
* set caps, stream data, be happy, bla, bla, bla... */
|
|
|
|
if (!mp1videoparse_valid_sync (mp1videoparse, head,
|
|
|
|
mp1videoparse->partialbuf))
|
|
|
|
g_error ("Found sync but no valid sync point at pos 0x0");
|
2004-03-14 22:34:33 +00:00
|
|
|
} else {
|
2004-03-15 19:32:27 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: could not sync");
|
|
|
|
gst_buffer_unref (mp1videoparse->partialbuf);
|
|
|
|
mp1videoparse->partialbuf = NULL;
|
|
|
|
return;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-01-29 16:00:55 +00:00
|
|
|
if (mp1videoparse->picture_in_buffer == 1 &&
|
2004-03-15 19:32:27 +00:00
|
|
|
time_stamp != GST_CLOCK_TIME_NONE) {
|
2004-01-29 16:00:55 +00:00
|
|
|
mp1videoparse->last_pts = time_stamp;
|
|
|
|
}
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-01-29 16:00:55 +00:00
|
|
|
sync_state = 0;
|
|
|
|
have_sync = FALSE;
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-01-29 16:00:55 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: searching sync");
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
while (offset < size - 1) {
|
2004-01-29 16:00:55 +00:00
|
|
|
sync_byte = *(data + offset);
|
|
|
|
if (sync_byte == 0) {
|
2004-03-15 19:32:27 +00:00
|
|
|
sync_state++;
|
2004-03-14 22:34:33 +00:00
|
|
|
} else if ((sync_byte == 1) && (sync_state >= 2)) {
|
2004-03-15 19:32:27 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: code 0x000001%02x", data[offset + 1]);
|
|
|
|
if (data[offset + 1] == (PICTURE_START_CODE & 0xff)) {
|
|
|
|
mp1videoparse->picture_in_buffer++;
|
|
|
|
if (mp1videoparse->picture_in_buffer == 1) {
|
|
|
|
if (time_stamp != GST_CLOCK_TIME_NONE) {
|
|
|
|
mp1videoparse->last_pts = time_stamp;
|
|
|
|
}
|
|
|
|
sync_state = 0;
|
|
|
|
} else if (mp1videoparse->picture_in_buffer == 2) {
|
|
|
|
have_sync = TRUE;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
GST_DEBUG ("mp1videoparse: %d in buffer",
|
|
|
|
mp1videoparse->picture_in_buffer);
|
|
|
|
g_assert_not_reached ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* A new sequence (or GOP) is a valid sync too. Note that the
|
|
|
|
* sequence header should be put in the next buffer, not here. */
|
|
|
|
else if (data[offset + 1] == (SEQ_START_CODE & 0xFF) ||
|
|
|
|
data[offset + 1] == (GOP_START_CODE & 0xFF)) {
|
|
|
|
if (mp1videoparse->picture_in_buffer == 0 &&
|
|
|
|
data[offset + 1] == (GOP_START_CODE & 0xFF)) {
|
|
|
|
mp1videoparse->last_pts = gst_mp1videoparse_time_code (&data[2],
|
|
|
|
mp1videoparse->fps);
|
|
|
|
} else if (mp1videoparse->picture_in_buffer == 1) {
|
|
|
|
have_sync = TRUE;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
g_assert (mp1videoparse->picture_in_buffer == 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* end-of-sequence is a valid sync point and should be included
|
|
|
|
* in the current picture, not the next. */
|
|
|
|
else if (data[offset + 1] == (SEQ_END_CODE & 0xFF)) {
|
|
|
|
if (mp1videoparse->picture_in_buffer == 1) {
|
|
|
|
offset += 4;
|
|
|
|
have_sync = TRUE;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
g_assert (mp1videoparse->picture_in_buffer == 0);
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
sync_state = 0;
|
gst-libs/gst/riff/riff-read.c: Additional pad usability check.
Original commit message from CVS:
2004-01-25 Ronald Bultje <rbultje@ronald.bitfreak.net>
* gst-libs/gst/riff/riff-read.c: (gst_riff_read_info):
Additional pad usability check.
* gst/mpeg1videoparse/gstmp1videoparse.c: (gst_mp1videoparse_init),
(mp1videoparse_find_next_gop), (gst_mp1videoparse_time_code),
(gst_mp1videoparse_real_chain):
Fix MPEG video stream parsing. The original plugin had several
issues, including not timestamping streams where the source was
not timestamped (this happens with PTS values in mpeg system
streams, but MPEG video is also a valid stream on its own so
that needs timestamps too). We use the display time code for that
for now. Also, if one incoming buffer contains multiple valid
frames, we push them all on correctly now, including proper EOS
handling. Lastly, several potential segfaults were fixed, and we
properly sync on new sequence/gop headers to include them in next,
not previous frames (since they're header for the next frame, not
the previous). Also see #119206.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_chain),
(bpf_from_header):
Move caps setting so we only do it after finding several valid
MPEG-1 fraes sequentially, not right after the first one (which
might be coincidental).
* gst/typefind/gsttypefindfunctions.c: (mpeg1_sys_type_find),
(mpeg_video_type_find), (mpeg_video_stream_type_find),
(plugin_init):
Add unsynced MPEG video stream typefinding, and change some
probability values so we detect streams rightly. The idea is as
follows: I can have an unsynced system stream which contains
video. In the current code, I would randomly get a type for either
system or video stream type found, because the probabilities are
being calculated rather randomly. I now use fixed values, so we
always prefer system stream if that was found (and that is how it
should be). If no system stream was found, we can still identity
the stream as video-only.
2004-01-25 00:25:16 +00:00
|
|
|
}
|
2004-01-29 16:00:55 +00:00
|
|
|
/* something else... */
|
2004-03-14 22:34:33 +00:00
|
|
|
else
|
2004-03-15 19:32:27 +00:00
|
|
|
sync_state = 0;
|
2004-04-10 22:40:51 +00:00
|
|
|
|
2004-01-29 16:00:55 +00:00
|
|
|
/* go down the buffer */
|
|
|
|
offset++;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
2004-01-29 16:00:55 +00:00
|
|
|
if (have_sync) {
|
|
|
|
offset -= 2;
|
2004-04-10 22:40:51 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: synced");
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-04-10 22:40:51 +00:00
|
|
|
outbuf = gst_buffer_create_sub (mp1videoparse->partialbuf, 0, offset);
|
2004-03-14 22:34:33 +00:00
|
|
|
g_assert (outbuf != NULL);
|
|
|
|
GST_BUFFER_TIMESTAMP (outbuf) = mp1videoparse->last_pts;
|
|
|
|
GST_BUFFER_DURATION (outbuf) = GST_SECOND / mp1videoparse->fps;
|
2004-01-29 16:00:55 +00:00
|
|
|
mp1videoparse->last_pts += GST_BUFFER_DURATION (outbuf);
|
|
|
|
|
|
|
|
if (mp1videoparse->in_flush) {
|
2004-03-15 19:32:27 +00:00
|
|
|
/* FIXME, send a flush event here */
|
|
|
|
mp1videoparse->in_flush = FALSE;
|
2004-01-29 16:00:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (GST_PAD_CAPS (outpad) != NULL) {
|
2004-04-10 22:40:51 +00:00
|
|
|
if (mp1videoparse->need_discont &&
|
|
|
|
GST_BUFFER_TIMESTAMP_IS_VALID (outbuf)) {
|
|
|
|
GstEvent *event = gst_event_new_discontinuous (FALSE,
|
|
|
|
GST_FORMAT_TIME, GST_BUFFER_TIMESTAMP (outbuf),
|
|
|
|
GST_FORMAT_UNDEFINED);
|
|
|
|
|
|
|
|
GST_DEBUG ("prepending discont event");
|
|
|
|
gst_pad_push (outpad, GST_DATA (event));
|
|
|
|
mp1videoparse->need_discont = FALSE;
|
|
|
|
}
|
2004-03-15 19:32:27 +00:00
|
|
|
GST_DEBUG ("mp1videoparse: pushing %d bytes %" G_GUINT64_FORMAT,
|
|
|
|
GST_BUFFER_SIZE (outbuf), GST_BUFFER_TIMESTAMP (outbuf));
|
|
|
|
gst_pad_push (outpad, GST_DATA (outbuf));
|
|
|
|
GST_DEBUG ("mp1videoparse: pushing done");
|
2004-01-29 16:00:55 +00:00
|
|
|
} else {
|
2004-03-15 19:32:27 +00:00
|
|
|
GST_DEBUG ("No capsnego yet, delaying buffer push");
|
|
|
|
gst_buffer_unref (outbuf);
|
2004-01-29 16:00:55 +00:00
|
|
|
}
|
|
|
|
mp1videoparse->picture_in_buffer = 0;
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2004-04-10 22:40:51 +00:00
|
|
|
if (size != offset) {
|
|
|
|
temp =
|
|
|
|
gst_buffer_create_sub (mp1videoparse->partialbuf, offset,
|
|
|
|
size - offset);
|
|
|
|
} else {
|
|
|
|
temp = NULL;
|
|
|
|
}
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_buffer_unref (mp1videoparse->partialbuf);
|
2004-01-29 16:00:55 +00:00
|
|
|
mp1videoparse->partialbuf = temp;
|
|
|
|
offset = 0;
|
2004-03-14 22:34:33 +00:00
|
|
|
} else {
|
2004-04-10 22:40:51 +00:00
|
|
|
if (time_stamp != GST_CLOCK_TIME_NONE)
|
2004-03-15 19:32:27 +00:00
|
|
|
mp1videoparse->last_pts = time_stamp;
|
2004-04-10 22:40:51 +00:00
|
|
|
return;
|
2004-01-29 16:00:55 +00:00
|
|
|
}
|
2004-04-10 22:40:51 +00:00
|
|
|
} while (mp1videoparse->partialbuf != NULL);
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
2005-09-05 17:20:29 +00:00
|
|
|
static GstStateChangeReturn
|
|
|
|
gst_mp1videoparse_change_state (GstElement * element, GstStateChange transition)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
|
|
|
Mp1VideoParse *mp1videoparse;
|
|
|
|
|
2005-09-05 17:20:29 +00:00
|
|
|
g_return_val_if_fail (GST_IS_MP1VIDEOPARSE (element),
|
|
|
|
GST_STATE_CHANGE_FAILURE);
|
2004-03-14 22:34:33 +00:00
|
|
|
|
|
|
|
mp1videoparse = GST_MP1VIDEOPARSE (element);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2005-09-05 17:20:29 +00:00
|
|
|
switch (transition) {
|
|
|
|
case GST_STATE_CHANGE_PAUSED_TO_READY:
|
2004-03-14 22:34:33 +00:00
|
|
|
gst_mp1videoparse_flush (mp1videoparse);
|
2004-04-10 22:40:51 +00:00
|
|
|
mp1videoparse->need_discont = TRUE;
|
2003-07-06 20:49:52 +00:00
|
|
|
mp1videoparse->width = mp1videoparse->height = -1;
|
2004-03-14 22:34:33 +00:00
|
|
|
mp1videoparse->fps = mp1videoparse->asr = 0.;
|
2003-07-06 20:49:52 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
if (GST_ELEMENT_CLASS (parent_class)->change_state)
|
2005-09-05 17:20:29 +00:00
|
|
|
return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
|
2001-12-28 01:47:47 +00:00
|
|
|
|
2005-09-05 17:20:29 +00:00
|
|
|
return GST_STATE_CHANGE_SUCCESS;
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static gboolean
|
2004-03-14 22:34:33 +00:00
|
|
|
plugin_init (GstPlugin * plugin)
|
2001-12-28 01:47:47 +00:00
|
|
|
{
|
2003-11-02 20:58:22 +00:00
|
|
|
return gst_element_register (plugin, "mpeg1videoparse",
|
2004-03-14 22:34:33 +00:00
|
|
|
GST_RANK_NONE, GST_TYPE_MP1VIDEOPARSE);
|
2001-12-28 01:47:47 +00:00
|
|
|
}
|
|
|
|
|
2004-03-14 22:34:33 +00:00
|
|
|
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
|
|
|
|
GST_VERSION_MINOR,
|
|
|
|
"mpeg1videoparse",
|
|
|
|
"MPEG-1 video parser",
|
2006-04-01 10:09:11 +00:00
|
|
|
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
|