diff options
| -rw-r--r-- | src/liba52/xine_decoder.c | 8 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 27 |
2 files changed, 27 insertions, 8 deletions
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index c8cb9f088..880d0e791 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/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.33 2002/10/18 12:28:11 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.34 2002/10/18 14:20:58 jcdutton Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -278,7 +278,6 @@ static void a52dec_decode_frame (a52dec_decoder_t *this, int64_t pts) { /* output decoded samples */ buf->vpts = pts; - this->audio_out->put_buffer (this->audio_out, buf); } else { @@ -344,8 +343,8 @@ void a52dec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { return; if (buf->pts) - this->pts = buf->pts; - + this->pts = buf->pts; + while (current != end) { if ( (this->sync_todo == 0) && (this->frame_todo == 0) ) { @@ -449,6 +448,7 @@ static audio_decoder_t *open_plugin (audio_decoder_class_t *class_gen, xine_stre this->stream = stream; this->class = (a52dec_class_t *) class_gen; + this->a52_level = (float) 1.0; #if 0 this->a52_level = (float) cfg->register_range (cfg, "codec.a52_level", 100, 0, 200, diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index d9f65579d..59be4e4a2 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.71 2002/10/18 13:13:30 jcdutton Exp $ + * $Id: audio_out.c,v 1.72 2002/10/18 14:20:59 jcdutton Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -67,9 +67,9 @@ #include "resample.h" #include "metronom.h" - +/* #define LOG - +*/ #define NUM_AUDIO_BUFFERS 32 #define AUDIO_BUF_SIZE 32768 @@ -548,8 +548,27 @@ static void *ao_loop (void *this_gen) { ao_fill_gap (this, gap / 2); } } else { +#if 0 + { + int count; + printf("Audio data\n"); + for (count=0;count < 10;count++) { + printf("%x ",buf->mem[count]); + } + printf("\n"); + } +#endif out_buf = prepare_samples(this, buf); - +#if 0 + { + int count; + printf("Audio data2\n"); + for (count=0;count < 10;count++) { + printf("%x ",out_buf->mem[count]); + } + printf("\n"); + } +#endif this->driver->write (this->driver, out_buf->mem, out_buf->num_frames ); #ifdef LOG printf ("audio_out:loop: next fifo\n"); |