diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-05-27 23:48:12 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-05-27 23:48:12 +0000 |
| commit | e0dafdff5dc592fb47151894a6db3ce0ae045e26 (patch) | |
| tree | 93b4a43ccfde5b0e7b3582ea176ca0b961cdb12f /src/libmpg123/layer3.c | |
| parent | 62386077f664574c0c2193bf0a9b408c1d55ee1a (diff) | |
| download | xine-lib-e0dafdff5dc592fb47151894a6db3ce0ae045e26.tar.gz xine-lib-e0dafdff5dc592fb47151894a6db3ce0ae045e26.tar.bz2 | |
mpg123 decoder plugin, 4/5-channel surround, ac3 pass-through (untested) and minor bugfixes
CVS patchset: 86
CVS date: 2001/05/27 23:48:12
Diffstat (limited to 'src/libmpg123/layer3.c')
| -rw-r--r-- | src/libmpg123/layer3.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libmpg123/layer3.c b/src/libmpg123/layer3.c index 89b11776d..54eacdb01 100644 --- a/src/libmpg123/layer3.c +++ b/src/libmpg123/layer3.c @@ -10,8 +10,6 @@ #include "mpglib.h" #include "huffman.h" -#include "metronom.h" - #define MPEG1 @@ -1448,7 +1446,7 @@ static void III_hybrid(mpgaudio_t *mp, /* * main layer3 handler */ -void do_layer3(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) +void do_layer3(mpgaudio_t *mp) { int gr, ch, ss,clip=0; struct frame *fr = &mp->fr; @@ -1596,6 +1594,8 @@ void do_layer3(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) } } + printf ("audio output...mp3\n"); + if ((!mp->is_output_initialized) || (mp->sample_rate_device != fr->sample_rate)) { if (mp->is_output_initialized) @@ -1609,5 +1609,7 @@ void do_layer3(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) printf ("layer3\n"); } - mp->ao_output->write_audio_data (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), pts); + mp->ao_output->write_audio_data (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), + mp->pts); + mp->pts = 0; } |