diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-09 02:44:39 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-09 02:44:39 +0000 |
| commit | 7dc6d51bb322a864c3cca05ae712aa8022053e90 (patch) | |
| tree | f377062eb04d0221531de031ad711598c920bdfe | |
| parent | 85a2757ca43eaf781c662a77c5a18b2d6dcb22fe (diff) | |
| download | xine-lib-7dc6d51bb322a864c3cca05ae712aa8022053e90.tar.gz xine-lib-7dc6d51bb322a864c3cca05ae712aa8022053e90.tar.bz2 | |
- can't use HAS_VIDEO/HAS_AUDIO at this stage because some demuxers will only
set it on send_headers. also daniel convinced me that xine does "handle a
no audio stream"
- fix audio_out.c to abort filling with zero on seeking/stop/quit.
CVS patchset: 3840
CVS date: 2003/01/09 02:44:39
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 5 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/video_decoder.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index e9708983a..64aedf762 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.99 2003/01/09 01:09:57 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.100 2003/01/09 02:44:39 miguelfreitas Exp $ * * * functions that implement audio decoding @@ -98,8 +98,7 @@ void *audio_decoder_loop (void *stream_gen) { stream->metronom->handle_audio_discontinuity (stream->metronom, DISC_STREAMSTART, 0); /* assume handled, we will known after trying to init decoder */ - stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = - stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO]; + stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = 1; buftype_unknown = 0; break; diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 5897963ab..2b5e0973e 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.95 2002/12/27 03:40:07 miguelfreitas Exp $ + * $Id: audio_out.c,v 1.96 2003/01/09 02:44:39 miguelfreitas Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -302,7 +302,7 @@ static void ao_fill_gap (aos_t *this, int64_t pts_len) { return; } - while (num_frames > 0) { + while (num_frames > 0 && !this->discard_buffers) { if (num_frames > ZERO_BUF_SIZE) { pthread_mutex_lock( &this->driver_lock ); this->driver->write(this->driver, this->zero_space, ZERO_BUF_SIZE); diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index c42e217ea..678775c28 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.122 2003/01/09 01:09:57 miguelfreitas Exp $ + * $Id: video_decoder.c,v 1.123 2003/01/09 02:44:39 miguelfreitas Exp $ * */ @@ -108,8 +108,7 @@ void *video_decoder_loop (void *stream_gen) { DISC_STREAMSTART, 0); /* assume handled, we will known after trying to init decoder */ - stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = - stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO]; + stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 1; buftype_unknown = 0; break; |