FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Redid the lost changes.

Browse Source 
Original commit message from CVS:
Redid the lost changes.
This commit is contained in:
Wim Taymans 2001-12-23 22:37:07 +00:00
parent 2be14957a1
commit 2e3745fa62
4 changed files with 94 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gst/mpegstream/gstmpegpacketize.c
View File

@ -22,16 +22,19 @@
#include <gstmpegpacketize.h> #include <gstmpegpacketize.h>
GstMPEGPacketize* GstMPEGPacketize*
gst_mpeg_packetize_new (GstByteStream *bs) gst_mpeg_packetize_new (GstPad *pad)
{ {
GstMPEGPacketize *new; GstMPEGPacketize *new;
g_return_val_if_fail (bs != NULL, NULL); g_return_val_if_fail (pad != NULL, NULL);
g_return_val_if_fail (GST_IS_PAD (pad), NULL);
new = g_malloc (sizeof (GstMPEGPacketize)); new = g_malloc (sizeof (GstMPEGPacketize));
gst_object_ref (GST_OBJECT (pad));
new->id = 0; new->id = 0;
new->bs = bs; new->pad = pad;
new->bs = gst_bytestream_new (pad);
new->MPEG2 = FALSE; new->MPEG2 = FALSE;
return new; return new;
@ -42,6 +45,9 @@ gst_mpeg_packetize_destroy (GstMPEGPacketize *packetize)
{ {
g_return_if_fail (packetize != NULL); g_return_if_fail (packetize != NULL);
gst_bytestream_destroy (packetize->bs);
gst_object_unref (GST_OBJECT (packetize->pad));
g_free (packetize); g_free (packetize);
} }

5
gst/mpegstream/gstmpegpacketize.h
View File

@ -24,7 +24,7 @@
#include <config.h> #include <config.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/bytestream/bytestream.h> #include <gst/bytestream/gstbytestream.h>
#ifdef __cplusplus #ifdef __cplusplus
@ -42,12 +42,13 @@ struct _GstMPEGPacketize {
/* current parse state */ /* current parse state */
guchar id; guchar id;
GstPad *pad;
GstByteStream *bs; GstByteStream *bs;
gboolean MPEG2; gboolean MPEG2;
}; };
GstMPEGPacketize* gst_mpeg_packetize_new (GstByteStream *bs); GstMPEGPacketize* gst_mpeg_packetize_new (GstPad *pad);
void gst_mpeg_packetize_destroy (GstMPEGPacketize *packetize); void gst_mpeg_packetize_destroy (GstMPEGPacketize *packetize);
GstData* gst_mpeg_packetize_read (GstMPEGPacketize *packetize); GstData* gst_mpeg_packetize_read (GstMPEGPacketize *packetize);

136
gst/mpegstream/gstmpegparse.c
View File

@ -47,12 +47,6 @@ enum {
/* FILL ME */ /* FILL ME */
}; };
typedef enum {
PARSE_STATE_ERROR = 0,
PARSE_STATE_OK = 1,
PARSE_STATE_EVENT = 2,
} GstMPEGParseState;
GST_PADTEMPLATE_FACTORY (sink_factory, GST_PADTEMPLATE_FACTORY (sink_factory,
"sink", "sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -80,6 +74,8 @@ GST_PADTEMPLATE_FACTORY (src_factory,
static void gst_mpeg_parse_class_init (GstMPEGParseClass *klass); static void gst_mpeg_parse_class_init (GstMPEGParseClass *klass);
static void gst_mpeg_parse_init (GstMPEGParse *mpeg_parse); static void gst_mpeg_parse_init (GstMPEGParse *mpeg_parse);
static GstElementStateReturn
gst_mpeg_parse_change_state (GstElement *element);
static gboolean gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer); static gboolean gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer);
static void gst_mpeg_parse_send_data (GstMPEGParse *mpeg_parse, GstData *data); static void gst_mpeg_parse_send_data (GstMPEGParse *mpeg_parse, GstData *data);
@ -122,6 +118,8 @@ gst_mpeg_parse_class_init (GstMPEGParseClass *klass)
gobject_class = (GObjectClass*)klass; gobject_class = (GObjectClass*)klass;
gstelement_class = (GstElementClass*)klass; gstelement_class = (GstElementClass*)klass;
parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BIT_RATE, g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BIT_RATE,
g_param_spec_uint("bit_rate","bit_rate","bit_rate", g_param_spec_uint("bit_rate","bit_rate","bit_rate",
0, G_MAXUINT, 0, G_PARAM_READABLE)); 0, G_MAXUINT, 0, G_PARAM_READABLE));
@ -131,13 +129,14 @@ gst_mpeg_parse_class_init (GstMPEGParseClass *klass)
gobject_class->get_property = gst_mpeg_parse_get_property; gobject_class->get_property = gst_mpeg_parse_get_property;
gstelement_class->change_state = gst_mpeg_parse_change_state;
klass->parse_packhead = gst_mpeg_parse_parse_packhead; klass->parse_packhead = gst_mpeg_parse_parse_packhead;
klass->parse_syshead = NULL; klass->parse_syshead = NULL;
klass->parse_packet = NULL; klass->parse_packet = NULL;
klass->parse_pes = NULL; klass->parse_pes = NULL;
klass->send_data = gst_mpeg_parse_send_data; klass->send_data = gst_mpeg_parse_send_data;
parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
} }
static void static void
@ -152,7 +151,6 @@ gst_mpeg_parse_init (GstMPEGParse *mpeg_parse)
gst_element_add_pad(GST_ELEMENT(mpeg_parse),mpeg_parse->srcpad); gst_element_add_pad(GST_ELEMENT(mpeg_parse),mpeg_parse->srcpad);
/* initialize parser state */ /* initialize parser state */
mpeg_parse->bs = NULL;
mpeg_parse->packetize = NULL; mpeg_parse->packetize = NULL;
mpeg_parse->next_ts = 0; mpeg_parse->next_ts = 0;
@ -185,6 +183,7 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
guint8 *buf; guint8 *buf;
guint64 scr; guint64 scr;
guint32 scr1, scr2; guint32 scr1, scr2;
guint32 new_rate;
GST_DEBUG (0, "mpeg_parse: in parse_packhead\n"); GST_DEBUG (0, "mpeg_parse: in parse_packhead\n");
@ -203,7 +202,8 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
scr |= (scr2 & 0xf8000000) >> 27; scr |= (scr2 & 0xf8000000) >> 27;
buf += 6; buf += 6;
mpeg_parse->bit_rate = (GUINT32_FROM_BE ((*(guint32 *) buf)) & 0xfffffc00) >> 10; new_rate = (GUINT32_FROM_BE ((*(guint32 *) buf)) & 0xfffffc00) >> 10;
new_rate *= 133; /* FIXME trial and error */
} }
else { else {
scr = (scr1 & 0x0e000000) << 5; scr = (scr1 & 0x0e000000) << 5;
@ -211,15 +211,21 @@ gst_mpeg_parse_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
scr |= (scr1 & 0x000000ff) << 7; scr |= (scr1 & 0x000000ff) << 7;
scr |= (scr2 & 0xfe000000) >> 25; scr |= (scr2 & 0xfe000000) >> 25;
buf += 4; buf += 5;
mpeg_parse->bit_rate = (GUINT32_FROM_BE ((*(guint32 *) buf)) & 0x7ffffe00) >> 9; new_rate = (GUINT32_FROM_BE ((*(guint32 *) buf)) & 0x7ffffe00) >> 9;
new_rate *= 400;
} }
GST_DEBUG (0, "mpeg_parse: SCR is %llu\n", scr); GST_DEBUG (0, "mpeg_parse: SCR is %llu\n", scr);
mpeg_parse->next_ts = (scr*100)/9; mpeg_parse->next_ts = (scr*100)/9;
mpeg_parse->bit_rate *= 50;
GST_DEBUG (0, "mpeg_parse: stream is %1.3fMB/sec\n", if (mpeg_parse->bit_rate != new_rate) {
mpeg_parse->bit_rate = new_rate;
gst_element_send_event (GST_ELEMENT (mpeg_parse),
gst_event_new_info ("bitrate", GST_PROPS_INT (new_rate), NULL));
}
GST_DEBUG (0, "mpeg_parse: stream is %1.3fMbs\n",
(mpeg_parse->bit_rate) / 1000000.0); (mpeg_parse->bit_rate) / 1000000.0);
return TRUE; return TRUE;
@ -229,57 +235,79 @@ static void
gst_mpeg_parse_loop (GstElement *element) gst_mpeg_parse_loop (GstElement *element)
{ {
GstMPEGParse *mpeg_parse = GST_MPEG_PARSE (element); GstMPEGParse *mpeg_parse = GST_MPEG_PARSE (element);
GstData *data;
guint id;
gboolean mpeg2;
gboolean to_send = TRUE;
if (!mpeg_parse->bs) { data = gst_mpeg_packetize_read (mpeg_parse->packetize);
mpeg_parse->bs = gst_bytestream_new (mpeg_parse->sinkpad);
mpeg_parse->packetize = gst_mpeg_packetize_new (mpeg_parse->bs);
}
do { id = GST_MPEG_PACKETIZE_ID (mpeg_parse->packetize);
GstData *data; mpeg2 = GST_MPEG_PACKETIZE_IS_MPEG2 (mpeg_parse->packetize);
guint id;
gboolean mpeg2;
data = gst_mpeg_packetize_read (mpeg_parse->packetize); if (GST_IS_BUFFER (data)) {
GstBuffer *buffer = GST_BUFFER (data);
id = GST_MPEG_PACKETIZE_ID (mpeg_parse->packetize); GST_DEBUG (0, "mpeg2demux: have chunk 0x%02X\n", id);
mpeg2 = GST_MPEG_PACKETIZE_IS_MPEG2 (mpeg_parse->packetize);
if (GST_IS_BUFFER (data)) { switch (id) {
GstBuffer *buffer = GST_BUFFER (data); case 0xba:
if (CLASS (mpeg_parse)->parse_packhead) {
GST_DEBUG (0, "mpeg2demux: have chunk 0x%02X\n", id); CLASS (mpeg_parse)->parse_packhead (mpeg_parse, buffer);
}
switch (id) { break;
case 0xba: case 0xbb:
if (CLASS (mpeg_parse)->parse_packhead) if (CLASS (mpeg_parse)->parse_syshead) {
CLASS (mpeg_parse)->parse_packhead (mpeg_parse, buffer); CLASS (mpeg_parse)->parse_syshead (mpeg_parse, buffer);
break; }
case 0xbb: break;
if (CLASS (mpeg_parse)->parse_syshead) default:
CLASS (mpeg_parse)->parse_syshead (mpeg_parse, buffer); if (mpeg2 && ((id < 0xBD) || (id > 0xFE))) {
break; g_warning ("mpeg2demux: ******** unknown id 0x%02X", id);
default: }
if (mpeg2 && ((id < 0xBD) || (id > 0xFE))) { else {
g_warning ("mpeg2demux: ******** unknown id 0x%02X", id); if (mpeg2) {
} if (CLASS (mpeg_parse)->parse_pes) {
else { CLASS (mpeg_parse)->parse_pes (mpeg_parse, buffer);
if (mpeg2) {
if (CLASS (mpeg_parse)->parse_pes)
CLASS (mpeg_parse)->parse_pes (mpeg_parse, buffer);
}
else {
if (CLASS (mpeg_parse)->parse_packet)
CLASS (mpeg_parse)->parse_packet (mpeg_parse, buffer);
} }
} }
} else {
if (CLASS (mpeg_parse)->parse_packet) {
CLASS (mpeg_parse)->parse_packet (mpeg_parse, buffer);
}
}
}
} }
}
if (CLASS (mpeg_parse)->send_data) if (CLASS (mpeg_parse)->send_data && to_send)
CLASS (mpeg_parse)->send_data (mpeg_parse, data); CLASS (mpeg_parse)->send_data (mpeg_parse, data);
}
} while (!GST_ELEMENT_IS_COTHREAD_STOPPING(element)); static GstElementStateReturn
gst_mpeg_parse_change_state (GstElement *element)
{
GstMPEGParse *mpeg_parse = GST_MPEG_PARSE (element);
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_NULL_TO_READY:
if (!mpeg_parse->packetize) {
mpeg_parse->packetize = gst_mpeg_packetize_new (mpeg_parse->sinkpad);
}
break;
case GST_STATE_READY_TO_NULL:
if (mpeg_parse->packetize) {
gst_mpeg_packetize_destroy (mpeg_parse->packetize);
mpeg_parse->packetize = NULL;
}
break;
default:
break;
}
GST_ELEMENT_CLASS (parent_class)->change_state (element);
return GST_STATE_SUCCESS;
} }
static void static void

1
gst/mpegstream/gstmpegparse.h
View File

@ -54,7 +54,6 @@ struct _GstMPEGParse {
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
GstByteStream *bs;
GstMPEGPacketize *packetize; GstMPEGPacketize *packetize;
/* pack header values */ /* pack header values */