Mercurial > libavcodec.hg
changeset 1925:48c1033bd23b libavcodec
fix global header passing from demuxer to decoder
author | michael |
---|---|
date | Sun, 04 Apr 2004 17:55:59 +0000 |
parents | d9f751c0f488 |
children | 939a3c1df7a0 |
files | oggvorbis.c |
diffstat | 1 files changed, 20 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/oggvorbis.c Sun Apr 04 17:06:30 2004 +0000 +++ b/oggvorbis.c Sun Apr 04 17:55:59 2004 +0000 @@ -200,10 +200,29 @@ static int oggvorbis_decode_init(AVCodecContext *avccontext) { OggVorbisContext *context = avccontext->priv_data ; + uint8_t *p= avccontext->extradata; + int i; vorbis_info_init(&context->vi) ; vorbis_comment_init(&context->vc) ; - context->op.packetno= 0; + + for(i=0; i<3; i++){ + context->op.b_o_s= i==0; + context->op.bytes= *(p++)<<8; + context->op.bytes+=*(p++); + context->op.packet= p; + p += context->op.bytes; + + if(vorbis_synthesis_headerin(&context->vi, &context->vc, &context->op)<0){ + av_log(avccontext, AV_LOG_ERROR, "%d. vorbis header damaged\n", i+1); + return -1; + } + } + avccontext->channels = context->vi.channels; + avccontext->sample_rate = context->vi.rate; + + vorbis_synthesis_init(&context->vd, &context->vi); + vorbis_block_init(&context->vd, &context->vb); return 0 ; } @@ -251,31 +270,12 @@ op->packet = buf; op->bytes = buf_size; - op->b_o_s = op->packetno == 0; // av_log(avccontext, AV_LOG_DEBUG, "%d %d %d %lld %lld %d %d\n", op->bytes, op->b_o_s, op->e_o_s, op->granulepos, op->packetno, buf_size, context->vi.rate); /* for(i=0; i<op->bytes; i++) av_log(avccontext, AV_LOG_DEBUG, "%02X ", op->packet[i]); av_log(avccontext, AV_LOG_DEBUG, "\n");*/ - if(op->packetno < 3) { - if(vorbis_synthesis_headerin(&context->vi, &context->vc, op)<0){ - av_log(avccontext, AV_LOG_ERROR, "%lld. vorbis header damaged\n", op->packetno+1); - return -1; - } - avccontext->channels = context->vi.channels ; - avccontext->sample_rate = context->vi.rate ; - op->packetno++; - return buf_size ; - } - - if(op->packetno == 3) { -// av_log(avccontext, AV_LOG_INFO, "vorbis_decode: %d channel, %ldHz, encoder `%s'\n", -// context->vi.channels, context->vi.rate, context->vc.vendor); - - vorbis_synthesis_init(&context->vd, &context->vi) ; - vorbis_block_init(&context->vd, &context->vb); - } if(vorbis_synthesis(&context->vb, op) == 0) vorbis_synthesis_blockin(&context->vd, &context->vb) ; @@ -290,7 +290,6 @@ vorbis_synthesis_read(&context->vd, samples) ; } - op->packetno++; *data_size = total_bytes ; return buf_size ; }