diff options
author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-04-11 22:27:11 +0000 |
---|---|---|
committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-04-11 22:27:11 +0000 |
commit | 50bf9a402e5e86a13dc95c1464ba5f1d1255d71b (patch) | |
tree | 139f62629a9c64755c5e6cda10fd077d1bbdac54 /src/demuxers | |
parent | 5c422410a13682ae1a959e897923b8d3c3057437 (diff) | |
download | xine-lib-50bf9a402e5e86a13dc95c1464ba5f1d1255d71b.tar.gz xine-lib-50bf9a402e5e86a13dc95c1464ba5f1d1255d71b.tar.bz2 |
Add an INPUT_CAP_PREVIEW mode.
This tells the demuxers if the input plugin can handle preview testing.
Most plugins which are seekable can handle it.
The current exception to this is the xine-dvdnav plugin which is seekable but not previewable due to DVDs having still pictures which stall the preview testing.
CVS patchset: 1710
CVS date: 2002/04/11 22:27:11
Diffstat (limited to 'src/demuxers')
-rw-r--r-- | src/demuxers/demux_elem.c | 4 | ||||
-rw-r--r-- | src/demuxers/demux_mpeg.c | 4 | ||||
-rw-r--r-- | src/demuxers/demux_mpeg_block.c | 10 | ||||
-rw-r--r-- | src/demuxers/demux_pes.c | 4 |
4 files changed, 9 insertions, 13 deletions
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 9a46a175b..f5fc4c625 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.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_elem.c,v 1.37 2002/04/09 03:38:00 miguelfreitas Exp $ + * $Id: demux_elem.c,v 1.38 2002/04/11 22:27:11 jcdutton Exp $ * * demultiplexer for elementary mpeg streams * @@ -220,7 +220,7 @@ static void demux_mpeg_elem_start (demux_plugin_t *this_gen, this->audio_fifo->put (this->audio_fifo, buf); } - if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) { + if((this->input->get_capabilities(this->input) & INPUT_CAP_PREVIEW) != 0) { int num_buffers = NUM_PREVIEW_BUFFERS; this->input->seek (this->input, 0, SEEK_SET); diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 60fc67b60..4012ce48b 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.53 2002/04/09 03:38:00 miguelfreitas Exp $ + * $Id: demux_mpeg.c,v 1.54 2002/04/11 22:27:11 jcdutton Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -760,7 +760,7 @@ static void demux_mpeg_start (demux_plugin_t *this_gen, this->audio_fifo->put (this->audio_fifo, buf); } - if ((this->input->get_capabilities (this->input) & INPUT_CAP_SEEKABLE) != 0 ) { + if ((this->input->get_capabilities (this->input) & INPUT_CAP_PREVIEW) != 0 ) { uint32_t w; int num_buffers = NUM_PREVIEW_BUFFERS; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index b592d5c8a..0d034c1fa 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.88 2002/04/11 14:04:47 jcdutton Exp $ + * $Id: demux_mpeg_block.c,v 1.89 2002/04/11 22:27:11 jcdutton Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -886,11 +886,8 @@ static void demux_mpeg_block_start (demux_plugin_t *this_gen, this->last_scr = 0; this->nav_last_end_pts = 0; this->ignore_scr_discont = 0; -/* FIXME: Preview mode disabled to make DVD still pictures work at the beginning of DVDs. - This is a quick and dirty fix, because I don't yet understand the need to preview mode. - */ -/*********************************** - if((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) { + + if((this->input->get_capabilities(this->input) & INPUT_CAP_PREVIEW) != 0) { int num_buffers = NUM_PREVIEW_BUFFERS; @@ -903,7 +900,6 @@ static void demux_mpeg_block_start (demux_plugin_t *this_gen, num_buffers --; } } -**********************************/ this->status = DEMUX_FINISHED; } diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c index 73383a934..99630901a 100644 --- a/src/demuxers/demux_pes.c +++ b/src/demuxers/demux_pes.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_pes.c,v 1.23 2002/04/09 03:38:00 miguelfreitas Exp $ + * $Id: demux_pes.c,v 1.24 2002/04/11 22:27:11 jcdutton Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -442,7 +442,7 @@ static void demux_pes_start (demux_plugin_t *this_gen, this->audio_fifo->put (this->audio_fifo, buf); } - if ((this->input->get_capabilities (this->input) & INPUT_CAP_SEEKABLE) != 0 ) { + if ((this->input->get_capabilities (this->input) & INPUT_CAP_PREVIEW) != 0 ) { uint32_t w; int num_buffers = NUM_PREVIEW_BUFFERS; |