summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_elem.c4
-rw-r--r--src/demuxers/demux_mpeg.c4
-rw-r--r--src/demuxers/demux_mpeg_block.c10
-rw-r--r--src/demuxers/demux_pes.c4
-rw-r--r--src/input/input_cda.c4
-rw-r--r--src/input/input_dvd.c4
-rw-r--r--src/input/input_file.c4
-rw-r--r--src/input/input_plugin.h3
-rw-r--r--src/input/input_vcd.c4
9 files changed, 19 insertions, 22 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;
diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index b76416e12..bdf2a881b 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.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: input_cda.c,v 1.18 2002/03/24 01:37:41 f1rmb Exp $
+ * $Id: input_cda.c,v 1.19 2002/04/11 22:27:11 jcdutton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1546,7 +1546,7 @@ static uint32_t cda_plugin_get_capabilities (input_plugin_t *this_gen) {
_ENTER_FUNC();
_LEAVE_FUNC();
- return INPUT_CAP_SEEKABLE | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR;
+ return INPUT_CAP_SEEKABLE | INPUT_CAP_PREVIEW | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR;
}
/*
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 9dfabe073..739d5e173 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.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: input_dvd.c,v 1.43 2002/02/17 17:32:50 guenter Exp $
+ * $Id: input_dvd.c,v 1.44 2002/04/11 22:27:11 jcdutton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -370,7 +370,7 @@ static int openDVDFile (dvd_input_plugin_t *this,
*
*/
static uint32_t dvd_plugin_get_capabilities (input_plugin_t *this) {
- return INPUT_CAP_SEEKABLE | INPUT_CAP_BLOCK | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR;
+ return INPUT_CAP_SEEKABLE | INPUT_CAP_PREVIEW | INPUT_CAP_BLOCK | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR;
}
/*
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 4eb9a7c9f..8e844e6df 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.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: input_file.c,v 1.41 2002/03/25 22:55:42 f1rmb Exp $
+ * $Id: input_file.c,v 1.42 2002/04/11 22:27:11 jcdutton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -266,7 +266,7 @@ static off_t get_file_size(char *filepathname, char *origin) {
*/
static uint32_t file_plugin_get_capabilities (input_plugin_t *this_gen) {
- return INPUT_CAP_SEEKABLE | INPUT_CAP_GET_DIR | INPUT_CAP_SPULANG;
+ return INPUT_CAP_SEEKABLE | INPUT_CAP_PREVIEW | INPUT_CAP_GET_DIR | INPUT_CAP_SPULANG;
}
/*
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 7406b87e3..703b959e3 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -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: input_plugin.h,v 1.21 2002/03/16 20:53:50 guenter Exp $
+ * $Id: input_plugin.h,v 1.22 2002/04/11 22:27:11 jcdutton Exp $
*/
#ifndef HAVE_INPUT_PLUGIN_H
@@ -288,6 +288,7 @@ struct input_plugin_s
#define INPUT_CAP_AUDIOLANG 0x00000040
#define INPUT_CAP_SPULANG 0x00000080
#define INPUT_CAP_VARIABLE_BITRATE 0x00000100
+#define INPUT_CAP_PREVIEW 0x00000200 /* Requires INPUT_CAP_SEEKABLE */
#define INPUT_OPTIONAL_UNSUPPORTED 0
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 8d94a771d..d328d4031 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.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: input_vcd.c,v 1.37 2002/02/17 17:32:50 guenter Exp $
+ * $Id: input_vcd.c,v 1.38 2002/04/11 22:27:12 jcdutton Exp $
*
*/
@@ -859,7 +859,7 @@ static off_t vcd_plugin_get_current_pos (input_plugin_t *this_gen){
*/
static uint32_t vcd_plugin_get_capabilities (input_plugin_t *this_gen) {
- return INPUT_CAP_SEEKABLE | INPUT_CAP_BLOCK | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR;
+ return INPUT_CAP_SEEKABLE | INPUT_CAP_PREVIEW | INPUT_CAP_BLOCK | INPUT_CAP_AUTOPLAY | INPUT_CAP_GET_DIR;
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 11:34:33 +0000