diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/buffer.c | 5 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 15 |
3 files changed, 27 insertions, 3 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 0f29463cc..ec99fb536 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg.c,v 1.6 2001/04/29 23:22:32 f1rmb Exp $ + * $Id: demux_mpeg.c,v 1.7 2001/04/30 21:55:26 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -495,11 +495,15 @@ static void demux_mpeg_start (demux_plugin_t *this_gen, this->status = DEMUX_OK; + printf ("demux_mpeg: seek...\n"); + if ((this->input->get_capabilities (this->input) & INPUT_CAP_SEEKABLE) != 0 ) { xprintf (VERBOSE|DEMUX, "=>seek to %Ld\n",pos); this->input->seek (this->input, pos+4, SEEK_SET); } + printf ("demux_mpeg: create start packages...\n"); + buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->type = BUF_CONTROL_START; this->video_fifo->put (this->video_fifo, buf); @@ -507,6 +511,8 @@ static void demux_mpeg_start (demux_plugin_t *this_gen, buf->type = BUF_CONTROL_START; this->audio_fifo->put (this->audio_fifo, buf); + printf ("demux_mpeg: create thread...\n"); + pthread_create (&this->thread, NULL, demux_mpeg_loop, this) ; } @@ -515,6 +521,8 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, demux_mpeg_t *this = (demux_mpeg_t *) this_gen; + this->input = input; + switch(stage) { case STAGE_BY_CONTENT: { diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index c8795e9e4..0af1cf02a 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.c,v 1.2 2001/04/24 15:47:32 guenter Exp $ + * $Id: buffer.c,v 1.3 2001/04/30 21:55:27 guenter Exp $ * * * contents: @@ -176,8 +176,10 @@ fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) { buf_size += buf_size % alignment; + /* printf ("Allocating %d buffers of %ld bytes in one chunk (alignment = %d)\n", num_buffers, (long int) buf_size, alignment); + */ multi_buffer = xmalloc_aligned (alignment, num_buffers * buf_size); this->buffer_pool_top = NULL; @@ -200,6 +202,7 @@ fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) { buffer_pool_free (buf); } this->buffer_pool_num_free = num_buffers; + this->buffer_pool_alloc = buffer_pool_alloc; return this; } diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 49cd0aede..98ec4e05a 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.10 2001/04/29 01:09:23 guenter Exp $ + * $Id: xine.c,v 1.11 2001/04/30 21:55:27 guenter Exp $ * * top-level xine functions * @@ -195,6 +195,8 @@ static void xine_play_internal (xine_t *this, char *MRL, /* * find input plugin */ + + printf ("xine: looking for an input plugin...\n"); this->cur_input_plugin = NULL; @@ -211,14 +213,20 @@ static void xine_play_internal (xine_t *this, char *MRL, return; } + printf ("xine: using input plugin >%s< for this MRL.\n", this->cur_input_plugin->get_identifier(this->cur_input_plugin)); + /* * find demuxer plugin */ + printf ("xine: looking for a demuxer plugin...\n"); + if(!find_demuxer(this, MRL)) { printf ("error: couldn't find demuxer for >%s<\n", MRL); return; } + + printf ("xine: using demuxer plugin >%s< for this MRL.\n", this->cur_demuxer_plugin->get_identifier()); /* * Init SPU decoder with colour lookup table. @@ -240,6 +248,8 @@ static void xine_play_internal (xine_t *this, char *MRL, /* * start demuxer */ + + printf ("xine: starting demuxer ...\n"); if (spos) { len = this->cur_input_plugin->get_length (this->cur_input_plugin); @@ -259,7 +269,10 @@ static void xine_play_internal (xine_t *this, char *MRL, * start clock */ + printf ("xine: starting clock ...\n"); this->metronom->start_clock (this->metronom, 0); + + printf ("xine: play_internal done.\n"); } /* |