diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-10 13:48:02 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-10 13:48:02 +0000 |
| commit | b602849ad7cd8ce3b9c99da97bc3b4138cf8159d (patch) | |
| tree | a6e53a2a202672f963aea421a7ab6dcb6152a12c /src/liblpcm/xine_decoder.c | |
| parent | 1944fafeb5b8d23bd667cbf9b97cb115b2517483 (diff) | |
| download | xine-lib-b602849ad7cd8ce3b9c99da97bc3b4138cf8159d.tar.gz xine-lib-b602849ad7cd8ce3b9c99da97bc3b4138cf8159d.tar.bz2 | |
very unfinished scr discontinuity detection stuff, new software audio out buffer and thread
CVS patchset: 1010
CVS date: 2001/11/10 13:48:02
Diffstat (limited to 'src/liblpcm/xine_decoder.c')
| -rw-r--r-- | src/liblpcm/xine_decoder.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c index 25d0d4362..fa45cd7bd 100644 --- a/src/liblpcm/xine_decoder.c +++ b/src/liblpcm/xine_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: xine_decoder.c,v 1.12 2001/10/18 14:32:28 jkeil Exp $ + * $Id: xine_decoder.c,v 1.13 2001/11/10 13:48:02 guenter Exp $ * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -41,13 +41,12 @@ typedef struct lpcm_decoder_s { audio_decoder_t audio_decoder; - uint32_t pts; uint32_t rate; uint32_t bits_per_sample; uint32_t number_of_channels; uint32_t ao_cap_mode; - ao_instance_t *audio_out; + ao_instance_t *audio_out; int output_open; int cpu_be; /* TRUE, if we're a Big endian CPU */ } lpcm_decoder_t; @@ -66,7 +65,6 @@ void lpcm_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) { this->audio_out = audio_out; this->output_open = 0; - this->pts = 0; this->rate = 0; this->bits_per_sample=0; this->number_of_channels=0; @@ -79,10 +77,10 @@ void lpcm_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) { void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { lpcm_decoder_t *this = (lpcm_decoder_t *) this_gen; - int16_t *sample_buffer=(int16_t *)buf->content; - int stream_be; + int16_t *sample_buffer=(int16_t *)buf->content; + int stream_be; + audio_buffer_t *audio_buffer; - this->pts = buf->PTS; if (buf->decoder_info[0] == 0) { this->rate=buf->decoder_info[1]; this->bits_per_sample=buf->decoder_info[2] ; @@ -113,17 +111,22 @@ void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { if (!this->output_open) return; + audio_buffer = this->audio_out->get_buffer (this->audio_out); + /* Swap LPCM samples into native byte order, if necessary */ + stream_be = ( buf->type == BUF_AUDIO_LPCM_BE ); if (stream_be != this->cpu_be) - swab(sample_buffer, sample_buffer, buf->size); + swab (audio_buffer->mem, sample_buffer, buf->size); + else + memcpy (audio_buffer->mem, sample_buffer, buf->size); + + audio_buffer->vpts = buf->PTS; + audio_buffer->scr = buf->SCR; + audio_buffer->num_frames = (((buf->size*8)/this->number_of_channels)/this->bits_per_sample); - this->audio_out->write (this->audio_out, - sample_buffer, - (((buf->size*8)/this->number_of_channels)/this->bits_per_sample), - this->pts); + this->audio_out->put_buffer (this->audio_out, audio_buffer); - } void lpcm_close (audio_decoder_t *this_gen) { |