summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-07-13 23:43:12 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-07-13 23:43:12 +0000
commit85eb608c7a602f971f779106c812b48f6c2cd030 (patch)
treef4fac8838c46fea222fb760ba9bfc0c199ab42b9 /src/demuxers
parent6f8f8cd72c2be8bf0b2404b8a0e9034b25f7e882 (diff)
downloadxine-lib-85eb608c7a602f971f779106c812b48f6c2cd030.tar.gz
xine-lib-85eb608c7a602f971f779106c812b48f6c2cd030.tar.bz2
Make SPU decode use Video decoder thread instead of it's own thread.
CVS patchset: 274 CVS date: 2001/07/13 23:43:12
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_mpeg_block.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 2aa9e2a48..5120c4683 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.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_block.c,v 1.24 2001/07/04 17:10:24 uid32519 Exp $
+ * $Id: demux_mpeg_block.c,v 1.25 2001/07/13 23:43:12 jcdutton Exp $
*
* demultiplexer for mpeg 1/2 program streams
*
@@ -240,7 +240,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m
buf->DTS = nDTS ;
buf->input_pos = this->input->get_current_pos(this->input);
- this->spu_fifo->put (this->spu_fifo, buf);
+ this->video_fifo->put (this->video_fifo, buf);
return;
}
@@ -372,10 +372,10 @@ static void *demux_mpeg_block_loop (void *this_gen) {
this->audio_fifo->put (this->audio_fifo, buf);
}
- buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo);
+/* buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo); */
buf->type = BUF_CONTROL_END;
buf->decoder_info[0] = 0; /* stream finished */
- this->spu_fifo->put (this->spu_fifo, buf);
+/* this->spu_fifo->put (this->spu_fifo, buf); */
}
pthread_exit(NULL);
@@ -416,11 +416,11 @@ static void demux_mpeg_block_stop (demux_plugin_t *this_gen) {
this->audio_fifo->put (this->audio_fifo, buf);
}
- buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo);
+/* buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo); */
buf->type = BUF_CONTROL_END;
buf->decoder_info[0] = 1; /* forced */
- this->spu_fifo->put (this->spu_fifo, buf);
+/* this->spu_fifo->put (this->spu_fifo, buf); */
}
@@ -465,9 +465,9 @@ static void demux_mpeg_block_start (demux_plugin_t *this_gen,
this->audio_fifo->put (this->audio_fifo, buf);
}
- buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo);
+/* buf = this->spu_fifo->buffer_pool_alloc (this->spu_fifo); */
buf->type = BUF_CONTROL_START;
- this->spu_fifo->put (this->spu_fifo, buf);
+/* this->spu_fifo->put (this->spu_fifo, buf); */
if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) {