mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 15:06:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

Added call to no_more_pads

Browse source 
Original commit message from CVS:
Added call to no_more_pads
This commit is contained in:
Owen Fraser-Green 2005-07-03 17:40:04 +00:00
parent c6f5a958b0
commit 4f31b7a386
3 changed files with 39 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-07-03 Owen Fraser-Green <owen@discobabe.net>
* gst/realmedia/rmdemux.c (gst_rmdemux_add_stream),
(gst_rmdemux_src_getcaps), (gst_rmdemux_chain):
Added getcaps function no_more_pads call
2005-07-01 Philippe Khalaf <burger@speedy.org> 2005-07-01 Philippe Khalaf <burger@speedy.org>
* gst/udp/Makefile.am: * gst/udp/Makefile.am:
* gst/udp/gstudp.c: * gst/udp/gstudp.c:

36
gst/realmedia/rmdemux.c
View file

@ -23,16 +23,14 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
#endif #endif
* gst / realmedia / rmdemux.c (gst_rmdemux_add_stream), (gst_rmdemux_src_getcaps):Added getcaps
function
#include "rmdemux.h" #include "rmdemux.h"
#include <string.h> #include <string.h>
#include <zlib.h> #include <zlib.h>
#define RMDEMUX_GUINT32_GET(a) GST_READ_UINT32_BE(a) #define RMDEMUX_GUINT32_GET(a) GST_READ_UINT32_BE(a)
#define RMDEMUX_GUINT16_GET(a) GST_READ_UINT16_BE(a) #define RMDEMUX_GUINT16_GET(a) GST_READ_UINT16_BE(a)
#define RMDEMUX_FOURCC_GET(a) GST_READ_UINT32_LE(a) #define RMDEMUX_FOURCC_GET(a) GST_READ_UINT32_LE(a)
typedef struct _GstRMDemuxIndex GstRMDemuxIndex; typedef struct _GstRMDemuxIndex GstRMDemuxIndex;
struct _GstRMDemuxStream struct _GstRMDemuxStream
@ -162,6 +160,7 @@ static void gst_rmdemux_parse_cont (GstRMDemux * rmdemux, const void *data,
int length); int length);
static void gst_rmdemux_parse_packet (GstRMDemux * rmdemux, const void *data, static void gst_rmdemux_parse_packet (GstRMDemux * rmdemux, const void *data,
guint16 version, guint16 length); guint16 version, guint16 length);
static GstCaps *gst_rmdemux_src_getcaps (GstPad * pad);
static GstRMDemuxStream *gst_rmdemux_get_stream_by_id (GstRMDemux * rmdemux, static GstRMDemuxStream *gst_rmdemux_get_stream_by_id (GstRMDemux * rmdemux,
int id); int id);
@ -241,6 +240,7 @@ gst_rmdemux_init (GstRMDemux * rmdemux)
(&gst_rmdemux_sink_template), "sink"); (&gst_rmdemux_sink_template), "sink");
gst_pad_set_event_function (rmdemux->sinkpad, gst_rmdemux_sink_event); gst_pad_set_event_function (rmdemux->sinkpad, gst_rmdemux_sink_event);
gst_pad_set_chain_function (rmdemux->sinkpad, gst_rmdemux_chain); gst_pad_set_chain_function (rmdemux->sinkpad, gst_rmdemux_chain);
gst_element_add_pad (GST_ELEMENT (rmdemux), rmdemux->sinkpad); gst_element_add_pad (GST_ELEMENT (rmdemux), rmdemux->sinkpad);
rmdemux->adapter = gst_adapter_new (); rmdemux->adapter = gst_adapter_new ();
@ -290,6 +290,7 @@ gst_rmdemux_change_state (GstElement * element)
break; break;
case GST_STATE_READY_TO_PAUSED: case GST_STATE_READY_TO_PAUSED:
rmdemux->state = RMDEMUX_STATE_HEADER; rmdemux->state = RMDEMUX_STATE_HEADER;
rmdemux->have_pads = FALSE;
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_PAUSED_TO_PLAYING:
break; break;
@ -310,6 +311,24 @@ gst_rmdemux_change_state (GstElement * element)
return GST_STATE_SUCCESS; return GST_STATE_SUCCESS;
} }
static GstCaps *
gst_rmdemux_src_getcaps (GstPad * pad)
{
guint n;
GstRMDemux *rmdemux = GST_RMDEMUX (GST_PAD_PARENT (pad));
GST_DEBUG_OBJECT (rmdemux, "getcaps");
for (n = 0; n < rmdemux->n_streams; n++) {
if (rmdemux->streams[n] != NULL && rmdemux->streams[n]->pad == pad) {
return gst_caps_copy (rmdemux->streams[n]->caps);
}
}
/* Base case */
return gst_caps_new_empty ();
}
static GstFlowReturn static GstFlowReturn
gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer) gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer)
{ {
@ -434,6 +453,12 @@ gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer)
} }
case RMDEMUX_STATE_HEADER_DATA: case RMDEMUX_STATE_HEADER_DATA:
{ {
/* If we haven't already done so then signal there are no more pads */
if (!rmdemux->have_pads) {
gst_element_no_more_pads (GST_ELEMENT (rmdemux));
rmdemux->have_pads = TRUE;
}
/* The actual header is only 8 bytes */ /* The actual header is only 8 bytes */
rmdemux->size = 8; rmdemux->size = 8;
if (gst_adapter_available (rmdemux->adapter) < rmdemux->size) if (gst_adapter_available (rmdemux->adapter) < rmdemux->size)
@ -444,6 +469,7 @@ gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer)
gst_rmdemux_parse_data (rmdemux, data, rmdemux->size); gst_rmdemux_parse_data (rmdemux, data, rmdemux->size);
gst_adapter_flush (rmdemux->adapter, rmdemux->size); gst_adapter_flush (rmdemux->adapter, rmdemux->size);
rmdemux->state = RMDEMUX_STATE_DATA_PACKET; rmdemux->state = RMDEMUX_STATE_DATA_PACKET;
break; break;
} }
@ -661,6 +687,8 @@ gst_rmdemux_add_stream (GstRMDemux * rmdemux, GstRMDemuxStream * stream)
gst_pad_set_caps (stream->pad, stream->caps); gst_pad_set_caps (stream->pad, stream->caps);
gst_caps_unref (stream->caps); gst_caps_unref (stream->caps);
gst_pad_set_getcaps_function (stream->pad, gst_rmdemux_src_getcaps);
GST_DEBUG_OBJECT (rmdemux, "adding pad %p to rmdemux %p", stream->pad, GST_DEBUG_OBJECT (rmdemux, "adding pad %p to rmdemux %p", stream->pad,
rmdemux); rmdemux);
gst_element_add_pad (GST_ELEMENT (rmdemux), stream->pad); gst_element_add_pad (GST_ELEMENT (rmdemux), stream->pad);

2
gst/realmedia/rmdemux.h
View file

@ -56,8 +56,8 @@ struct _GstRMDemux {
int n_streams; int n_streams;
int n_video_streams; int n_video_streams;
int n_audio_streams; int n_audio_streams;
GstAdapter *adapter; GstAdapter *adapter;
gboolean have_pads;
GNode *moov_node; GNode *moov_node;
GNode *moov_node_compressed; GNode *moov_node_compressed;