diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-02-09 07:13:22 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-02-09 07:13:22 +0000 |
| commit | 8700c75544d88f1479d5455b5b2788921d4dd5ee (patch) | |
| tree | 7a80e2b00e4e7294c7d7ca1440c4d136ccf12998 /src/libmad/xine_decoder.c | |
| parent | 2f8fed75fc94e7afe89f7b60586f7cb55737efe1 (diff) | |
| download | xine-lib-8700c75544d88f1479d5455b5b2788921d4dd5ee.tar.gz xine-lib-8700c75544d88f1479d5455b5b2788921d4dd5ee.tar.bz2 | |
the long-awaited video_out changes, not completely debuged (races)
- pts are 64 bit now
- scr and video_out-loop run all the time
- video_out cleanups
- metronom cleanups
- buffer type BUF_CONTROL_DISCONTINUITY is used internally now,
input plugins should no longer send this one
- support for individual frame durations
- using nano-/usleep instead of itimer (simpler code, maybe this will
help freebsd)
CVS patchset: 1487
CVS date: 2002/02/09 07:13:22
Diffstat (limited to 'src/libmad/xine_decoder.c')
| -rw-r--r-- | src/libmad/xine_decoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c index fb6cc03b8..854057761 100644 --- a/src/libmad/xine_decoder.c +++ b/src/libmad/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 2002/01/05 21:54:17 miguelfreitas Exp $ + * $Id: xine_decoder.c,v 1.13 2002/02/09 07:13:23 guenter Exp $ * * stuff needed to turn libmad into a xine decoder plugin */ @@ -37,7 +37,7 @@ typedef struct mad_decoder_s { audio_decoder_t audio_decoder; - uint32_t pts; + int64_t pts; struct mad_synth synth; struct mad_stream stream; @@ -225,12 +225,12 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { } audio_buffer->num_frames = pcm->length; - audio_buffer->vpts = buf->PTS; - audio_buffer->scr = buf->SCR; + audio_buffer->vpts = buf->pts; + audio_buffer->scr = buf->scr; this->audio_out->put_buffer (this->audio_out, audio_buffer); - buf->PTS = 0; + buf->pts = 0; } /* printf ("libmad: decode worked\n"); */ |