mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-23 17:14:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

use new bytestream api. please test if you care about this plugin

Browse source 
Original commit message from CVS:
use new bytestream api. please test if you care about this plugin
This commit is contained in:
Steve Baker 2002-05-15 19:05:41 +00:00
parent cd96ede62c
commit c622ee22a8
2 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/dv/gstdvdec.c
View file

@ -271,12 +271,13 @@ gst_dvdec_loop (GstElement *element)
gint outframe_pitches[3]; gint outframe_pitches[3];
gboolean PAL; gboolean PAL;
gint height; gint height;
guint32 length, got_bytes;
dvdec = GST_DVDEC (element); dvdec = GST_DVDEC (element);
/* first read enough bytes to parse the header */ /* first read enough bytes to parse the header */
inframe = gst_bytestream_peek_bytes (dvdec->bs, header_size); got_bytes = gst_bytestream_peek_bytes (dvdec->bs, &inframe, header_size);
if (!inframe) { if (got_bytes < header_size) {
gst_dvdec_handle_event (dvdec); gst_dvdec_handle_event (dvdec);
return; return;
} }
@ -285,10 +286,11 @@ gst_dvdec_loop (GstElement *element)
PAL = dv_system_50_fields (dvdec->decoder); PAL = dv_system_50_fields (dvdec->decoder);
height = (PAL ? PAL_HEIGHT : NTSC_HEIGHT); height = (PAL ? PAL_HEIGHT : NTSC_HEIGHT);
length = (PAL ? PAL_BUFFER : NTSC_BUFFER);
/* then read the read data */ /* then read the read data */
buf = gst_bytestream_read (dvdec->bs, (PAL ? PAL_BUFFER : NTSC_BUFFER)); got_bytes = gst_bytestream_read (dvdec->bs, &buf, length);
if (!buf) { if (got_bytes < length) {
gst_dvdec_handle_event (dvdec); gst_dvdec_handle_event (dvdec);
return; return;
} }

44
gst/avi/gstavidemux.c
View file

