Menu
▾
▴
[xine-cvs] CVS: xine-lib/src/demuxers demux_asf.c,1.70,1.71 demux_avi.c,1.127,1.128 demux_cda.c,1.26,1.27 demux_elem.c,1.53,1.54 demux_film.c,1.37,1.38 demux_fli.c,1.19,1.20 demux_idcin.c,1.19,1.20 demux_mpeg.c,1.89,1.90 demux_mpeg_block.c,1.129,1.130 demux_mpgaudio.c,1.70,1.71 demux_ogg.c,1.46,1.47 demux_pes.c,1.39,1.40 demux_qt.c,1.102,1.103 demux_roq.c,1.23,1.24 demux_ts.c,1.57,1.58 demux_wav.c,1.20,1.21 demux_wc3movie.c,1.18,1.19
|
From: Guenter B. <gu...@us...> - 2002-10-26 22:01:00
|
Update of /cvsroot/xine/xine-lib/src/demuxers
In directory usw-pr-cvs1:/tmp/cvs-serv26776
Modified Files:
demux_asf.c demux_avi.c demux_cda.c demux_elem.c demux_film.c
demux_fli.c demux_idcin.c demux_mpeg.c demux_mpeg_block.c
demux_mpgaudio.c demux_ogg.c demux_pes.c demux_qt.c
demux_roq.c demux_ts.c demux_wav.c demux_wc3movie.c
Log Message:
make demuxers return their status so xine engine can check if demuxers fail to send headers
Index: demux_asf.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_asf.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- demux_asf.c 23 Oct 2002 20:26:32 -0000 1.70
+++ demux_asf.c 26 Oct 2002 22:00:49 -0000 1.71
@@ -239,9 +239,7 @@
/* printf ("%02x ", buf); */
if (i != 1) {
-#ifdef LOG
printf ("demux_asf: end of data\n");
-#endif
this->status = DEMUX_FINISHED;
}
@@ -1215,7 +1213,7 @@
static int demux_asf_get_status (demux_plugin_t *this_gen) {
demux_asf_t *this = (demux_asf_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static void demux_asf_send_headers (demux_plugin_t *this_gen) {
@@ -1233,11 +1231,6 @@
this->status = DEMUX_OK;
- /*
- * send start buffer
- */
- xine_demux_control_start(this->stream);
-
/* will get overridden later */
this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0;
@@ -1264,9 +1257,17 @@
printf ("demux_asf: asf_read_header failed.\n");
- this->status = DEMUX_FINISHED;
+ this->status = DEMUX_FINISHED;
+ pthread_mutex_unlock (&this->mutex);
return;
} else {
+
+ /*
+ * send start buffer
+ */
+ xine_demux_control_start(this->stream);
+
+
this->header_size = this->input->get_current_pos (this->input);
this->stream->meta_info[XINE_META_INFO_TITLE] =
@@ -1290,7 +1291,7 @@
sum_rate += bitrate;
- printf("demux_asf: stream: %d, bitrate %d bps, ", stream_id, bitrate);
+ printf("demux_asf: stream: %d, bitrate %d bps\n", stream_id, bitrate);
if ((buf_type == BUF_VIDEO_BASE) &&
(bitrate > max_vrate || this->video_stream_id == 0)) {
Index: demux_avi.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_avi.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- demux_avi.c 23 Oct 2002 20:26:32 -0000 1.127
+++ demux_avi.c 26 Oct 2002 22:00:50 -0000 1.128
@@ -1236,7 +1236,7 @@
static int demux_avi_get_status (demux_plugin_t *this_gen) {
demux_avi_t *this = (demux_avi_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static void demux_avi_send_headers (demux_plugin_t *this_gen) {
Index: demux_cda.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_cda.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- demux_cda.c 12 Oct 2002 17:11:58 -0000 1.26
+++ demux_cda.c 26 Oct 2002 22:00:50 -0000 1.27
@@ -166,7 +166,7 @@
static int demux_cda_get_status (demux_plugin_t *this_gen) {
demux_cda_t *this = (demux_cda_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
/*
Index: demux_elem.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_elem.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- demux_elem.c 12 Oct 2002 17:11:58 -0000 1.53
+++ demux_elem.c 26 Oct 2002 22:00:51 -0000 1.54
@@ -166,7 +166,7 @@
static int demux_mpeg_elem_get_status (demux_plugin_t *this_gen) {
demux_mpeg_elem_t *this = (demux_mpeg_elem_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
Index: demux_film.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_film.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- demux_film.c 24 Oct 2002 22:48:25 -0000 1.37
+++ demux_film.c 26 Oct 2002 22:00:51 -0000 1.38
@@ -723,7 +723,7 @@
static int demux_film_get_status (demux_plugin_t *this_gen) {
demux_film_t *this = (demux_film_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_film_get_stream_length (demux_plugin_t *this_gen) {
Index: demux_fli.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_fli.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- demux_fli.c 24 Oct 2002 22:48:25 -0000 1.19
+++ demux_fli.c 26 Oct 2002 22:00:51 -0000 1.20
@@ -351,7 +351,7 @@
static int demux_fli_get_status (demux_plugin_t *this_gen) {
demux_fli_t *this = (demux_fli_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_fli_get_stream_length (demux_plugin_t *this_gen) {
Index: demux_idcin.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_idcin.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- demux_idcin.c 23 Oct 2002 02:29:02 -0000 1.19
+++ demux_idcin.c 26 Oct 2002 22:00:51 -0000 1.20
@@ -500,7 +500,7 @@
static int demux_idcin_get_status (demux_plugin_t *this_gen) {
demux_idcin_t *this = (demux_idcin_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_idcin_get_stream_length (demux_plugin_t *this_gen) {
Index: demux_mpeg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpeg.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- demux_mpeg.c 25 Oct 2002 02:05:27 -0000 1.89
+++ demux_mpeg.c 26 Oct 2002 22:00:51 -0000 1.90
@@ -851,7 +851,7 @@
static int demux_mpeg_get_status (demux_plugin_t *this_gen) {
demux_mpeg_t *this = (demux_mpeg_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static void demux_mpeg_send_headers (demux_plugin_t *this_gen) {
Index: demux_mpeg_block.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpeg_block.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- demux_mpeg_block.c 26 Oct 2002 21:47:29 -0000 1.129
+++ demux_mpeg_block.c 26 Oct 2002 22:00:52 -0000 1.130
@@ -857,7 +857,7 @@
static int demux_mpeg_block_get_status (demux_plugin_t *this_gen) {
demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_mpeg_detect_blocksize(demux_mpeg_block_t *this,
Index: demux_mpgaudio.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_mpgaudio.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- demux_mpgaudio.c 21 Oct 2002 22:25:50 -0000 1.70
+++ demux_mpgaudio.c 26 Oct 2002 22:00:53 -0000 1.71
@@ -396,7 +396,7 @@
static int demux_mpgaudio_get_status (demux_plugin_t *this_gen) {
demux_mpgaudio_t *this = (demux_mpgaudio_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static uint32_t demux_mpgaudio_read_head(input_plugin_t *input) {
Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ogg.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- demux_ogg.c 19 Oct 2002 17:42:52 -0000 1.46
+++ demux_ogg.c 26 Oct 2002 22:00:53 -0000 1.47
@@ -900,7 +900,7 @@
static int demux_ogg_get_status (demux_plugin_t *this_gen) {
demux_ogg_t *this = (demux_ogg_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int send_headers (demux_ogg_t *this) {
Index: demux_pes.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_pes.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- demux_pes.c 12 Oct 2002 17:11:58 -0000 1.39
+++ demux_pes.c 26 Oct 2002 22:00:53 -0000 1.40
@@ -384,7 +384,7 @@
static int demux_pes_get_status (demux_plugin_t *this_gen) {
demux_pes_t *this = (demux_pes_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_pes_start (demux_plugin_t *this_gen,
Index: demux_qt.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_qt.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- demux_qt.c 26 Oct 2002 02:32:52 -0000 1.102
+++ demux_qt.c 26 Oct 2002 22:00:53 -0000 1.103
@@ -1890,7 +1890,7 @@
static int demux_qt_get_status (demux_plugin_t *this_gen) {
demux_qt_t *this = (demux_qt_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_qt_get_stream_length (demux_plugin_t *this_gen) {
Index: demux_roq.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_roq.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- demux_roq.c 23 Oct 2002 21:49:41 -0000 1.23
+++ demux_roq.c 26 Oct 2002 22:00:54 -0000 1.24
@@ -467,7 +467,7 @@
static int demux_roq_get_status (demux_plugin_t *this_gen) {
demux_roq_t *this = (demux_roq_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_roq_get_stream_length (demux_plugin_t *this_gen) {
Index: demux_ts.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_ts.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- demux_ts.c 12 Oct 2002 17:11:59 -0000 1.57
+++ demux_ts.c 26 Oct 2002 22:00:54 -0000 1.58
@@ -1408,7 +1408,7 @@
demux_ts *this = (demux_ts *)this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_ts_open(demux_plugin_t *this_gen, input_plugin_t *input,
Index: demux_wav.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_wav.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- demux_wav.c 23 Oct 2002 04:58:16 -0000 1.20
+++ demux_wav.c 26 Oct 2002 22:00:55 -0000 1.21
@@ -395,7 +395,7 @@
static int demux_wav_get_status (demux_plugin_t *this_gen) {
demux_wav_t *this = (demux_wav_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
/* return the approximate length in seconds */
Index: demux_wc3movie.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_wc3movie.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- demux_wc3movie.c 23 Oct 2002 01:32:27 -0000 1.18
+++ demux_wc3movie.c 26 Oct 2002 22:00:55 -0000 1.19
@@ -734,7 +734,7 @@
static int demux_mve_get_status (demux_plugin_t *this_gen) {
demux_mve_t *this = (demux_mve_t *) this_gen;
- return (this->thread_running?DEMUX_OK:DEMUX_FINISHED);
+ return this->status;
}
static int demux_mve_get_stream_length (demux_plugin_t *this_gen) {
|