@ -276,10 +276,11 @@ static gboolean
gst_avi_demux_avih (GstAviDemux *avi_demux) gst_avi_demux_avih (GstAviDemux *avi_demux)
{ {
gst_riff_avih *avih; gst_riff_avih *avih;
guint32 got_bytes;
GstByteStream *bs = avi_demux->bs; GstByteStream *bs = avi_demux->bs;
avih = (gst_riff_avih *) gst_bytestream_peek_bytes (bs, sizeof (gst_riff_avih)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&avih, sizeof (gst_riff_avih));
if (avih) { if (got_bytes == sizeof (gst_riff_avih)) {
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: avih tag found"); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: avih tag found");
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: us_frame %d", GUINT32_FROM_LE (avih->us_frame)); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: us_frame %d", GUINT32_FROM_LE (avih->us_frame));
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: max_bps %d", GUINT32_FROM_LE (avih->max_bps)); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: max_bps %d", GUINT32_FROM_LE (avih->max_bps));
@ -310,9 +311,10 @@ gst_avi_demux_strh (GstAviDemux *avi_demux)
{ {
gst_riff_strh *strh; gst_riff_strh *strh;
GstByteStream *bs = avi_demux->bs; GstByteStream *bs = avi_demux->bs;
guint32 got_bytes;
strh = (gst_riff_strh *) gst_bytestream_peek_bytes (bs, sizeof (gst_riff_strh)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&strh, sizeof (gst_riff_strh));
if (strh) { if (got_bytes == sizeof (gst_riff_strh)) {
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strh tag found"); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strh tag found");
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: type 0x%08x (%s)", GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: type 0x%08x (%s)",
GUINT32_FROM_LE (strh->type), gst_riff_id_to_fourcc (strh->type)); GUINT32_FROM_LE (strh->type), gst_riff_id_to_fourcc (strh->type));
@ -361,8 +363,9 @@ gst_avi_demux_strf_vids (GstAviDemux *avi_demux)
GstPad *srcpad; GstPad *srcpad;
GstByteStream *bs = avi_demux->bs; GstByteStream *bs = avi_demux->bs;
GstCaps *newcaps = NULL, *capslist = NULL; GstCaps *newcaps = NULL, *capslist = NULL;
guint32 got_bytes;
strf = (gst_riff_strf_vids *) gst_bytestream_peek_bytes (bs, sizeof (gst_riff_strf_vids)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&strf, sizeof (gst_riff_strf_vids));
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context vids"); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context vids");
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: size %d", GUINT32_FROM_LE (strf->size)); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: size %d", GUINT32_FROM_LE (strf->size));
@ -446,8 +449,9 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
GstPad *srcpad; GstPad *srcpad;
GstByteStream *bs = avi_demux->bs; GstByteStream *bs = avi_demux->bs;
GstCaps *newcaps = NULL, *capslist = NULL; GstCaps *newcaps = NULL, *capslist = NULL;
guint32 got_bytes;
strf = (gst_riff_strf_auds *) gst_bytestream_peek_bytes (bs, sizeof (gst_riff_strf_auds)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&strf, sizeof (gst_riff_strf_auds));
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context auds"); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context auds");
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: format %d", GUINT16_FROM_LE (strf->format)); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: format %d", GUINT16_FROM_LE (strf->format));
@ -515,8 +519,9 @@ gst_avi_demux_strf_iavs (GstAviDemux *avi_demux)
GstPad *srcpad; GstPad *srcpad;
GstByteStream *bs = avi_demux->bs; GstByteStream *bs = avi_demux->bs;
GstCaps *newcaps = NULL, *capslist = NULL; GstCaps *newcaps = NULL, *capslist = NULL;
guint32 got_bytes;
strf = (gst_riff_strf_iavs *) gst_bytestream_peek_bytes (bs, sizeof (gst_riff_strf_iavs)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&strf, sizeof (gst_riff_strf_iavs));
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context iavs"); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: strf tag found in context iavs");
GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVAAuxSrc %08x", GUINT32_FROM_LE (strf->DVAAuxSrc)); GST_INFO (GST_CAT_PLUGIN_INFO, "gst_avi_demux: DVAAuxSrc %08x", GUINT32_FROM_LE (strf->DVAAuxSrc));
@ -566,19 +571,20 @@ gst_avidemux_parse_index (GstAviDemux *avi_demux,
{ {
GstBuffer *buf; GstBuffer *buf;
gulong index_size; gulong index_size;
guint32 got_bytes;
if (!gst_bytestream_seek (avi_demux->bs, GST_SEEK_BYTEOFFSET_SET, filepos + offset)) { if (!gst_bytestream_seek (avi_demux->bs, GST_SEEK_BYTEOFFSET_SET, filepos + offset)) {
GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek to index"); GST_INFO (GST_CAT_PLUGIN_INFO, "avidemux: could not seek to index");
return; return;
} }
buf = gst_bytestream_read (avi_demux->bs, 8); got_bytes = gst_bytestream_read (avi_demux->bs, &buf, 8);
while (!buf) { while (got_bytes < 8) {
guint32 remaining; guint32 remaining;
GstEvent *event; GstEvent *event;
gst_bytestream_get_status (avi_demux->bs, &remaining, &event); gst_bytestream_get_status (avi_demux->bs, &remaining, &event);
buf = gst_bytestream_read (avi_demux->bs, 8); got_bytes = gst_bytestream_read (avi_demux->bs, &buf, 8);
} }
if (GST_BUFFER_OFFSET (buf) != filepos + offset || GST_BUFFER_SIZE (buf) != 8) { if (GST_BUFFER_OFFSET (buf) != filepos + offset || GST_BUFFER_SIZE (buf) != 8) {
@ -594,7 +600,7 @@ gst_avidemux_parse_index (GstAviDemux *avi_demux,
index_size = GUINT32_FROM_LE(*(guint32 *)(GST_BUFFER_DATA (buf) + 4)); index_size = GUINT32_FROM_LE(*(guint32 *)(GST_BUFFER_DATA (buf) + 4));
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_bytestream_read (avi_demux->bs, index_size); got_bytes = gst_bytestream_read (avi_demux->bs, &buf, index_size);
avi_demux->index_size = index_size/sizeof(gst_riff_index_entry); avi_demux->index_size = index_size/sizeof(gst_riff_index_entry);
@ -648,10 +654,11 @@ gst_avidemux_read_chunk (GstAviDemux *avi_demux, guint32 *id, guint32 *size)
{ {
gst_riff_chunk *chunk; gst_riff_chunk *chunk;
GstByteStream *bs = avi_demux->bs; GstByteStream *bs = avi_demux->bs;
guint32 got_bytes;
do { do {
chunk = (gst_riff_chunk *) gst_bytestream_peek_bytes (bs, sizeof (gst_riff_chunk)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&chunk, sizeof (gst_riff_chunk));
if (chunk) { if (got_bytes == sizeof (gst_riff_chunk)) {
*id = GUINT32_FROM_LE (chunk->id); *id = GUINT32_FROM_LE (chunk->id);
*size = GUINT32_FROM_LE (chunk->size); *size = GUINT32_FROM_LE (chunk->size);
@ -697,9 +704,10 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos,
guint32 datashowed; guint32 datashowed;
guint32 subchunksize = 0; /* size of a read subchunk */ guint32 subchunksize = 0; /* size of a read subchunk */
gchar *formtype; gchar *formtype;
guint32 got_bytes;
formtype = gst_bytestream_peek_bytes (bs, sizeof (guint32)); got_bytes = gst_bytestream_peek_bytes (bs, (guint8**)&formtype, sizeof (guint32));
if (!formtype) if (got_bytes < sizeof(guint32))
return FALSE; return FALSE;
switch (GUINT32_FROM_LE (*((guint32*)formtype))) { switch (GUINT32_FROM_LE (*((guint32*)formtype))) {
@ -775,9 +783,10 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos,
if (GST_PAD_IS_CONNECTED (avi_demux->video_pad[0])) { if (GST_PAD_IS_CONNECTED (avi_demux->video_pad[0])) {
GstBuffer *buf; GstBuffer *buf;
guint32 got_bytes;
if (*chunksize) { if (*chunksize) {
buf = gst_bytestream_peek (bs, *chunksize); got_bytes = gst_bytestream_peek (bs, &buf, *chunksize);
GST_BUFFER_TIMESTAMP (buf) = avi_demux->next_time; GST_BUFFER_TIMESTAMP (buf) = avi_demux->next_time;
@ -810,9 +819,10 @@ gst_avidemux_process_chunk (GstAviDemux *avi_demux, guint64 *filepos,
if (GST_PAD_IS_CONNECTED (avi_demux->audio_pad[0])) { if (GST_PAD_IS_CONNECTED (avi_demux->audio_pad[0])) {
GstBuffer *buf; GstBuffer *buf;
guint32 got_bytes;
if (*chunksize) { if (*chunksize) {
buf = gst_bytestream_peek (bs, *chunksize); got_bytes = gst_bytestream_peek (bs, &buf, *chunksize);
GST_BUFFER_TIMESTAMP (buf) = -1LL; GST_BUFFER_TIMESTAMP (buf) = -1LL;